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

Fix Mac OS X compilation

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@811 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2009-05-26 18:35:18 +00:00
parent 90d327e0ee
commit 894dbe3c90
3 changed files with 90 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
components/fpspreadsheet/examples/excel5demo/excel5read.lpi
View File

@@ -11,7 +11,7 @@
<TargetFileExt Value=".exe"/> <TargetFileExt Value=".exe"/>
<Title Value="excel5read"/> <Title Value="excel5read"/>
<UseAppBundle Value="False"/> <UseAppBundle Value="False"/>
<ActiveEditorIndexAtStart Value="10"/> <ActiveEditorIndexAtStart Value="2"/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <ProjectVersion Value=""/>
@@ -33,7 +33,7 @@
<PackageName Value="laz_fpspreadsheet"/> <PackageName Value="laz_fpspreadsheet"/>
</Item1> </Item1>
</RequiredPackages> </RequiredPackages>
<Units Count="20"> <Units Count="21">
<Unit0> <Unit0>
<Filename Value="excel5read.lpr"/> <Filename Value="excel5read.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@@ -70,7 +70,7 @@
<UnitName Value="xlsbiff5"/> <UnitName Value="xlsbiff5"/>
<CursorPos X="1" Y="61"/> <CursorPos X="1" Y="61"/>
<TopLine Value="49"/> <TopLine Value="49"/>
<EditorIndex Value="3"/> <EditorIndex Value="4"/>
<UsageCount Value="140"/> <UsageCount Value="140"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit4> </Unit4>
@@ -79,7 +79,7 @@
<UnitName Value="fpsutils"/> <UnitName Value="fpsutils"/>
<CursorPos X="16" Y="10"/> <CursorPos X="16" Y="10"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="2"/> <EditorIndex Value="3"/>
<UsageCount Value="140"/> <UsageCount Value="140"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit5> </Unit5>
@@ -88,16 +88,16 @@
<UnitName Value="xlsbiff2"/> <UnitName Value="xlsbiff2"/>
<CursorPos X="1" Y="387"/> <CursorPos X="1" Y="387"/>
<TopLine Value="367"/> <TopLine Value="367"/>
<EditorIndex Value="9"/> <EditorIndex Value="10"/>
<UsageCount Value="139"/> <UsageCount Value="139"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit6> </Unit6>
<Unit7> <Unit7>
<Filename Value="..\..\fpolestorage.pas"/> <Filename Value="..\..\fpolestorage.pas"/>
<UnitName Value="fpolestorage"/> <UnitName Value="fpolestorage"/>
<CursorPos X="67" Y="797"/> <CursorPos X="92" Y="774"/>
<TopLine Value="792"/> <TopLine Value="763"/>
<EditorIndex Value="10"/> <EditorIndex Value="11"/>
<UsageCount Value="139"/> <UsageCount Value="139"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit7> </Unit7>
@@ -117,7 +117,7 @@
<Filename Value="..\..\fpspreadsheet.pas"/> <Filename Value="..\..\fpspreadsheet.pas"/>
<UnitName Value="fpspreadsheet"/> <UnitName Value="fpspreadsheet"/>
<CursorPos X="5" Y="181"/> <CursorPos X="5" Y="181"/>
<TopLine Value="157"/> <TopLine Value="177"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<UsageCount Value="95"/> <UsageCount Value="95"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@@ -151,9 +151,9 @@
<Unit15> <Unit15>
<Filename Value="..\..\xlsbiff8.pas"/> <Filename Value="..\..\xlsbiff8.pas"/>
<UnitName Value="xlsbiff8"/> <UnitName Value="xlsbiff8"/>
<CursorPos X="11" Y="54"/> <CursorPos X="21" Y="1053"/>
<TopLine Value="48"/> <TopLine Value="1041"/>
<EditorIndex Value="8"/> <EditorIndex Value="9"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit15> </Unit15>
@@ -162,7 +162,7 @@
<UnitName Value="uvirtuallayer"/> <UnitName Value="uvirtuallayer"/>
<CursorPos X="108" Y="901"/> <CursorPos X="108" Y="901"/>
<TopLine Value="885"/> <TopLine Value="885"/>
<EditorIndex Value="5"/> <EditorIndex Value="6"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit16> </Unit16>
@@ -171,7 +171,7 @@
<UnitName Value="uvirtuallayer_types"/> <UnitName Value="uvirtuallayer_types"/>
<CursorPos X="27" Y="177"/> <CursorPos X="27" Y="177"/>
<TopLine Value="165"/> <TopLine Value="165"/>
<EditorIndex Value="7"/> <EditorIndex Value="8"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit17> </Unit17>
@@ -179,140 +179,149 @@
<Filename Value="..\..\..\..\..\..\..\..\usr\local\share\fpcsrc\rtl\objpas\sysutils\filutilh.inc"/> <Filename Value="..\..\..\..\..\..\..\..\usr\local\share\fpcsrc\rtl\objpas\sysutils\filutilh.inc"/>
<CursorPos X="24" Y="20"/> <CursorPos X="24" Y="20"/>
<TopLine Value="12"/> <TopLine Value="12"/>
<EditorIndex Value="6"/> <EditorIndex Value="7"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit18> </Unit18>
<Unit19> <Unit19>
<Filename Value="..\..\fpolebasic.pas"/> <Filename Value="..\..\fpolebasic.pas"/>
<UnitName Value="fpolebasic"/> <UnitName Value="fpolebasic"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="35"/>
<TopLine Value="1"/> <TopLine Value="16"/>
<EditorIndex Value="4"/> <EditorIndex Value="5"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit19> </Unit19>
<Unit20>
<Filename Value="..\..\laz_fpspreadsheet.pas"/>
<UnitName Value="laz_fpspreadsheet"/>
<CursorPos X="10" Y="16"/>
<TopLine Value="1"/>
<EditorIndex Value="2"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit20>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="921" Column="1" TopLine="911"/> <Caret Line="918" Column="1" TopLine="910"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="923" Column="1" TopLine="913"/> <Caret Line="886" Column="1" TopLine="867"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="918" Column="1" TopLine="908"/> <Caret Line="889" Column="1" TopLine="876"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="921" Column="1" TopLine="911"/> <Caret Line="68" Column="24" TopLine="58"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="924" Column="1" TopLine="914"/> <Caret Line="887" Column="1" TopLine="882"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="926" Column="1" TopLine="916"/> <Caret Line="64" Column="37" TopLine="55"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="918" Column="1" TopLine="910"/> <Caret Line="934" Column="5" TopLine="915"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="886" Column="1" TopLine="867"/> <Caret Line="941" Column="23" TopLine="925"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="889" Column="1" TopLine="876"/> <Caret Line="72" Column="25" TopLine="62"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\fpspreadsheet.pas"/>
<Caret Line="68" Column="24" TopLine="58"/> <Caret Line="499" Column="45" TopLine="486"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="887" Column="1" TopLine="882"/> <Caret Line="948" Column="1" TopLine="946"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="64" Column="37" TopLine="55"/> <Caret Line="994" Column="12" TopLine="981"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="934" Column="5" TopLine="915"/> <Caret Line="891" Column="1" TopLine="872"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="941" Column="23" TopLine="925"/> <Caret Line="70" Column="15" TopLine="60"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="72" Column="25" TopLine="62"/> <Caret Line="1063" Column="1" TopLine="1050"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="..\..\fpspreadsheet.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="499" Column="45" TopLine="486"/> <Caret Line="1064" Column="1" TopLine="1051"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="948" Column="1" TopLine="946"/> <Caret Line="1065" Column="1" TopLine="1052"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\uvirtuallayer.pas"/>
<Caret Line="994" Column="12" TopLine="981"/> <Caret Line="1" Column="1" TopLine="1"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="891" Column="1" TopLine="872"/>
</Position19>
<Position20>
<Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="70" Column="15" TopLine="60"/>
</Position20>
<Position21>
<Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="1063" Column="1" TopLine="1050"/>
</Position21>
<Position22>
<Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="1064" Column="1" TopLine="1051"/>
</Position22>
<Position23>
<Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="1065" Column="1" TopLine="1052"/>
</Position23>
<Position24>
<Filename Value="..\..\uvirtuallayer.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position24>
<Position25>
<Filename Value="..\..\uvirtuallayer.pas"/> <Filename Value="..\..\uvirtuallayer.pas"/>
<Caret Line="12" Column="21" TopLine="1"/> <Caret Line="12" Column="21" TopLine="1"/>
</Position25> </Position19>
<Position26> <Position20>
<Filename Value="..\..\uvirtuallayer_types.pas"/> <Filename Value="..\..\uvirtuallayer_types.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="1" Column="1" TopLine="1"/>
</Position26> </Position20>
<Position27> <Position21>
<Filename Value="..\..\uvirtuallayer.pas"/> <Filename Value="..\..\uvirtuallayer.pas"/>
<Caret Line="987" Column="20" TopLine="963"/> <Caret Line="987" Column="20" TopLine="963"/>
</Position27> </Position21>
<Position28> <Position22>
<Filename Value="..\..\uvirtuallayer.pas"/> <Filename Value="..\..\uvirtuallayer.pas"/>
<Caret Line="893" Column="15" TopLine="882"/> <Caret Line="893" Column="15" TopLine="882"/>
</Position28> </Position22>
<Position29> <Position23>
<Filename Value="..\..\uvirtuallayer.pas"/> <Filename Value="..\..\uvirtuallayer.pas"/>
<Caret Line="894" Column="20" TopLine="882"/> <Caret Line="894" Column="20" TopLine="882"/>
</Position29> </Position23>
<Position30> <Position24>
<Filename Value="..\..\xlsbiff5.pas"/> <Filename Value="..\..\xlsbiff5.pas"/>
<Caret Line="60" Column="20" TopLine="49"/> <Caret Line="60" Column="20" TopLine="49"/>
</Position24>
<Position25>
<Filename Value="..\..\xlsbiff8.pas"/>
<Caret Line="54" Column="11" TopLine="48"/>
</Position25>
<Position26>
<Filename Value="..\..\xlsbiff8.pas"/>
<Caret Line="1053" Column="22" TopLine="1041"/>
</Position26>
<Position27>
<Filename Value="..\..\fpolestorage.pas"/>
<Caret Line="98" Column="15" TopLine="66"/>
</Position27>
<Position28>
<Filename Value="..\..\xlsbiff8.pas"/>
<Caret Line="1053" Column="21" TopLine="1041"/>
</Position28>
<Position29>
<Filename Value="..\..\fpolestorage.pas"/>
<Caret Line="98" Column="91" TopLine="86"/>
</Position29>
<Position30>
<Filename Value="..\..\laz_fpspreadsheet.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>

