paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet, fixed compilation

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@798 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
jesusr 2009-05-13 02:54:26 +00:00
parent 057dd3762b
commit e14f7af87a
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/fpspreadsheet/laz_fpspreadsheet.lpk
View File

@ -85,11 +85,14 @@
</Item17> </Item17>
</Files> </Files>
<Type Value="RunAndDesignTime"/> <Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="1"> <RequiredPkgs Count="2">
<Item1> <Item1>
<PackageName Value="LCL"/>
</Item1>
<Item2>
<PackageName Value="FCL"/> <PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/> <MinVersion Major="1" Valid="True"/>
</Item1> </Item2>
</RequiredPkgs> </RequiredPkgs>
<UsageOptions> <UsageOptions>
<UnitPath Value="$(PkgOutDir)"/> <UnitPath Value="$(PkgOutDir)"/>

6
components/fpspreadsheet/laz_fpspreadsheet.pas
View File

@ -7,8 +7,10 @@ unit laz_fpspreadsheet;
interface interface
uses uses
fpolestorage, fpsallformats, fpsopendocument, fpspreadsheet, xlsbiff2, fpolestorage, fpsallformats, fpsopendocument, fpspreadsheet, xlsbiff2,
xlsbiff5, xlsbiff8, xlsxooxml, fpsutils, fpszipper, LazarusPackageIntf; xlsbiff5, xlsbiff8, xlsxooxml, fpsutils, fpszipper, uvirtuallayer_types,
uvirtuallayer, uvirtuallayer_ole, uvirtuallayer_ole_helpers,
uvirtuallayer_ole_types, uvirtuallayer_stream, fpolebasic, LazarusPackageIntf;
implementation implementation

2
components/fpspreadsheet/uvirtuallayer_ole.pas
View File

@ -311,7 +311,7 @@ var
Name: WideString; Name: WideString;
VI: TVirtualLayer_Item; VI: TVirtualLayer_Item;
begin begin
Name:=UTF8Encode(FDirectory[AStartSibling]._ab); Name:=UTF8Encode(wideString(FDirectory[AStartSibling]._ab));
if Mask.Matches(Name) Then begin if Mask.Matches(Name) Then begin
VI:=TVirtualLayer_Item.Create; VI:=TVirtualLayer_Item.Create;
VI.Name:=Name; VI.Name:=Name;

4
components/fpspreadsheet/xlsbiff5.pas
View File

@ -950,10 +950,10 @@ begin
INT_EXCEL_ID_FORMULA: ReadFormula(AStream); INT_EXCEL_ID_FORMULA: ReadFormula(AStream);
INT_EXCEL_ID_BOF: ; INT_EXCEL_ID_BOF: ;
INT_EXCEL_ID_EOF: SectionEOF := True; INT_EXCEL_ID_EOF: SectionEOF := True;
else
// Show unsupported record types to console. // Show unsupported record types to console.
{.$DEFINE SHOWUNSUPPORTED} {.$DEFINE SHOWUNSUPPORTED}
{$IFDEF SHOWUNSUPPORTED} {$IFDEF SHOWUNSUPPORTED}
else
case RecordType of case RecordType of
$000C: ; //(CALCCOUNT) This record is part of the Calculation Settings Block. It specifies the maximum number of times the formulas should be iteratively calculated. This is a fail-safe against mutually recursive formulas locking up a spreadsheet application. $000C: ; //(CALCCOUNT) This record is part of the Calculation Settings Block. It specifies the maximum number of times the formulas should be iteratively calculated. This is a fail-safe against mutually recursive formulas locking up a spreadsheet application.
$000D: ; //(CALCMODE) This record is part of the Calculation Settings Block. It specifies whether to calculate formulas manually, automatically or automatically except for multiple table operations. $000D: ; //(CALCMODE) This record is part of the Calculation Settings Block. It specifies whether to calculate formulas manually, automatically or automatically except for multiple table operations.
@ -995,8 +995,8 @@ 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;
end;
{$ENDIF} {$ENDIF}
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
AStream.Seek(CurStreamPos + RecordSize, soFromBeginning); AStream.Seek(CurStreamPos + RecordSize, soFromBeginning);