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
This commit is contained in:
wp_xxyyzz
2018-07-09 17:27:22 +00:00
parent cbf4d62a9c
commit 4cdb95d86c
9 changed files with 21 additions and 18 deletions

View File

@ -4,7 +4,7 @@ program fpsgrid;
uses
Interfaces, // this includes the LCL widgetset
Forms, mainform, LResources, laz_fpspreadsheet_visual;
Forms, mainform, LResources;
{$R *.res}

View File

@ -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"/>

View File

@ -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"/>

View File

@ -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"/>

View File

@ -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"/>

View File

@ -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"/>

View File

@ -18,7 +18,8 @@ implementation
uses
Math, lazutf8, StrUtils, DateUtils,
xlsconst, {%H-}fpsPatches, fpsUtils, fpsnumformat, fpsexprparser, fpspreadsheet;
xlsconst, {%H-}fpsPatches, fpsUtils,
fpsnumformat, fpspreadsheet, fpsexprparser;
{------------------------------------------------------------------------------}

View File

@ -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;

View File

@ -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