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

fpspreadsheet: A more general fix of issue #30633 for streams which do not rewind in LoadFromStream.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5205 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-09-23 16:01:54 +00:00
parent 2a43d89371
commit 6fd0ed87e3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/fpspreadsheet/fpsimages.pas
View File

@@ -894,10 +894,11 @@ function TsEmbeddedObj.LoadFromStream(AStream: TStream; AName: String;
begin begin
FreeAndNil(FStream); FreeAndNil(FStream);
FStream := TMemoryStream.Create; FStream := TMemoryStream.Create;
if ASize = -1 then if ASize = -1 then begin
FStream.LoadFromStream(AStream) ASize := AStream.Size;
else AStream.Position := 0;
FStream.CopyFrom(AStream, ASize); end;
FStream.CopyFrom(AStream, ASize);
Result := CheckStream(itUnknown); Result := CheckStream(itUnknown);
if Result then FFileName := AName; if Result then FFileName := AName;
end; end;