fpspreadsheet: Prepare for release 1.10

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6547 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2018-07-06 16:15:51 +00:00
parent 0097e6c586
commit 92f59fbfd1
17 changed files with 58 additions and 27 deletions
--- a/components/fpspreadsheet/docs/fpspreadsheet-api.chm
+++ b/components/fpspreadsheet/docs/fpspreadsheet-api.chm
--- a/components/fpspreadsheet/docs/fpspreadsheet-wiki.chm
+++ b/components/fpspreadsheet/docs/fpspreadsheet-wiki.chm
--- a/components/fpspreadsheet/examples/fpsspeedtest/mainform.lfm
+++ b/components/fpspreadsheet/examples/fpsspeedtest/mainform.lfm
@ -11,7 +11,7 @@ object Form1: TForm1
  OnCreate = FormCreate
  OnDestroy = FormDestroy
  OnKeyPress = FormKeyPress
-  LCLVersion = '1.5'
+  LCLVersion = '1.8.4.0'
  object StatusBar: TStatusBar
    Left = 0
    Height = 23
--- a/components/fpspreadsheet/examples/fpsspeedtest/mainform.pas
+++ b/components/fpspreadsheet/examples/fpsspeedtest/mainform.pas
@ -279,7 +279,7 @@ begin
          case RgContent.ItemIndex of
            0: for ACol := 0 to numCols-1 do begin
                 S := 'Xy' + IntToStr(ARow) + 'x' + IntToStr(ACol);
-                 MyWorksheet.WriteUTF8Text(ARow, ACol, S);
+                 MyWorksheet.WriteText(ARow, ACol, S);
               end;
            1: for ACol := 0 to numCols-1 do
                 MyWorksheet.WriteNumber(ARow, ACol, 1E5*ARow + ACol);
@ -287,7 +287,7 @@ begin
                 if (odd(ARow) and odd(ACol)) or odd(ARow+ACol) then
                 begin
                   S := 'Xy' + IntToStr(ARow) + 'x' + IntToStr(ACol);
-                   MyWorksheet.WriteUTF8Text(ARow, ACol, S);
+                   MyWorksheet.WriteText(ARow, ACol, S);
                 end else
                   MyWorksheet.WriteNumber(ARow, ACol, 1E5*ARow + ACol);
          end;
--- a/components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpi
@ -74,7 +74,7 @@
      <Filename Value="fpsgrid"/>
    </Target>
    <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="$(ProjOutDir);..\..\..\source"/>
      <OtherUnitFiles Value="..\..\..\source\common;..\..\..\source\visual"/>
      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
    </SearchPaths>
--- a/components/fpspreadsheet/laz_fpspreadsheet.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet.lpk
@ -8,7 +8,7 @@
      <Version Value="11"/>
      <PathDelim Value="\"/>
      <SearchPaths>
-        <IncludeFiles Value="source\"/>
+        <IncludeFiles Value="source"/>
        <OtherUnitFiles Value="source\common"/>
        <UnitOutputDirectory Value="source\common\lib\$(TargetCPU)-$(TargetOS)"/>
      </SearchPaths>
@ -33,7 +33,7 @@

 This package is all you need if you don't want graphical components (like grids and charts)."/>
    <License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
-    <Version Major="1" Minor="9"/>
+    <Version Major="1" Minor="10"/>
    <Files Count="46">
      <Item1>
        <Filename Value="source\fps.inc"/>
--- a/components/fpspreadsheet/laz_fpspreadsheet_crypto.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet_crypto.lpk
@ -9,11 +9,11 @@
      <PathDelim Value="\"/>
      <SearchPaths>
        <OtherUnitFiles Value="source\crypto"/>
-        <UnitOutputDirectory Value="source\lib\$(TargetCPU)-$(TargetOS)\"/>
+        <UnitOutputDirectory Value="source\lib\$(TargetCPU)-$(TargetOS)"/>
      </SearchPaths>
    </CompilerOptions>
    <Description Value="Encryption / decryption support for FPSpreadsheet"/>
-    <Version Major="1" Minor="9"/>
+    <Version Major="1" Minor="10"/>
    <Files Count="2">
      <Item1>
        <Filename Value="source\crypto\xlsxdecrypter.pas"/>
@ -30,6 +30,7 @@
      </Item1>
      <Item2>
        <PackageName Value="laz_fpspreadsheet"/>
+        <MinVersion Major="1" Minor="10" Valid="True"/>
      </Item2>
      <Item3>
        <PackageName Value="FCL"/>
--- a/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
@ -20,7 +20,7 @@

 It provides graphical components like a grid and chart."/>
    <License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
-    <Version Major="1" Minor="9"/>
+    <Version Major="1" Minor="10"/>
    <Files Count="5">
      <Item1>
        <Filename Value="source\visual\fpspreadsheetchart.pas"/>
@ -46,8 +46,8 @@ It provides graphical components like a grid and chart."/>
    <RequiredPkgs Count="4">
      <Item1>
        <PackageName Value="laz_fpspreadsheet"/>
-        <MaxVersion Major="1" Minor="8"/>
-        <MinVersion Major="1" Minor="9" Valid="True"/>
+        <MaxVersion Major="1" Minor="9"/>
+        <MinVersion Major="1" Minor="10" Valid="True"/>
      </Item1>
      <Item2>
        <PackageName Value="tachartlazaruspkg"/>
--- a/components/fpspreadsheet/laz_fpspreadsheet_visual_dsgn.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet_visual_dsgn.lpk
@ -16,7 +16,7 @@
    </CompilerOptions>
    <Description Value="laz_fpspreadsheet_visual_dsgn is the design-tim package for the visual fpspreadsheet components."/>
    <License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
