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

fpspreadsheet: Convert forgotten WriteXXXX(Row,Col...) procedures to functions returning the cell used.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3463 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-08-10 09:22:42 +00:00
parent ced21b2d9c
commit c75695c301
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -587,21 +587,21 @@ type
function WriteFormula(ARow, ACol: Cardinal; AFormula: String): PCell; overload; function WriteFormula(ARow, ACol: Cardinal; AFormula: String): PCell; overload;
procedure WriteFormula(ACell: PCell; AFormula: String); overload; procedure WriteFormula(ACell: PCell; AFormula: String); overload;
procedure WriteNumber(ARow, ACol: Cardinal; ANumber: double); overload; function WriteNumber(ARow, ACol: Cardinal; ANumber: double): PCell; overload;
procedure WriteNumber(ACell: PCell; ANumber: Double); overload; procedure WriteNumber(ACell: PCell; ANumber: Double); overload;
procedure WriteNumber(ARow, ACol: Cardinal; ANumber: double; function WriteNumber(ARow, ACol: Cardinal; ANumber: double;
AFormat: TsNumberFormat; ADecimals: Byte = 2); overload; AFormat: TsNumberFormat; ADecimals: Byte = 2): PCell; overload;
procedure WriteNumber(ACell: PCell; ANumber: Double; procedure WriteNumber(ACell: PCell; ANumber: Double;
AFormat: TsNumberFormat; ADecimals: Byte = 2); overload; AFormat: TsNumberFormat; ADecimals: Byte = 2); overload;
procedure WriteNumber(ARow, ACol: Cardinal; ANumber: double; function WriteNumber(ARow, ACol: Cardinal; ANumber: double;
AFormat: TsNumberFormat; AFormatString: String); overload; AFormat: TsNumberFormat; AFormatString: String): PCell; overload;
procedure WriteNumber(ACell: PCell; ANumber: Double; procedure WriteNumber(ACell: PCell; ANumber: Double;
AFormat: TsNumberFormat; AFormatString: String); overload; AFormat: TsNumberFormat; AFormatString: String); overload;
function WriteRPNFormula(ARow, ACol: Cardinal; AFormula: TsRPNFormula): PCell; overload; function WriteRPNFormula(ARow, ACol: Cardinal; AFormula: TsRPNFormula): PCell; overload;
procedure WriteRPNFormula(ACell: PCell; AFormula: TsRPNFormula); overload; procedure WriteRPNFormula(ACell: PCell; AFormula: TsRPNFormula); overload;
procedure WriteUTF8Text(ARow, ACol: Cardinal; AText: ansistring); overload; function WriteUTF8Text(ARow, ACol: Cardinal; AText: ansistring): PCell; overload;
procedure WriteUTF8Text(ACell: PCell; AText: ansistring); overload; procedure WriteUTF8Text(ACell: PCell; AText: ansistring); overload;
{ Writing of cell attributes } { Writing of cell attributes }
@ -2761,13 +2761,12 @@ end;
@param ARow The row of the cell @param ARow The row of the cell
@param ACol The column of the cell @param ACol The column of the cell
@param AText The text to be written encoded in utf-8 @param AText The text to be written encoded in utf-8
@return Pointer to cell created or used
} }
procedure TsWorksheet.WriteUTF8Text(ARow, ACol: Cardinal; AText: ansistring); function TsWorksheet.WriteUTF8Text(ARow, ACol: Cardinal; AText: ansistring): PCell;
var
ACell: PCell;
begin begin
ACell := GetCell(ARow, ACol); Result := GetCell(ARow, ACol);
WriteUTF8Text(ACell, AText); WriteUTF8Text(Result, AText);
end; end;
{@@ {@@
@ -2794,10 +2793,12 @@ end;
@param ARow Cell row index @param ARow Cell row index
@param ACol Cell column index @param ACol Cell column index
@param ANumber Number to be written @param ANumber Number to be written
@return Pointer to cell created or used
} }
procedure TsWorksheet.WriteNumber(ARow, ACol: Cardinal; ANumber: double); function TsWorksheet.WriteNumber(ARow, ACol: Cardinal; ANumber: double): PCell;
begin begin
WriteNumber(GetCell(ARow, ACol), ANumber); Result := GetCell(ARow, ACol);
WriteNumber(Result, ANumber);
end; end;
{@@ {@@
@ -2824,12 +2825,14 @@ end;
@param ANumber Number to be written @param ANumber Number to be written
@param AFormat Identifier for a built-in number format, e.g. nfFixed (optional) @param AFormat Identifier for a built-in number format, e.g. nfFixed (optional)
@param ADecimals Number of decimal places used for formatting (optional) @param ADecimals Number of decimal places used for formatting (optional)
@return Pointer to cell created or used
@see TsNumberFormat @see TsNumberFormat
} }
procedure TsWorksheet.WriteNumber(ARow, ACol: Cardinal; ANumber: double; function TsWorksheet.WriteNumber(ARow, ACol: Cardinal; ANumber: double;
AFormat: TsNumberFormat; ADecimals: Byte = 2); AFormat: TsNumberFormat; ADecimals: Byte = 2): PCell;
begin begin
WriteNumber(GetCell(ARow, ACol), ANumber, AFormat, ADecimals); Result := GetCell(ARow, ACol);
WriteNumber(Result, ANumber, AFormat, ADecimals);
end; end;
{@@ {@@
@ -2876,11 +2879,13 @@ end;
@param ANumber Number to be written @param ANumber Number to be written
@param AFormat Format identifier (nfCustom) @param AFormat Format identifier (nfCustom)
@param AFormatString String of formatting codes (such as 'dd/mmm' @param AFormatString String of formatting codes (such as 'dd/mmm'
@return Pointer to cell created or used
} }
procedure TsWorksheet.WriteNumber(ARow, ACol: Cardinal; ANumber: Double; function TsWorksheet.WriteNumber(ARow, ACol: Cardinal; ANumber: Double;
AFormat: TsNumberFormat; AFormatString: String); AFormat: TsNumberFormat; AFormatString: String): PCell;
begin begin
WriteNumber(GetCell(ARow, ACol), ANumber, AFormat, AFormatString); Result := GetCell(ARow, ACol);
WriteNumber(Result, ANumber, AFormat, AFormatString);
end; end;
{@@ {@@