paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Prepare for next stable release 1.4

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3856 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2014-12-31 16:50:31 +00:00
parent 3f054f5282
commit e4762b4fb7
11 changed files with 31 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/fpspreadsheet/fpsactions.pas
View File

@ -1141,6 +1141,7 @@ var
begin
if (ACell = nil) or not (uffBorder in ACell^.UsedFormattingFields) then
begin
EmptyCell.Row := 0; // silence the compiler...
InitCell(EmptyCell);
FBorders.ExtractFromCell(Workbook, @EmptyCell);
end else

BIN
components/fpspreadsheet/fpspreadsheet.chm
View File

Binary file not shown.

4
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -1325,7 +1325,7 @@ function GetFileFormatName(AFormat: TsSpreadsheetFormat): String;
procedure MakeLEPalette(APalette: PsPalette; APaletteSize: Integer);
function SameCellBorders(ACell1, ACell2: PCell): Boolean;
procedure InitCell(var ACell: TCell); overload;
procedure InitCell(out ACell: TCell); overload;
procedure InitCell(ARow, ACol: Cardinal; out ACell: TCell); overload;
function HasFormula(ACell: PCell): Boolean;
@ -1577,7 +1577,7 @@ end;
Initalizes a new cell.
@return New cell record
-------------------------------------------------------------------------------}
procedure InitCell(var ACell: TCell);
procedure InitCell(out ACell: TCell);
begin
ACell.FormulaValue := '';
ACell.UTF8StringValue := '';

11
components/fpspreadsheet/fpspreadsheetctrls.pas
View File

@ -450,7 +450,7 @@ type
function GetCell(AIndex: Integer): PCell;
procedure SetCell(AIndex: Integer; ACell: PCell);
public
destructor Destroy;
destructor Destroy; override;
function Add(ACell: PCell): Integer;
function AddCell(ACell: PCell): Integer;
function AddEmptyCell(ARow, ACol: Cardinal): Integer;
@ -1175,13 +1175,13 @@ begin
cell := CellClipboard.CellByIndex[i];
case AItem of
coCopyCell:
FWorksheet.CopyCell(cell^.Row, cell^.Col, cell^.Row + dr, cell^.Col + dc);
FWorksheet.CopyCell(cell^.Row, cell^.Col, LongInt(cell^.Row) + dr, LongInt(cell^.Col) + dc);
coCopyValue:
FWorksheet.CopyValue(cell, cell^.Row + dr, cell^.Col + dc);
FWorksheet.CopyValue(cell, LongInt(cell^.Row) + dr, LongInt(cell^.Col) + dc);
coCopyFormat:
FWorksheet.CopyFormat(cell, cell^.Row + dr, cell^.Col + dc);
FWorksheet.CopyFormat(cell, LongInt(cell^.Row) + dr, LongInt(cell^.Col) + dc);
coCopyFormula:
FWorksheet.CopyFormula(cell, cell^.Row + dr, cell^.Col + dc);
FWorksheet.CopyFormula(cell, LongInt(cell^.Row) + dr, LongInt(cell^.Col) + dc);
end;
end;
@ -1755,7 +1755,6 @@ procedure TsCellCombobox.ApplyFormatToCell(ACell: PCell);
var
fnt: TsFont;
clr: TColor;
sclr: TsColor;
begin
if (Worksheet = nil) then
exit;

