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

fpspreadsheet: Fix spreadsheet function WEEKDAY to work with cell reference

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4181 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-06-07 08:22:12 +00:00
parent 9fbe0f7b4e
commit 5ba3407139
2 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/fpsfunc.pas
View File

@ -574,7 +574,7 @@ begin
n := ArgToInt(Args[1]) n := ArgToInt(Args[1])
else else
n := 1; n := 1;
if Args[0].ResultType in [rtDateTime, rtFloat, rtInteger] then if Args[0].ResultType in [rtCell, rtDateTime, rtFloat, rtInteger] then
dt := ArgToDateTime(Args[0]) dt := ArgToDateTime(Args[0])
else else
if Args[0].ResultType in [rtString] then if Args[0].ResultType in [rtString] then

35
components/fpspreadsheet/tests/formulatests.pas
View File

@ -33,20 +33,12 @@ type
// Test reconstruction of formula strings // Test reconstruction of formula strings
procedure Test_Write_Read_FormulaStrings(AFormat: TsSpreadsheetFormat; procedure Test_Write_Read_FormulaStrings(AFormat: TsSpreadsheetFormat;
UseRPNFormula: Boolean); UseRPNFormula: Boolean);
{
// Test reconstruction of shared formula strings
procedure Test_Write_Read_SharedFormulaStrings(AFormat: TsSpreadsheetFormat);
// Test calculation of formulas
}
procedure Test_Write_Read_CalcFormulas(AFormat: TsSpreadsheetformat; procedure Test_Write_Read_CalcFormulas(AFormat: TsSpreadsheetformat;
UseRPNFormula: Boolean); UseRPNFormula: Boolean);
{
// Test calculation of shared formulas
procedure Test_Write_Read_CalcSharedFormulas(AFormat: TsSpreadsheetformat);
}
published published
// Writes out formulas & reads them back. // Writes out formulas & reads them back.
{ BIFF2 Tests } { BIFF2 Tests }
procedure Test_Write_Read_FormulaStrings_BIFF2; procedure Test_Write_Read_FormulaStrings_BIFF2;
{ BIFF5 Tests } { BIFF5 Tests }
@ -58,19 +50,6 @@ type
{ ODS Tests } { ODS Tests }
procedure Test_Write_Read_FormulaStrings_ODS; procedure Test_Write_Read_FormulaStrings_ODS;
(*
// Writes out shared formulas & reads them back.
{ BIFF2 Tests }
procedure Test_Write_Read_SharedFormulaStrings_BIFF2;
{ BIFF2 Tests }
procedure Test_Write_Read_SharedFormulaStrings_BIFF5;
{ BIFF8 Tests }
procedure Test_Write_Read_SharedFormulaStrings_BIFF8;
{ OOXML Tests }
procedure Test_Write_Read_SharedFormulaStrings_OOXML;
{ ODS Tests }
procedure Test_Write_Read_SharedFormulaStrings_ODS; *)
// Writes out and calculates rpn formulas, read back // Writes out and calculates rpn formulas, read back
{ BIFF2 Tests } { BIFF2 Tests }
procedure Test_Write_Read_CalcRPNFormula_BIFF2; procedure Test_Write_Read_CalcRPNFormula_BIFF2;
@ -94,18 +73,6 @@ type
procedure Test_Write_Read_CalcStringFormula_OOXML; procedure Test_Write_Read_CalcStringFormula_OOXML;
{ ODS Tests } { ODS Tests }
procedure Test_Write_Read_CalcStringFormula_ODS; procedure Test_Write_Read_CalcStringFormula_ODS;
(*
// Writes out and calculates shared formulas, read back
{ BIFF2 Tests }
procedure Test_Write_Read_CalcSharedFormula_BIFF2;
{ BIFF5 Tests }
procedure Test_Write_Read_CalcSharedFormula_BIFF5;
{ BIFF8 Tests }
procedure Test_Write_Read_CalcSharedFormula_BIFF8;
{ OOXML Tests }
procedure Test_Write_Read_CalcSharedFormula_OOXML;
{ ODS Tests }
procedure Test_Write_Read_CalcSharedFormula_ODS; *)
end; end;