From 4cdb95d86c2b61b054fb448caab5c748060d2c84 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 9 Jul 2018 17:27:22 +0000
Subject: [PATCH] fpspreadsheet: Set version to 1.11. Make default parameter of
 TsWorkbook.CopyWorksheetFrom non-default.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6552 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpr       | 2 +-
 components/fpspreadsheet/laz_fpspreadsheet.lpk              | 2 +-
 components/fpspreadsheet/laz_fpspreadsheet_crypto.lpk       | 5 +++--
 components/fpspreadsheet/laz_fpspreadsheet_visual.lpk       | 6 +++---
 components/fpspreadsheet/laz_fpspreadsheet_visual_dsgn.lpk  | 5 +++--
 components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk | 6 +++---
 components/fpspreadsheet/source/common/fpsfunc.pas          | 3 ++-
 components/fpspreadsheet/source/common/fpspreadsheet.pas    | 4 ++--
 .../fpspreadsheet/source/visual/fpspreadsheetchart.pas      | 6 +++---
 9 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpr b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpr
index 43f1dc6e9..ee4acba5d 100644
--- a/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpr
+++ b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpr
@@ -4,7 +4,7 @@ program fpsgrid;
 
 uses
   Interfaces, // this includes the LCL widgetset
-  Forms, mainform, LResources, laz_fpspreadsheet_visual;
+  Forms, mainform, LResources;
 
 {$R *.res}
 
diff --git a/components/fpspreadsheet/laz_fpspreadsheet.lpk b/components/fpspreadsheet/laz_fpspreadsheet.lpk
index c16c8f85c..300e81067 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet.lpk
@@ -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="10"/>
+    <Version Major="1" Minor="11"/>
     <Files Count="46">
       <Item1>
         <Filename Value="source\fps.inc"/>
diff --git a/components/fpspreadsheet/laz_fpspreadsheet_crypto.lpk b/components/fpspreadsheet/laz_fpspreadsheet_crypto.lpk
index 6f84b32fa..4c3ed95fc 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet_crypto.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet_crypto.lpk
@@ -13,7 +13,7 @@
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Encryption / decryption support for FPSpreadsheet"/>
-    <Version Major="1" Minor="10"/>
+    <Version Major="1" Minor="11"/>
     <Files Count="2">
       <Item1>
         <Filename Value="source\crypto\xlsxdecrypter.pas"/>
@@ -30,7 +30,8 @@
       </Item1>
       <Item2>
         <PackageName Value="laz_fpspreadsheet"/>
-        <MinVersion Major="1" Minor="10" Valid="True"/>
+        <MaxVersion Major="1" Minor="10"/>
+        <MinVersion Major="1" Minor="11" Valid="True"/>
       </Item2>
       <Item3>
         <PackageName Value="FCL"/>
diff --git a/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk b/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
index 0d155a12d..08a9c096c 100644
--- 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="10"/>
+    <Version Major="1" Minor="11"/>
     <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="9"/>
-        <MinVersion Major="1" Minor="10" Valid="True"/>
+        <MaxVersion Major="1" Minor="10"/>
+        <MinVersion Major="1" Minor="11" Valid="True"/>
       </Item1>
       <Item2>
         <PackageName Value="tachartlazaruspkg"/>
diff --git a/components/fpspreadsheet/laz_fpspreadsheet_visual_dsgn.lpk b/components/fpspreadsheet/laz_fpspreadsheet_visual_dsgn.lpk
index 8e5d5937f..83ff6bc8d 100644
--- 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="10"/>
+    <Version Major="1" Minor="11"/>
     <Files Count="1">
       <Item1>
         <Filename Value="source\design\fpsvisualreg.pas"/>
@@ -27,7 +27,8 @@
     <RequiredPkgs Count="2">
       <Item1>
         <PackageName Value="laz_fpspreadsheet_visual"/>
-        <MinVersion Major="1" Minor="10" Valid="True"/>
+        <MaxVersion Major="1" Minor="10"/>
+        <MinVersion Major="1" Minor="11" Valid="True"/>
       </Item1>
       <Item2>
         <PackageName Value="FCL"/>
diff --git a/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk b/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
index 4fca472a5..f557f8c27 100644
--- a/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
@@ -25,7 +25,7 @@
 
 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="10"/>
+    <Version Major="1" Minor="11"/>
     <Files Count="2">
       <Item1>
         <Filename Value="source\export\fpsexport.pas"/>
@@ -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="9"/>
-        <MinVersion Major="1" Minor="10" Valid="True"/>
+        <MaxVersion Major="1" Minor="10"/>
+        <MinVersion Major="1" Minor="11" Valid="True"/>
       </Item2>
       <Item3>
         <PackageName Value="LCL"/>
diff --git a/components/fpspreadsheet/source/common/fpsfunc.pas b/components/fpspreadsheet/source/common/fpsfunc.pas
index 6b9ae567e..b2d43695f 100644
--- a/components/fpspreadsheet/source/common/fpsfunc.pas
+++ b/components/fpspreadsheet/source/common/fpsfunc.pas
@@ -18,7 +18,8 @@ implementation
 
 uses
   Math, lazutf8, StrUtils, DateUtils,
-  xlsconst, {%H-}fpsPatches, fpsUtils, fpsnumformat, fpsexprparser, fpspreadsheet;
+  xlsconst, {%H-}fpsPatches, fpsUtils,
+  fpsnumformat, fpspreadsheet, fpsexprparser;
 
 
 {------------------------------------------------------------------------------}
diff --git a/components/fpspreadsheet/source/common/fpspreadsheet.pas b/components/fpspreadsheet/source/common/fpspreadsheet.pas
index 758138067..3537ed0e0 100644
--- a/components/fpspreadsheet/source/common/fpspreadsheet.pas
+++ b/components/fpspreadsheet/source/common/fpspreadsheet.pas
@@ -733,7 +733,7 @@ type
     function  AddWorksheet(AName: string;
       ReplaceDuplicateName: Boolean = false): TsWorksheet;
     function  CopyWorksheetFrom(AWorksheet: TsWorksheet;
-      ReplaceDuplicateName: Boolean = false): TsWorksheet;
+      ReplaceDuplicateName: Boolean): TsWorksheet;
     function  GetFirstWorksheet: TsWorksheet;
     function  GetLastWorksheet: TsWorksheet;
     function  GetNextWorksheet(AWorksheet: TsWorksheet): TsWorksheet;
@@ -8796,7 +8796,7 @@ end;
   @see    TsWorksheet
 -------------------------------------------------------------------------------}
 function TsWorkbook.CopyWorksheetFrom(AWorksheet: TsWorksheet;
-  ReplaceDuplicateName: boolean = false): TsWorksheet;
+  ReplaceDuplicateName: boolean): TsWorksheet;
 var
   r, c: Cardinal;
   cell: PCell;
diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas b/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas
index e4b399db4..cef43bf25 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas
@@ -20,10 +20,10 @@ uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs,
   // TChart
   TACustomSource,
-  // FPSpreadsheet
-  fpstypes, fpspreadsheet, fpsutils,
   // FPSpreadsheet Visual
-  fpspreadsheetctrls, fpspreadsheetgrid;
+  fpspreadsheetctrls, fpspreadsheetgrid,
+  // FPSpreadsheet
+  fpstypes, fpspreadsheet, fpsutils;
 
 type