-    <Version Major="1" Minor="9"/>
+    <Version Major="1" Minor="10"/>
    <Files Count="1">
      <Item1>
        <Filename Value="source\design\fpsvisualreg.pas"/>
@ -24,16 +24,14 @@
        <UnitName Value="fpsvisualreg"/>
      </Item1>
    </Files>
-    <RequiredPkgs Count="3">
+    <RequiredPkgs Count="2">
      <Item1>
        <PackageName Value="laz_fpspreadsheet_visual"/>
+        <MinVersion Major="1" Minor="10" Valid="True"/>
      </Item1>
      <Item2>
-        <PackageName Value="laz_fpspreadsheet"/>
-      </Item2>
-      <Item3>
        <PackageName Value="FCL"/>
-      </Item3>
+      </Item2>
    </RequiredPkgs>
    <UsageOptions>
      <UnitPath Value="$(PkgOutDir)"/>
--- a/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
@ -9,7 +9,7 @@
      <Version Value="11"/>
      <PathDelim Value="\"/>
      <SearchPaths>
-        <OtherUnitFiles Value="source\export;source\design"/>
+        <OtherUnitFiles Value="source\export"/>
        <UnitOutputDirectory Value="source\export\lib\$(TargetCPU)-$(TargetOS)"/>
      </SearchPaths>
      <Parsing>
@ -25,14 +25,14 @@

 It provides a graphical export component on the Data Export tab."/>
    <License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
-    <Version Major="1" Minor="9"/>
+    <Version Major="1" Minor="10"/>
    <Files Count="2">
      <Item1>
        <Filename Value="source\export\fpsexport.pas"/>
        <UnitName Value="fpsexport"/>
      </Item1>
      <Item2>
-        <Filename Value="source\design\fpsexportreg.pas"/>
+        <Filename Value="source\export\fpsexportreg.pas"/>
        <HasRegisterProc Value="True"/>
        <UnitName Value="fpsexportreg"/>
      </Item2>
@ -43,8 +43,8 @@ It provides a graphical export component on the Data Export tab."/>
      </Item1>
      <Item2>
        <PackageName Value="laz_fpspreadsheet"/>
-        <MaxVersion Major="1" Minor="8"/>
-        <MinVersion Major="1" Minor="9" Valid="True"/>
+        <MaxVersion Major="1" Minor="9"/>
+        <MinVersion Major="1" Minor="10" Valid="True"/>
      </Item2>
      <Item3>
        <PackageName Value="LCL"/>
--- a/components/fpspreadsheet/source/common/fpsfunc.pas
+++ b/components/fpspreadsheet/source/common/fpsfunc.pas
@ -1083,7 +1083,6 @@ var
  r, c: LongInt;
  dr, dc: LongInt;
  cell, addcell: PCell;
-  sh: Integer;
  s: String;
  f: Double;
  dt: TDateTime;
--- a/components/fpspreadsheet/source/common/xlsbiff8.pas
+++ b/components/fpspreadsheet/source/common/xlsbiff8.pas
@ -3066,6 +3066,8 @@ var
  sheet: TsWorksheet absolute AWorksheet;

 begin
+  Unused(ASheetIndex, AKind);
+
  // Since this is a variable length record we begin by writing the formula
  // to a memory stream
  memstream := TMemoryStream.Create;
--- a/components/fpspreadsheet/source/common/xlsxooxml.pas
+++ b/components/fpspreadsheet/source/common/xlsxooxml.pas
@ -640,7 +640,6 @@ var
  dataStr: String;
  formulaStr: String;
  formula: PsFormula;
-  isSharedFormula: Boolean;
  nodeName: String;
  sstIndex: Integer;
  number: Double;
--- a/components/fpspreadsheet/source/design/fpsvisualreg.pas
+++ b/components/fpspreadsheet/source/design/fpsvisualreg.pas
@ -2,12 +2,12 @@ unit fpsvisualreg;

 {$mode objfpc}{$H+}

-{$R ../../resource\fpsvisualreg.res}
+{$R ../../resource/fpsvisualreg.res}

 interface

 uses
-  Classes, SysUtils, fpsallformats;
+  Classes, SysUtils, {%H-}fpsallformats;

 procedure Register;
  
--- a/components/fpspreadsheet/source/export/fpsexportreg.pas
+++ b/components/fpspreadsheet/source/export/fpsexportreg.pas
@ -0,0 +1,32 @@
+{
+  Registration for fpsexport into the Lazarus component palette
+  This requires package lazdbexport for property editors etc
+}
+unit fpsexportreg;
+
+{$mode objfpc}{$H+}
+{$R ../../resource/fpsvisualexportreg.res}
+
+interface
+
+uses
+  Classes, SysUtils, LazarusPackageIntf, lresources;
+
+procedure Register;
+
+implementation
+
+uses
+  fpsexport;
+
+{@@ ----------------------------------------------------------------------------
+  Registers the export component in the Lazarus component palette,
+  page "Data Export".
+-------------------------------------------------------------------------------}
+procedure Register;
+begin
+  RegisterComponents('Data Export', [TFPSExport]);
+end;
+
+end.
+
--- a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas
@ -2235,6 +2235,7 @@ end;

 procedure TsCellEdit.WMKillFocus(var AMessage: TLMKillFocus);
 begin
+  Unused(AMessage);
  // Override inherited behavior because we don't want to call EditingDone
  // here.
 end;
--- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
@ -1185,7 +1185,6 @@ procedure TsMultilineStringCellEditor.KeyDown(var AKey: Word; AShift: TShiftStat

 var
  IntSel: boolean;
-  msg: String;
 begin
  inherited KeyDown(AKey, AShift);
  case AKey of