paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-15 21:29:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug #0035286, UTF chars distorted

Browse Source 
git-svn-id: trunk@60783 -
This commit is contained in:
michael 2019-03-26 20:59:02 +00:00
parent 6bd2d193e1
commit f7d84ad189
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/fpreport/design/frmfpreportdesignermain.pp
View File

@ -2022,7 +2022,7 @@ procedure TFPReportDesignerForm.SaveDesignToFile(AFileName : string);
Var
WS: TFPReportJSONStreamer;
S : String;
S : UTF8String;
FS : TFileStream;
DD : TJSONObject;
@ -2183,7 +2183,8 @@ procedure TFPReportDesignerForm.LoadDesignFromFile(const AFilename: string);
var
rs: TFPReportJSONStreamer;
fs: TFileStream;
ms : TMemoryStream;
uts : UTF8String;
DD,lJSON: TJSONObject;
Errs : TStrings;
OldName : TComponentName;
@ -2194,12 +2195,16 @@ begin
if not FileExists(AFilename) then
raise Exception.CreateFmt('The file "%s" can not be found', [AFilename]);
fs := TFileStream.Create(AFilename, fmOpenRead or fmShareDenyNone);
ms := TMemoryStream.Create();
try
lJSON := TJSONObject(GetJSON(fs));
ms.LoadFromFile(AFilename);
ms.Position := 0;
SetLength(uts,ms.Size);
Move(ms.Memory^,uts[Low(uts)],Length(uts));
finally
FreeAndNil(fs);
FreeAndNil(ms);
end;
lJSON := TJSONObject(GetJSON(uts));
StopDesigning;
ResetReport;
OldName:=FReport.Name;