You've already forked lazarus-ccr
fpspreadsheet: Prepare for release 1.10
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6547 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
Binary file not shown.
Binary file not shown.
@ -11,7 +11,7 @@ object Form1: TForm1
|
|||||||
OnCreate = FormCreate
|
OnCreate = FormCreate
|
||||||
OnDestroy = FormDestroy
|
OnDestroy = FormDestroy
|
||||||
OnKeyPress = FormKeyPress
|
OnKeyPress = FormKeyPress
|
||||||
LCLVersion = '1.5'
|
LCLVersion = '1.8.4.0'
|
||||||
object StatusBar: TStatusBar
|
object StatusBar: TStatusBar
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 23
|
Height = 23
|
||||||
|
@ -279,7 +279,7 @@ begin
|
|||||||
case RgContent.ItemIndex of
|
case RgContent.ItemIndex of
|
||||||
0: for ACol := 0 to numCols-1 do begin
|
0: for ACol := 0 to numCols-1 do begin
|
||||||
S := 'Xy' + IntToStr(ARow) + 'x' + IntToStr(ACol);
|
S := 'Xy' + IntToStr(ARow) + 'x' + IntToStr(ACol);
|
||||||
MyWorksheet.WriteUTF8Text(ARow, ACol, S);
|
MyWorksheet.WriteText(ARow, ACol, S);
|
||||||
end;
|
end;
|
||||||
1: for ACol := 0 to numCols-1 do
|
1: for ACol := 0 to numCols-1 do
|
||||||
MyWorksheet.WriteNumber(ARow, ACol, 1E5*ARow + ACol);
|
MyWorksheet.WriteNumber(ARow, ACol, 1E5*ARow + ACol);
|
||||||
@ -287,7 +287,7 @@ begin
|
|||||||
if (odd(ARow) and odd(ACol)) or odd(ARow+ACol) then
|
if (odd(ARow) and odd(ACol)) or odd(ARow+ACol) then
|
||||||
begin
|
begin
|
||||||
S := 'Xy' + IntToStr(ARow) + 'x' + IntToStr(ACol);
|
S := 'Xy' + IntToStr(ARow) + 'x' + IntToStr(ACol);
|
||||||
MyWorksheet.WriteUTF8Text(ARow, ACol, S);
|
MyWorksheet.WriteText(ARow, ACol, S);
|
||||||
end else
|
end else
|
||||||
MyWorksheet.WriteNumber(ARow, ACol, 1E5*ARow + ACol);
|
MyWorksheet.WriteNumber(ARow, ACol, 1E5*ARow + ACol);
|
||||||
end;
|
end;
|
||||||
|
@ -74,7 +74,7 @@
|
|||||||
<Filename Value="fpsgrid"/>
|
<Filename Value="fpsgrid"/>
|
||||||
</Target>
|
</Target>
|
||||||
<SearchPaths>
|
<SearchPaths>
|
||||||
<IncludeFiles Value="$(ProjOutDir)"/>
|
<IncludeFiles Value="$(ProjOutDir);..\..\..\source"/>
|
||||||
<OtherUnitFiles Value="..\..\..\source\common;..\..\..\source\visual"/>
|
<OtherUnitFiles Value="..\..\..\source\common;..\..\..\source\visual"/>
|
||||||
<UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
|
<UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
|
||||||
</SearchPaths>
|
</SearchPaths>
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
<Version Value="11"/>
|
<Version Value="11"/>
|
||||||
<PathDelim Value="\"/>
|
<PathDelim Value="\"/>
|
||||||
<SearchPaths>
|
<SearchPaths>
|
||||||
<IncludeFiles Value="source\"/>
|
<IncludeFiles Value="source"/>
|
||||||
<OtherUnitFiles Value="source\common"/>
|
<OtherUnitFiles Value="source\common"/>
|
||||||
<UnitOutputDirectory Value="source\common\lib\$(TargetCPU)-$(TargetOS)"/>
|
<UnitOutputDirectory Value="source\common\lib\$(TargetCPU)-$(TargetOS)"/>
|
||||||
</SearchPaths>
|
</SearchPaths>
|
||||||
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
This package is all you need if you don't want graphical components (like grids and charts)."/>
|
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)."/>
|
<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">
|
<Files Count="46">
|
||||||
<Item1>
|
<Item1>
|
||||||
<Filename Value="source\fps.inc"/>
|
<Filename Value="source\fps.inc"/>
|
||||||
|
@ -9,11 +9,11 @@
|
|||||||
<PathDelim Value="\"/>
|
<PathDelim Value="\"/>
|
||||||
<SearchPaths>
|
<SearchPaths>
|
||||||
<OtherUnitFiles Value="source\crypto"/>
|
<OtherUnitFiles Value="source\crypto"/>
|
||||||
<UnitOutputDirectory Value="source\lib\$(TargetCPU)-$(TargetOS)\"/>
|
<UnitOutputDirectory Value="source\lib\$(TargetCPU)-$(TargetOS)"/>
|
||||||
</SearchPaths>
|
</SearchPaths>
|
||||||
</CompilerOptions>
|
</CompilerOptions>
|
||||||
<Description Value="Encryption / decryption support for FPSpreadsheet"/>
|
<Description Value="Encryption / decryption support for FPSpreadsheet"/>
|
||||||
<Version Major="1" Minor="9"/>
|
<Version Major="1" Minor="10"/>
|
||||||
<Files Count="2">
|
<Files Count="2">
|
||||||
<Item1>
|
<Item1>
|
||||||
<Filename Value="source\crypto\xlsxdecrypter.pas"/>
|
<Filename Value="source\crypto\xlsxdecrypter.pas"/>
|
||||||
@ -30,6 +30,7 @@
|
|||||||
</Item1>
|
</Item1>
|
||||||
<Item2>
|
<Item2>
|
||||||
<PackageName Value="laz_fpspreadsheet"/>
|
<PackageName Value="laz_fpspreadsheet"/>
|
||||||
|
<MinVersion Major="1" Minor="10" Valid="True"/>
|
||||||
</Item2>
|
</Item2>
|
||||||
<Item3>
|
<Item3>
|
||||||
<PackageName Value="FCL"/>
|
<PackageName Value="FCL"/>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
It provides graphical components like a grid and chart."/>
|
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)."/>
|
<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">
|
<Files Count="5">
|
||||||
<Item1>
|
<Item1>
|
||||||
<Filename Value="source\visual\fpspreadsheetchart.pas"/>
|
<Filename Value="source\visual\fpspreadsheetchart.pas"/>
|
||||||
@ -46,8 +46,8 @@ It provides graphical components like a grid and chart."/>
|
|||||||
<RequiredPkgs Count="4">
|
<RequiredPkgs Count="4">
|
||||||
<Item1>
|
<Item1>
|
||||||
<PackageName Value="laz_fpspreadsheet"/>
|
<PackageName Value="laz_fpspreadsheet"/>
|
||||||
<MaxVersion Major="1" Minor="8"/>
|
<MaxVersion Major="1" Minor="9"/>
|
||||||
<MinVersion Major="1" Minor="9" Valid="True"/>
|
<MinVersion Major="1" Minor="10" Valid="True"/>
|
||||||
</Item1>
|
</Item1>
|
||||||
<Item2>
|
<Item2>
|
||||||
<PackageName Value="tachartlazaruspkg"/>
|
<PackageName Value="tachartlazaruspkg"/>
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
</CompilerOptions>
|
</CompilerOptions>
|
||||||
<Description Value="laz_fpspreadsheet_visual_dsgn is the design-tim package for the visual fpspreadsheet components."/>
|
<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)."/>
|
<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">
|
<Files Count="1">
|
||||||
<Item1>
|
<Item1>
|
||||||
<Filename Value="source\design\fpsvisualreg.pas"/>
|
<Filename Value="source\design\fpsvisualreg.pas"/>
|
||||||
@ -24,16 +24,14 @@
|
|||||||
<UnitName Value="fpsvisualreg"/>
|
<UnitName Value="fpsvisualreg"/>
|
||||||
</Item1>
|
</Item1>
|
||||||
</Files>
|
</Files>
|
||||||
<RequiredPkgs Count="3">
|
<RequiredPkgs Count="2">
|
||||||
<Item1>
|
<Item1>
|
||||||
<PackageName Value="laz_fpspreadsheet_visual"/>
|
<PackageName Value="laz_fpspreadsheet_visual"/>
|
||||||
|
<MinVersion Major="1" Minor="10" Valid="True"/>
|
||||||
</Item1>
|
</Item1>
|
||||||
<Item2>
|
<Item2>
|
||||||
<PackageName Value="laz_fpspreadsheet"/>
|
|
||||||
</Item2>
|
|
||||||
<Item3>
|
|
||||||
<PackageName Value="FCL"/>
|
<PackageName Value="FCL"/>
|
||||||
</Item3>
|
</Item2>
|
||||||
</RequiredPkgs>
|
</RequiredPkgs>
|
||||||
<UsageOptions>
|
<UsageOptions>
|
||||||
<UnitPath Value="$(PkgOutDir)"/>
|
<UnitPath Value="$(PkgOutDir)"/>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<Version Value="11"/>
|
<Version Value="11"/>
|
||||||
<PathDelim Value="\"/>
|
<PathDelim Value="\"/>
|
||||||
<SearchPaths>
|
<SearchPaths>
|
||||||
<OtherUnitFiles Value="source\export;source\design"/>
|
<OtherUnitFiles Value="source\export"/>
|
||||||
<UnitOutputDirectory Value="source\export\lib\$(TargetCPU)-$(TargetOS)"/>
|
<UnitOutputDirectory Value="source\export\lib\$(TargetCPU)-$(TargetOS)"/>
|
||||||
</SearchPaths>
|
</SearchPaths>
|
||||||
<Parsing>
|
<Parsing>
|
||||||
@ -25,14 +25,14 @@
|
|||||||
|
|
||||||
It provides a graphical export component on the Data Export tab."/>
|
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)."/>
|
<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">
|
<Files Count="2">
|
||||||
<Item1>
|
<Item1>
|
||||||
<Filename Value="source\export\fpsexport.pas"/>
|
<Filename Value="source\export\fpsexport.pas"/>
|
||||||
<UnitName Value="fpsexport"/>
|
<UnitName Value="fpsexport"/>
|
||||||
</Item1>
|
</Item1>
|
||||||
<Item2>
|
<Item2>
|
||||||
<Filename Value="source\design\fpsexportreg.pas"/>
|
<Filename Value="source\export\fpsexportreg.pas"/>
|
||||||
<HasRegisterProc Value="True"/>
|
<HasRegisterProc Value="True"/>
|
||||||
<UnitName Value="fpsexportreg"/>
|
<UnitName Value="fpsexportreg"/>
|
||||||
</Item2>
|
</Item2>
|
||||||
@ -43,8 +43,8 @@ It provides a graphical export component on the Data Export tab."/>
|
|||||||
</Item1>
|
</Item1>
|
||||||
<Item2>
|
<Item2>
|
||||||
<PackageName Value="laz_fpspreadsheet"/>
|
<PackageName Value="laz_fpspreadsheet"/>
|
||||||
<MaxVersion Major="1" Minor="8"/>
|
<MaxVersion Major="1" Minor="9"/>
|
||||||
<MinVersion Major="1" Minor="9" Valid="True"/>
|
<MinVersion Major="1" Minor="10" Valid="True"/>
|
||||||
</Item2>
|
</Item2>
|
||||||
<Item3>
|
<Item3>
|
||||||
<PackageName Value="LCL"/>
|
<PackageName Value="LCL"/>
|
||||||
|
@ -1083,7 +1083,6 @@ var
|
|||||||
r, c: LongInt;
|
r, c: LongInt;
|
||||||
dr, dc: LongInt;
|
dr, dc: LongInt;
|
||||||
cell, addcell: PCell;
|
cell, addcell: PCell;
|
||||||
sh: Integer;
|
|
||||||
s: String;
|
s: String;
|
||||||
f: Double;
|
f: Double;
|
||||||
dt: TDateTime;
|
dt: TDateTime;
|
||||||
|
@ -3066,6 +3066,8 @@ var
|
|||||||
sheet: TsWorksheet absolute AWorksheet;
|
sheet: TsWorksheet absolute AWorksheet;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
Unused(ASheetIndex, AKind);
|
||||||
|
|
||||||
// Since this is a variable length record we begin by writing the formula
|
// Since this is a variable length record we begin by writing the formula
|
||||||
// to a memory stream
|
// to a memory stream
|
||||||
memstream := TMemoryStream.Create;
|
memstream := TMemoryStream.Create;
|
||||||
|
@ -640,7 +640,6 @@ var
|
|||||||
dataStr: String;
|
dataStr: String;
|
||||||
formulaStr: String;
|
formulaStr: String;
|
||||||
formula: PsFormula;
|
formula: PsFormula;
|
||||||
isSharedFormula: Boolean;
|
|
||||||
nodeName: String;
|
nodeName: String;
|
||||||
sstIndex: Integer;
|
sstIndex: Integer;
|
||||||
number: Double;
|
number: Double;
|
||||||
|
@ -2,12 +2,12 @@ unit fpsvisualreg;
|
|||||||
|
|
||||||
{$mode objfpc}{$H+}
|
{$mode objfpc}{$H+}
|
||||||
|
|
||||||
{$R ../../resource\fpsvisualreg.res}
|
{$R ../../resource/fpsvisualreg.res}
|
||||||
|
|
||||||
interface
|
interface
|
||||||
|
|
||||||
uses
|
uses
|
||||||
Classes, SysUtils, fpsallformats;
|
Classes, SysUtils, {%H-}fpsallformats;
|
||||||
|
|
||||||
procedure Register;
|
procedure Register;
|
||||||
|
|
||||||
|
32
components/fpspreadsheet/source/export/fpsexportreg.pas
Normal file
32
components/fpspreadsheet/source/export/fpsexportreg.pas
Normal file
@ -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.
|
||||||
|
|
@ -2235,6 +2235,7 @@ end;
|
|||||||
|
|
||||||
procedure TsCellEdit.WMKillFocus(var AMessage: TLMKillFocus);
|
procedure TsCellEdit.WMKillFocus(var AMessage: TLMKillFocus);
|
||||||
begin
|
begin
|
||||||
|
Unused(AMessage);
|
||||||
// Override inherited behavior because we don't want to call EditingDone
|
// Override inherited behavior because we don't want to call EditingDone
|
||||||
// here.
|
// here.
|
||||||
end;
|
end;
|
||||||
|
@ -1185,7 +1185,6 @@ procedure TsMultilineStringCellEditor.KeyDown(var AKey: Word; AShift: TShiftStat
|
|||||||
|
|
||||||
var
|
var
|
||||||
IntSel: boolean;
|
IntSel: boolean;
|
||||||
msg: String;
|
|
||||||
begin
|
begin
|
||||||
inherited KeyDown(AKey, AShift);
|
inherited KeyDown(AKey, AShift);
|
||||||
case AKey of
|
case AKey of
|
||||||
|
Reference in New Issue
Block a user