30
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@ -228,10 +228,6 @@ type
{ Interfacing with WorkbookLink }
procedure ListenerNotification(AChangedItems: TsNotificationItems;
AData: Pointer = nil);
// procedure CellChanged(ACell: PCell);
// procedure CellSelected(ASheetRow, ASheetCol: Cardinal);
// procedure WorkbookChanged;
// procedure WorksheetChanged;
{ public properties }
{@@ Link to the workbook }
@ -340,6 +336,7 @@ type
{$ENDIF}
end;
{ TsWorksheetGrid }
{@@
@ -558,7 +555,6 @@ type
property OnContextPopup;
end;
//procedure Register;
implementation
@ -671,16 +667,7 @@ begin
then TRGBA(Result).B := TRGBA(c).B + ADelta
else TRGBA(Result).B := TRGBA(c).B - ADelta;
end;
(*
{@@ ----------------------------------------------------------------------------
Registers the worksheet grid in the Lazarus component palette,
page "FPSpreadsheet".
-------------------------------------------------------------------------------}
procedure Register;
begin
RegisterComponents('FPSpreadsheet', [TsWorksheetGrid]);
end;
*)
{*******************************************************************************
* TsCustomWorksheetGrid *
@ -3247,18 +3234,7 @@ begin
if Workbook <> nil then
Workbook.WriteToFile(AFileName, AOverwriteExisting);
end;
(*
{@@ ----------------------------------------------------------------------------
A different cell has been selected. Notifies the WorkbookLink of the change.
-------------------------------------------------------------------------------}
function TsCustomWorksheetGrid.SelectCell(AGridCol, AGridRow: Integer): Boolean;
begin
Result := inherited SelectCell(AGridCol, AGridRow);
if Result and (WorkbookSource <> nil) and ((AGridRow <> Row) or (AGridCol <> Col))
then
WorkbookSource.SelectCell(GetWorksheetRow(AGridRow), GetWorksheetCol(AGridCol));
end;
*)
{@@ ----------------------------------------------------------------------------
Standard method inherited from TCustomGrid: Is called when editing starts.
Is overridden here to store the old text just in case that the user presses

4
components/fpspreadsheet/fpsutils.pas
View File

@ -1506,7 +1506,6 @@ var
testSepPos: Integer;
lastDigitPos: Integer;
isPercent: Boolean;
isExp: Boolean;
fs: TFormatSettings;
done: Boolean;
begin
@ -1532,7 +1531,6 @@ begin
testSep := #0; // Separator candidate to be tested
testSepPos := 0; // Position of this separator candidate in the string
lastDigitPos := 0; // Position of the last numerical digit
isExp := false; // Flag for exponential format
isPercent := false; // Flag for percentage format
i := Length(AText); // Start at end...
@ -1544,7 +1542,7 @@ begin
lastDigitPos := i;
'e', 'E':
isExp := true;
;
'%':
begin

3
components/fpspreadsheet/laz_fpspreadsheet.lpk
View File

@ -9,7 +9,6 @@
<Version Value="11"/>
<PathDelim Value="\"/>
<SearchPaths>
<OtherUnitFiles Value="."/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Parsing>
@ -25,7 +24,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="3"/>
<Version Major="1" Minor="4"/>
<Files Count="27">
<Item1>
<Filename Value="fpolestorage.pas"/>

5
components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
View File

@ -3,12 +3,12 @@
<Package Version="4">
<PathDelim Value="\"/>
<Name Value="laz_fpspreadsheet_visual"/>
<Type Value="RunAndDesignTime"/>
<Author Value="Felipe Monteiro de Carvalho and others"/>
<CompilerOptions>
<Version Value="11"/>
<PathDelim Value="\"/>
<SearchPaths>
<OtherUnitFiles Value="."/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Other>
@ -19,7 +19,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="3"/>
<Version Major="1" Minor="4"/>
<Files Count="5">
<Item1>
<Filename Value="fpspreadsheetctrls.pas"/>
@ -45,7 +45,6 @@ It provides graphical components like a grid and chart."/>
<UnitName Value="fpsvisualutils"/>
</Item5>
</Files>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="4">
<Item1>
<PackageName Value="tachartlazaruspkg"/>

4
components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
View File

@ -3,6 +3,7 @@
<Package Version="4">
<PathDelim Value="\"/>
<Name Value="laz_fpspreadsheetexport_visual"/>
<Type Value="RunAndDesignTime"/>
<Author Value="Reinier Olislagers and others"/>
<CompilerOptions>
<Version Value="11"/>
@ -23,7 +24,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="3"/>
<Version Major="1" Minor="4"/>
<Files Count="2">
<Item1>
<Filename Value="fpsexport.pas"/>
@ -35,7 +36,6 @@ It provides a graphical export component on the Data Export tab."/>
<UnitName Value="fpsexportreg"/>
</Item2>
</Files>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="4">
<Item1>
<PackageName Value="lazdbexport"/>

13
components/fpspreadsheet/tests/spreadtestcli.lpi
View File

@ -69,7 +69,7 @@
<PackageName Value="LCLBase"/>
</Item1>
</RequiredPackages>
<Units Count="19">
<Units Count="21">
<Unit0>
<Filename Value="spreadtestcli.lpr"/>
<IsPartOfProject Value="True"/>
@ -146,8 +146,17 @@
<Unit18>
<Filename Value="sortingtests.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="sortingtests"/>
</Unit18>
<Unit19>
<Filename Value="copytests.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="copytests"/>
</Unit19>
<Unit20>
<Filename Value="celltypetests.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="celltypetests"/>
</Unit20>
</Units>
</ProjectOptions>
<CompilerOptions>

6
components/fpspreadsheet/tests/spreadtestcli.lpr
View File

@ -12,9 +12,9 @@ uses
{the actual tests}
datetests, manualtests, stringtests, internaltests, testsutility, testutils,
formattests, colortests, emptycelltests, insertdeletetests,
errortests, numberstests, fonttests, formulatests, numformatparsertests,
optiontests, virtualmodetests, dbexporttests, sortingtests;
formattests, colortests, emptycelltests, insertdeletetests, errortests,
numberstests, fonttests, formulatests, numformatparsertests, optiontests,
virtualmodetests, dbexporttests, sortingtests, copytests, celltypetests;
const
ShortOpts = 'ac:dhlpr:x';