pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Move InitFormatRecord from unit fpstypes to fpsutils. Add enumeratortests to spreadtestcli.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3992 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-03-05 10:54:06 +00:00
parent c5f6cbe82d
commit 2c63f357de
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/fpspreadsheet/fpstypes.pas
View File

@ -569,23 +569,8 @@ type
end; end;
procedure InitFormatRecord(out AValue: TsCellFormat);
implementation implementation
{ Utilities }
procedure InitFormatRecord(out AValue: TsCellFormat);
begin
AValue.Name := '';
AValue.NumberFormatStr := '';
FillChar(AValue, SizeOf(AValue), 0);
AValue.BorderStyles := DEFAULT_BORDERSTYLES;
AValue.Background := EMPTY_FILL;
end;
{ TsCellFormatList } { TsCellFormatList }
constructor TsCellFormatList.Create(AAllowDuplicates: Boolean); constructor TsCellFormatList.Create(AAllowDuplicates: Boolean);

13
components/fpspreadsheet/fpsutils.pas
View File

@ -150,6 +150,7 @@ procedure SplitHyperlink(AValue: String; out ATarget, ABookmark: String);
procedure InitCell(out ACell: TCell); overload; procedure InitCell(out ACell: TCell); overload;
procedure InitCell(ARow, ACol: Cardinal; out ACell: TCell); overload; procedure InitCell(ARow, ACol: Cardinal; out ACell: TCell); overload;
procedure InitFormatRecord(out AValue: TsCellFormat);
procedure AppendToStream(AStream: TStream; const AString: String); inline; overload; procedure AppendToStream(AStream: TStream; const AString: String); inline; overload;
procedure AppendToStream(AStream: TStream; const AString1, AString2: String); inline; overload; procedure AppendToStream(AStream: TStream; const AString1, AString2: String); inline; overload;
@ -2080,6 +2081,18 @@ begin
ACell.Col := ACol; ACell.Col := ACol;
end; end;
{@@ ----------------------------------------------------------------------------
Initializes the fields of a TsCellFormaRecord
-------------------------------------------------------------------------------}
procedure InitFormatRecord(out AValue: TsCellFormat);
begin
AValue.Name := '';
AValue.NumberFormatStr := '';
FillChar(AValue, SizeOf(AValue), 0);
AValue.BorderStyles := DEFAULT_BORDERSTYLES;
AValue.Background := EMPTY_FILL;
end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------
Appends a string to a stream Appends a string to a stream

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

@ -13,7 +13,6 @@
<Title Value="spreadtestcli"/> <Title Value="spreadtestcli"/>
<UseAppBundle Value="False"/> <UseAppBundle Value="False"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
<Icon Value="-1"/>
</General> </General>
<i18n> <i18n>
<EnableI18N LFM="False"/> <EnableI18N LFM="False"/>
@ -70,7 +69,7 @@
<PackageName Value="LCLBase"/> <PackageName Value="LCLBase"/>
</Item1> </Item1>
</RequiredPackages> </RequiredPackages>
<Units Count="22"> <Units Count="23">
<Unit0> <Unit0>
<Filename Value="spreadtestcli.lpr"/> <Filename Value="spreadtestcli.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@ -159,8 +158,12 @@
<Unit21> <Unit21>
<Filename Value="commenttests.pas"/> <Filename Value="commenttests.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="commenttests"/>
</Unit21> </Unit21>
<Unit22>
<Filename Value="enumeratortests.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="enumeratortests"/>
</Unit22>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>

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

@ -15,7 +15,7 @@ uses
formattests, colortests, emptycelltests, insertdeletetests, errortests, formattests, colortests, emptycelltests, insertdeletetests, errortests,
numberstests, fonttests, formulatests, numformatparsertests, optiontests, numberstests, fonttests, formulatests, numformatparsertests, optiontests,
virtualmodetests, dbexporttests, sortingtests, copytests, celltypetests, virtualmodetests, dbexporttests, sortingtests, copytests, celltypetests,
commenttests; commenttests, enumeratortests;
const const
ShortOpts = 'ac:dhlpr:x'; ShortOpts = 'ac:dhlpr:x';