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

fpspreadsheet: Fix compile issue with fpc 3.1.1 (issue #0027399)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3922 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-02-03 12:56:58 +00:00
parent 7a0f60f4ea
commit 9be5e6ec76
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/fpspreadsheet/fpsxmlcommon.pas
View File

@@ -26,7 +26,12 @@ procedure UnzipFile(AZipFileName, AZippedFile, ADestFolder: String);
implementation implementation
uses uses
fpsStreams, fpsZipper; {$IF FPC_FULLVERSION >= 20701}
zipper,
{$ELSE}
fpszipper,
{$ENDIF}
fpsStreams;
{ Gets value for the specified attribute. Returns empty string if attribute { Gets value for the specified attribute. Returns empty string if attribute
not found. } not found. }

10
components/fpspreadsheet/xlsxooxml.pas
View File

@@ -2745,7 +2745,7 @@ end;
{ Is called before zipping the individual file parts. Rewinds the streams. } { Is called before zipping the individual file parts. Rewinds the streams. }
procedure TsSpreadOOXMLWriter.ResetStreams; procedure TsSpreadOOXMLWriter.ResetStreams;
var var
stream: TStream; i: Integer;
begin begin
ResetStream(FSContentTypes); ResetStream(FSContentTypes);
ResetStream(FSRelsRels); ResetStream(FSRelsRels);
@@ -2753,10 +2753,10 @@ begin
ResetStream(FSWorkbook); ResetStream(FSWorkbook);
ResetStream(FSStyles); ResetStream(FSStyles);
ResetStream(FSSharedStrings_complete); ResetStream(FSSharedStrings_complete);
for stream in FSSheets do ResetStream(stream); for i:=0 to High(FSSheets) do ResetStream(FSSheets[i]);
for stream in FSSheetRels do ResetStream(stream); for i:=0 to High(FSSheetRels) do ResetStream(FSSheetRels[i]);
for stream in FSComments do ResetStream(stream); for i:=0 to High(FSComments) do ResetStream(FSComments[i]);
for stream in FSVmlDrawings do ResetStream(stream); for i:=0 to High(FSVmlDrawings) do ResetStream(FSVmlDrawings[i]);
end; end;
{ {