paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-31 22:00:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazReport, fix loading plugins like barcode from dfm streams, patch from Tony Whyman, issue #19513

Browse Source 
git-svn-id: trunk@32706 -
This commit is contained in:
jesus 2011-10-05 19:51:48 +00:00
parent f4aaf29bf3
commit 59bfe097c6
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/lazreport/source/lr_class.pas
View File

@ -909,8 +909,8 @@ type
FSubject : string;
FKeyWords : string;
FComments : TStringList;
FDFMStream : TStream;
function FormatValue(V: Variant; AFormat: Integer; const AFormatStr: String): String;
// function GetLRTitle: String;
@ -927,6 +927,7 @@ type
procedure SetPrinterTo(const PrnName: String);
procedure SetVars(Value: TStrings);
procedure ClearAttribs;
procedure Loaded; override;
protected
procedure DefineProperties(Filer: TFiler); override;
procedure ReadBinaryData(Stream: TStream);
@ -7744,17 +7745,14 @@ end;
procedure TfrReport.ReadBinaryData(Stream: TStream);
var
n: Integer;
Stream1: TMemoryStream;
begin
Stream.Read(n, 4); // version
if FStoreInDFM then
begin
Stream.Read(n, 4);
Stream1 := TMemoryStream.Create;
Stream1.CopyFrom(Stream, n);
Stream1.Position := 0;
LoadFromStream(Stream1);
Stream1.Free;
FDFMStream := TMemoryStream.Create;
FDFMStream.CopyFrom(Stream, n);
FDFMStream.Position := 0;
end;
end;
@ -9184,6 +9182,16 @@ begin
ReportLastChange := Now;
end;
procedure TfrReport.Loaded;
begin
inherited Loaded;
if assigned(FDFMStream) then
begin
LoadFromStream(FDFMStream);
FreeAndNil(FDFMStream)
end;
end;
procedure TfrReport.GetVarList(CatNo: Integer; List: TStrings);
var
i, n: Integer;