paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 05:49:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazReport, fix reading some frf format reports, when system encoding is UTF8, issue #23058

Browse Source 
git-svn-id: trunk@39530 -
This commit is contained in:
jesus 2012-12-13 21:19:23 +00:00
parent 5e261a54e0
commit eda22758a1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/lazreport/source/lr_utils.pas
View File

@ -20,7 +20,7 @@ uses
{$IFDEF WIN32}
Windows,
{$ENDIF}
LCLType,LCLIntf,LCLProc,LazUTF8;
LCLType,LCLIntf,LCLProc,LConvEncoding;
procedure frReadMemo(Stream: TStream; l: TStrings);
@ -124,9 +124,13 @@ begin
SetLength(s, n);
Stream.Read(s[1], n);
if frVersion<=23 then
// this string is not UTF-8 encoded, wish it a good
// luck and assume it's encoded en current codepage
s := SysToUTF8(s);
// this string is not UTF-8 encoded, give developer a chance
// to specify from what encoding should it convert from to UTF8
// if developer do not specify an encoding function assume CP1250
if Assigned(ConvertAnsiToUTF8) then
s := ConvertAnsiToUTF8(s)
else
s := CP1250ToUTF8(s);
l.Add(s);
b := 0;
Stream.Read(b, 1);