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

Fixes bug 20384, fixes biff 8 compressed UTF-16 reading

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2196 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2011-12-25 00:04:53 +00:00
parent 442c19fe0a
commit f1c93b7272
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/fpspreadsheet/xlsbiff8.pas
View File

@ -1345,10 +1345,13 @@ function TsSpreadBIFF8Reader.ReadWideString(const AStream: TStream;
const ALength: WORD): WideString;
var
StringFlags: BYTE;
AnsiStrValue: AnsiString;
DecomprStrValue: WideString;
AnsiStrValue: ansistring;
RunsCounter: WORD;
AsianPhoneticBytes: DWORD;
i: Integer;
j: SizeUInt;
lLen: SizeInt;
begin
StringFlags:=AStream.ReadByte;
Dec(PendingRecordSize);
@ -1375,17 +1378,19 @@ begin
end;
Result:=WideStringLEToN(Result);
end else begin
//String is 1 byte per char, maybe ANSI ?
if ALength > PendingRecordSize then begin
SetLength(AnsiStrValue,PendingRecordSize);
AStream.ReadBuffer(AnsiStrValue[1],PendingRecordSize);
dec(PendingRecordSize,PendingRecordSize);
end else begin
SetLength(AnsiStrValue,ALength);
AStream.ReadBuffer(AnsiStrValue[1],ALength);
dec(PendingRecordSize,ALength);
//String is 1 byte per char, this is UTF-16 with the high word ommited because it is zero
// so decompress and then convert
if ALength > PendingRecordSize then lLen := PendingRecordSize
else lLen := ALength;
SetLength(DecomprStrValue, lLen);
for i := 1 to lLen do
begin
DecomprStrValue[i] := WideChar(AStream.ReadByte());
end;
Result:=AnsiStrValue; //implicit conversion.
Dec(PendingRecordSize, lLen);
Result := DecomprStrValue;
end;
if StringFlags and 8 = 8 then begin
//Rich string (This only happend in BIFF8)