4
components/fpspreadsheet/fpolestorage.pas
View File

@@ -95,7 +95,7 @@ type
constructor Create; constructor Create;
destructor Destroy; override; destructor Destroy; override;
procedure WriteOLEFile(AFileName: string; AOLEDocument: TOLEDocument; const AStreamName: UTF8String='Book'); procedure WriteOLEFile(AFileName: string; AOLEDocument: TOLEDocument; const AStreamName: UTF8String='Book');
procedure ReadOLEFile(AFileName: string; AOLEDocument: TOLEDocument); procedure ReadOLEFile(AFileName: string; AOLEDocument: TOLEDocument; const AStreamName: UTF8String='Book');
procedure FreeOLEDocumentData(AOLEDocument: TOLEDocument); procedure FreeOLEDocumentData(AOLEDocument: TOLEDocument);
end; end;
@@ -764,7 +764,7 @@ end;
Reads an OLE file. Reads an OLE file.
} }
procedure TOLEStorage.ReadOLEFile(AFileName: string; procedure TOLEStorage.ReadOLEFile(AFileName: string;
AOLEDocument: TOLEDocument); AOLEDocument: TOLEDocument; const AStreamName: UTF8String='Book');
var var
AFileStream: TFileStream; AFileStream: TFileStream;
CurrentSectorPos: Int64; CurrentSectorPos: Int64;

8
components/fpspreadsheet/laz_fpspreadsheet.pas
View File

@@ -8,9 +8,13 @@ interface
uses uses
fpolestorage, fpsallformats, fpsopendocument, fpspreadsheet, xlsbiff2, fpolestorage, fpsallformats, fpsopendocument, fpspreadsheet, xlsbiff2,
xlsbiff5, xlsbiff8, xlsxooxml, fpsutils, fpszipper, uvirtuallayer_types, xlsbiff5, xlsbiff8, xlsxooxml, fpsutils, fpszipper,
{$ifdef USE_NEW_OLE}
uvirtuallayer_types,
uvirtuallayer, uvirtuallayer_ole, uvirtuallayer_ole_helpers, uvirtuallayer, uvirtuallayer_ole, uvirtuallayer_ole_helpers,
uvirtuallayer_ole_types, uvirtuallayer_stream, fpolebasic, LazarusPackageIntf; uvirtuallayer_ole_types, uvirtuallayer_stream, fpolebasic,
{$endif}
LazarusPackageIntf;
implementation implementation