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

fpspreadsheet: Use patched zipper unit, remove dependence on Abbrevia.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8911 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2023-08-04 22:19:16 +00:00
parent 36537f3875
commit 1c81982561
6 changed files with 1747 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/fpspreadsheet/laz_fpspreadsheet_crypto.lpk
View File

@@ -33,18 +33,15 @@
</Item4> </Item4>
</Files> </Files>
<CompatibilityMode Value="True"/> <CompatibilityMode Value="True"/>
<RequiredPkgs Count="3"> <RequiredPkgs Count="2">
<Item1> <Item1>
<PackageName Value="Abbrevia"/>
</Item1>
<Item2>
<PackageName Value="laz_fpspreadsheet"/> <PackageName Value="laz_fpspreadsheet"/>
<MaxVersion Major="1" Minor="11"/> <MaxVersion Major="1" Minor="11"/>
<MinVersion Major="1" Minor="12" Valid="True"/> <MinVersion Major="1" Minor="12" Valid="True"/>
</Item2> </Item1>
<Item3> <Item2>
<PackageName Value="FCL"/> <PackageName Value="FCL"/>
</Item3> </Item2>
</RequiredPkgs> </RequiredPkgs>
<UsageOptions> <UsageOptions>
<UnitPath Value="$(PkgOutDir)"/> <UnitPath Value="$(PkgOutDir)"/>

7
components/fpspreadsheet/source/common/fpsxmlcommon.pas
View File

@@ -4,16 +4,17 @@
unit fpsXMLCommon; unit fpsXMLCommon;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
{$include ..\fps.inc}
interface interface
uses uses
Classes, SysUtils, Classes, SysUtils,
laz2_xmlread, laz2_DOM, laz2_xmlread, laz2_DOM,
{$IF FPC_FULLVERSION >= 20701} {$IFDEF FPS_PATCHED_ZIPPER}
zipper,
{$ELSE}
fpszipper, fpszipper,
{$ELSE}
zipper,
{$ENDIF} {$ENDIF}
fpstypes, fpsreaderwriter; fpstypes, fpsreaderwriter;

2203
components/fpspreadsheet/source/common/fpszipper.pp
View File

File diff suppressed because it is too large Load Diff

6
components/fpspreadsheet/source/common/xlsxooxml.pas
View File

@@ -37,10 +37,10 @@ interface
uses uses
Classes, SysUtils, Classes, SysUtils,
laz2_xmlread, laz2_DOM, avglvltree, laz2_xmlread, laz2_DOM, avglvltree,
{$IF FPC_FULLVERSION >= 20701} {$IFDEF FPS_PATCHED_ZIPPER}
zipper,
{$ELSE}
fpszipper, fpszipper,
{$ELSE}
zipper,
{$ENDIF} {$ENDIF}
fpsTypes, fpsUtils, fpsReaderWriter, fpsNumFormat, fpsPalette, fpsTypes, fpsUtils, fpsReaderWriter, fpsNumFormat, fpsPalette,
fpsConditionalFormat, fpsConditionalFormat,

2
components/fpspreadsheet/source/crypto/fpsopendocument_crypto.pas
View File

@@ -1,7 +1,7 @@
unit fpsOpenDocument_Crypto; unit fpsOpenDocument_Crypto;
{$MODE ObjFPC}{$H+} {$MODE ObjFPC}{$H+}
{$DEFINE UNZIP_ABBREVIA} // Remove this define when zipper is fixed. {.$DEFINE UNZIP_ABBREVIA} // Remove this define when zipper is fixed.
interface interface

5
components/fpspreadsheet/source/fps.inc
View File

@@ -62,3 +62,8 @@
e.g. before v3.0 } e.g. before v3.0 }
{.$DEFINE FPS_NO_STRING_SPLIT} {.$DEFINE FPS_NO_STRING_SPLIT}
{ Very old FPC versions do not contain zip support in the unit zipper, and
until v3.3 zipper did not read pass-word protected ods files correctly.
Therefore, the following define must be activated if FPC is v3.3 or older. }
{$DEFINE FPS_PATCHED_ZIPPER}