[Libreoffice-commits] core.git: scaddins/source

[Winfried Donkers]

 scaddins/source/analysis/analysishelper.cxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 75d5acfc7820235fab724a63c0bf4e61a0242bec
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Thu Sep 22 17:15:44 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 5eebb2e..a0e25b8 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;