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

Patch from Joshy, small fix for OLE

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@810 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2009-05-26 18:32:09 +00:00
parent 13d1e675e6
commit 90d327e0ee
5 changed files with 103 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
components/fpspreadsheet/fpolestorage.pas
View File

@ -246,7 +246,7 @@ begin
And after that only $FFFFFFFF until $400 }
AStream.WriteDWord(DWordToLE($FFFFFFFD)); // SAT
AStream.WriteDWord($FFFFFFFF); // Empty
AStream.WriteDWord($FFFFFFFE); // Empty, doesn't work with $FFFFFFFF
// If we don't use short sectors we won't write a section for their SSAT
if FUseShortSectors then

4
components/fpspreadsheet/uvirtuallayer.pas
View File

@ -890,7 +890,11 @@ begin
LHandle^.FL:=FindL;
LHandle^.Attr:=Attr;
{$HINTS OFF}
{$ifdef UNIX}
Rlst.FindHandle:=LHandle;
{$else}
Rlst.FindHandle:=PtrUint(LHandle);
{$endif}
{$HINTS ON}
if Assigned(FindL) Then begin
if FindL.Count>0 Then begin

8
components/fpspreadsheet/xlsbiff5.pas
View File

@ -57,7 +57,13 @@ interface
uses
Classes, SysUtils, fpcanvas,
fpspreadsheet, fpolebasic, fpsutils;
fpspreadsheet,
{$ifdef USE_NEW_OLE}
fpolebasic,
{$else}
fpolestorage,
{$endif}
fpsutils;
type

8
components/fpspreadsheet/xlsbiff8.pas
View File

@ -50,7 +50,13 @@ interface
uses
Classes, SysUtils, fpcanvas,
fpspreadsheet, fpolebasic, fpsutils;
fpspreadsheet,
{$ifdef USE_NEW_OLE}
fpolebasic,
{$else}
fpolestorage,
{$endif}
fpsutils;
type