Fix Mac OS X compilation

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@811 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/fpspreadsheet/examples/excel5demo/excel5read.lpi

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

components/fpspreadsheet/fpolestorage.pas

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

components/fpspreadsheet/laz_fpspreadsheet.pas

@@ -8,9 +8,13 @@ interface
 
 uses
   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_ole_types, uvirtuallayer_stream, fpolebasic, LazarusPackageIntf;
+  uvirtuallayer_ole_types, uvirtuallayer_stream, fpolebasic,
+  {$endif}
+  LazarusPackageIntf;
 
 implementation