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

fpspreadsheet: Undo unintentional change of xlsbiff5 in previous commit

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3900 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-01-25 18:36:37 +00:00
parent 9b0e720b37
commit beb99b00e3
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/fpspreadsheet/xlsbiff5.pas
View File

@ -387,7 +387,6 @@ begin
CurStreamPos := AStream.Position; CurStreamPos := AStream.Position;
case RecordType of case RecordType of
INT_EXCEL_ID_BLANK : ReadBlank(AStream); INT_EXCEL_ID_BLANK : ReadBlank(AStream);
INT_EXCEL_ID_BOOLERROR : ReadBool(AStream); INT_EXCEL_ID_BOOLERROR : ReadBool(AStream);
INT_EXCEL_ID_MULBLANK : ReadMulBlank(AStream); INT_EXCEL_ID_MULBLANK : ReadMulBlank(AStream);
@ -408,7 +407,7 @@ begin
INT_EXCEL_ID_BOF : ; INT_EXCEL_ID_BOF : ;
INT_EXCEL_ID_EOF : SectionEOF := True; INT_EXCEL_ID_EOF : SectionEOF := True;
{$IFDEF FPSPREADDEBUG} // Only write out if debugging {$IFDEF FPSPREADDEBUG} // Only write out if debugging
else else
// Show unsupported record types to console. // Show unsupported record types to console.
case RecordType of case RecordType of
@ -445,7 +444,7 @@ begin
else else
WriteLn(format('Record type: %.4X Record Size: %.4X',[RecordType,RecordSize])); WriteLn(format('Record type: %.4X Record Size: %.4X',[RecordType,RecordSize]));
end; end;
{$ENDIF} {$ENDIF}
end; end;
// Make sure we are in the right position for the next record // Make sure we are in the right position for the next record
@ -749,6 +748,9 @@ begin
// Final preparations // Final preparations
Inc(FCurrentWorksheet); Inc(FCurrentWorksheet);
if FCurrentWorksheet = FWorksheetNames.Count then BIFF5EOF := True;
// It can happen in files written by Office97 that the OLE directory is
// at the end of the file.
end; end;
if not FPaletteFound then if not FPaletteFound then