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

fpspreadsheet: Fix string encoding error observed with fpc3 and non-UTF8RTL.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4202 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-07-03 20:35:12 +00:00
parent 505eed8501
commit f80c3a9df0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/fpspreadsheet/xlsbiff8.pas
View File

@ -1172,7 +1172,8 @@ var
wideStr: widestring; wideStr: widestring;
begin begin
wideStr := ReadWideString(AStream, HAS_8BITLEN); wideStr := ReadWideString(AStream, HAS_8BITLEN);
Result := UTF8Encode(wideStr); // Result := UTF8Encode(wideStr); // wp: this leads to string encoding error with fpc 3.0 (no UTF8RTL)
Result := UTF16ToUTF8(wideStr);
end; end;
procedure TsSpreadBIFF8Reader.ReadStringRecord(AStream: TStream); procedure TsSpreadBIFF8Reader.ReadStringRecord(AStream: TStream);