Kaydet (Commit) 75d5acfc authored tarafından Winfried Donkers's avatar Winfried Donkers Kaydeden (comit) Eike Rathke

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/29188Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: 's avatarEike Rathke <erack@redhat.com>
üst 9167f75c
...@@ -985,9 +985,6 @@ OUString GetString( double f, bool bLeadingSign, sal_uInt16 nMaxDig ) ...@@ -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 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 ) 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 ); sal_uInt32 nPer = sal_uInt32( fPer );
double fUsePer = 1.0 / fRate; double fUsePer = 1.0 / fRate;
double fAmorCoeff; double fAmorCoeff;
...@@ -1033,9 +1030,6 @@ double GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int ...@@ -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 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 ) 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 ); sal_uInt32 nPer = sal_uInt32( fPer );
double fOneRate = fCost * fRate; double fOneRate = fCost * fRate;
double fCostDelta = fCost - fRestVal; double fCostDelta = fCost - fRestVal;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment