diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2016-09-22 17:15:44 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-10-05 21:19:25 +0000 |
| commit | 75d5acfc7820235fab724a63c0bf4e61a0242bec (patch) | |
| tree | 7a2463917d24eb81c341da63f4b2beb1f329847f /scaddins | |
| parent | 9167f75c87c5a062c39ee63c4071061518f63b49 (diff) | |
tdf#100496 accept year basis 2 for AMORDEGRC and AMORLINC.
Although year basis 2 is not supported by Excel, it is defined in ODFF1.2
for AMORLINC and is supported by Gnumeric.
Change-Id: Iacf60dbb7c0502338998f7ff22233c5f8b0b7146
Reviewed-on: https://gerrit.libreoffice.org/29188
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'scaddins')
| -rw-r--r-- | scaddins/source/analysis/analysishelper.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 5eebb2e5400c..a0e25b8d713a 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -985,9 +985,6 @@ OUString GetString( double f, bool bLeadingSign, sal_uInt16 nMaxDig ) double GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException ) { - if( nBase == 2 ) - throw lang::IllegalArgumentException(); - sal_uInt32 nPer = sal_uInt32( fPer ); double fUsePer = 1.0 / fRate; double fAmorCoeff; @@ -1033,9 +1030,6 @@ double GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int double GetAmorlinc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException ) { - if( nBase == 2 ) - throw lang::IllegalArgumentException(); - sal_uInt32 nPer = sal_uInt32( fPer ); double fOneRate = fCost * fRate; double fCostDelta = fCost - fRestVal; |