pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Patch from bug 23733: Adds codepage support to BIFF2

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2677 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2013-02-13 07:22:29 +00:00
parent 698d941bf1
commit 6f670fd14d
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/fpspreadsheet/xlsbiff2.pas
View File

@ -42,6 +42,7 @@ type
TsSpreadBIFF2Reader = class(TsCustomSpreadReader) TsSpreadBIFF2Reader = class(TsCustomSpreadReader)
private private
WorkBookEncoding: TsEncoding;
RecordSize: Word; RecordSize: Word;
FWorksheet: TsWorksheet; FWorksheet: TsWorksheet;
public public
@ -378,6 +379,9 @@ var
RecordType: Word; RecordType: Word;
CurStreamPos: Int64; CurStreamPos: Int64;
begin begin
{ Store some data about the workbook that other routines need }
WorkBookEncoding := AData.Encoding;
BIFF2EOF := False; BIFF2EOF := False;
{ In BIFF2 files there is only one worksheet, let's create it } { In BIFF2 files there is only one worksheet, let's create it }
@ -422,7 +426,7 @@ var
L: Byte; L: Byte;
ARow, ACol: Word; ARow, ACol: Word;
AValue: array[0..255] of Char; AValue: array[0..255] of Char;
AStrValue: ansistring; AStrValue: UTF8String;
begin begin
{ BIFF Record data } { BIFF Record data }
ARow := WordLEToN(AStream.ReadWord); ARow := WordLEToN(AStream.ReadWord);
@ -437,10 +441,20 @@ begin
L := AStream.ReadByte(); L := AStream.ReadByte();
AStream.ReadBuffer(AValue, L); AStream.ReadBuffer(AValue, L);
AValue[L] := #0; AValue[L] := #0;
AStrValue := AValue;
{ Save the data } { Save the data }
FWorksheet.WriteUTF8Text(ARow, ACol, ISO_8859_1ToUTF8(AStrValue)); case WorkBookEncoding of
seLatin2: AStrValue := CP1250ToUTF8(AValue);
seCyrillic: AStrValue := CP1251ToUTF8(AValue);
seGreek: AStrValue := CP1253ToUTF8(AValue);
seTurkish: AStrValue := CP1254ToUTF8(AValue);
seHebrew: AStrValue := CP1255ToUTF8(AValue);
seArabic: AStrValue := CP1256ToUTF8(AValue);
else
// Latin 1 is the default
AStrValue := CP1252ToUTF8(AValue);
end;
FWorksheet.WriteUTF8Text(ARow, ACol, AStrValue);
end; end;
procedure TsSpreadBIFF2Reader.ReadNumber(AStream: TStream); procedure TsSpreadBIFF2Reader.ReadNumber(AStream: TStream);