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

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

components/fpspreadsheet/laz_fpspreadsheet_crypto.lpk

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

components/fpspreadsheet/source/common/fpsxmlcommon.pas

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

components/fpspreadsheet/source/common/xlsxooxml.pas

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

components/fpspreadsheet/source/crypto/fpsopendocument_crypto.pas

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

components/fpspreadsheet/source/fps.inc

@@ -62,3 +62,8 @@
   e.g. before v3.0 }
 {.$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}
+