cleanup macros in scaddins

Change-Id: Id3c05d7771845f4a9f8c1105d9c9f126c6131cee

8 files changed, 613 insertions, 632 deletions

diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index e8880fab3172..850589a4af24 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -36,7 +36,6 @@
 #define MY_SERVICE                  "com.sun.star.sheet.addin.Analysis"
 #define MY_IMPLNAME                 "com.sun.star.sheet.addin.AnalysisImpl"
 
-using namespace                 ::rtl;
 using namespace                 ::com::sun::star;
 
 
@@ -47,7 +46,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
 
     if( pServiceManager && OUString::createFromAscii( pImplName ) == AnalysisAddIn::getImplementationName_Static() )
     {
-        REF( lang::XSingleServiceFactory )  xFactory( cppu::createOneInstanceFactory(
+        uno::Reference< lang::XSingleServiceFactory >  xFactory( cppu::createOneInstanceFactory(
                 reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
                 AnalysisAddIn::getImplementationName_Static(),
                 AnalysisAddIn_CreateInstance,
@@ -71,21 +70,21 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
 //------------------------------------------------------------------------
 
 
-ResMgr& AnalysisAddIn::GetResMgr( void ) THROWDEF_RTE
+ResMgr& AnalysisAddIn::GetResMgr( void ) throw( uno::RuntimeException )
 {
     if( !pResMgr )
     {
         InitData();     // try to get resource manager
 
         if( !pResMgr )
-            THROW_RTE;
+            throw uno::RuntimeException();
     }
 
     return *pResMgr;
 }
 
 
-OUString AnalysisAddIn::GetDisplFuncStr( sal_uInt16 nFuncNum ) THROWDEF_RTE
+OUString AnalysisAddIn::GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( uno::RuntimeException )
 {
     return String( AnalysisRscStrLoader( RID_ANALYSIS_FUNCTION_NAMES, nFuncNum, GetResMgr() ).GetString() );
 }
@@ -115,7 +114,7 @@ AnalysisFuncRes::AnalysisFuncRes( ResId& rRes, ResMgr& rResMgr, sal_uInt16 nInd,
 }
 
 
-OUString AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) THROWDEF_RTE
+OUString AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( uno::RuntimeException )
 {
     OUString                      aRet;
     AnalysisResourcePublisher   aResPubl( AnalysisResId( RID_ANALYSIS_FUNCTION_DESCRIPTIONS, GetResMgr() ) );
@@ -200,10 +199,10 @@ sal_Int32 AnalysisAddIn::getDateMode(
 
 #define MAXFACTDOUBLE   300
 
-double AnalysisAddIn::FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE
+double AnalysisAddIn::FactDouble( sal_Int32 nNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nNum < 0 || nNum > MAXFACTDOUBLE )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     if( !pFactDoubles )
     {
@@ -247,9 +246,9 @@ OUString AnalysisAddIn::getImplementationName_Static()
 }
 
 
-SEQ( OUString ) AnalysisAddIn::getSupportedServiceNames_Static()
+uno::Sequence< OUString > AnalysisAddIn::getSupportedServiceNames_Static()
 {
-    SEQ( OUString )   aRet(2);
+    uno::Sequence< OUString >   aRet(2);
     OUString*         pArray = aRet.getArray();
     pArray[0] = STRFROMASCII( ADDIN_SERVICE );
     pArray[1] = STRFROMASCII( MY_SERVICE );
@@ -257,7 +256,7 @@ SEQ( OUString ) AnalysisAddIn::getSupportedServiceNames_Static()
 }
 
 
-REF( uno::XInterface ) SAL_CALL AnalysisAddIn_CreateInstance(
+uno::Reference< uno::XInterface > SAL_CALL AnalysisAddIn_CreateInstance(
         const uno::Reference< lang::XMultiServiceFactory >& xServiceFact )
 {
     static uno::Reference< uno::XInterface > xInst = (cppu::OWeakObject*) new AnalysisAddIn( comphelper::getComponentContext(xServiceFact) );
@@ -267,7 +266,7 @@ REF( uno::XInterface ) SAL_CALL AnalysisAddIn_CreateInstance(
 
 // XServiceName
 
-OUString SAL_CALL AnalysisAddIn::getServiceName() THROWDEF_RTE
+OUString SAL_CALL AnalysisAddIn::getServiceName() throw( uno::RuntimeException )
 {
     // name of specific AddIn service
     return STRFROMASCII( MY_SERVICE );
@@ -276,19 +275,19 @@ OUString SAL_CALL AnalysisAddIn::getServiceName() THROWDEF_RTE
 
 // XServiceInfo
 
-OUString SAL_CALL AnalysisAddIn::getImplementationName() THROWDEF_RTE
+OUString SAL_CALL AnalysisAddIn::getImplementationName() throw( uno::RuntimeException )
 {
     return getImplementationName_Static();
 }
 
 
-sal_Bool SAL_CALL AnalysisAddIn::supportsService( const OUString& aName ) THROWDEF_RTE
+sal_Bool SAL_CALL AnalysisAddIn::supportsService( const OUString& aName ) throw( uno::RuntimeException )
 {
     return aName.compareToAscii( ADDIN_SERVICE ) == 0 || aName.compareToAscii( MY_SERVICE ) == 0;
 }
 
 
-SEQ( OUString ) SAL_CALL AnalysisAddIn::getSupportedServiceNames() THROWDEF_RTE
+uno::Sequence< OUString > SAL_CALL AnalysisAddIn::getSupportedServiceNames() throw( uno::RuntimeException )
 {
     return getSupportedServiceNames_Static();
 }
@@ -296,14 +295,14 @@ SEQ( OUString ) SAL_CALL AnalysisAddIn::getSupportedServiceNames() THROWDEF_RTE
 
 // XLocalizable
 
-void SAL_CALL AnalysisAddIn::setLocale( const lang::Locale& eLocale ) THROWDEF_RTE
+void SAL_CALL AnalysisAddIn::setLocale( const lang::Locale& eLocale ) throw( uno::RuntimeException )
 {
     aFuncLoc = eLocale;
 
     InitData();     // change of locale invalidates resources!
 }
 
-lang::Locale SAL_CALL AnalysisAddIn::getLocale() THROWDEF_RTE
+lang::Locale SAL_CALL AnalysisAddIn::getLocale() throw( uno::RuntimeException )
 {
     return aFuncLoc;
 }
@@ -311,7 +310,7 @@ lang::Locale SAL_CALL AnalysisAddIn::getLocale() THROWDEF_RTE
 
 // XAddIn
 
-OUString SAL_CALL AnalysisAddIn::getProgrammaticFuntionName( const OUString& ) THROWDEF_RTE
+OUString SAL_CALL AnalysisAddIn::getProgrammaticFuntionName( const OUString& ) throw( uno::RuntimeException )
 {
     //  not used by calc
     //  (but should be implemented for other uses of the AddIn service)
@@ -320,7 +319,7 @@ OUString SAL_CALL AnalysisAddIn::getProgrammaticFuntionName( const OUString& ) T
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getDisplayFunctionName( const OUString& aProgrammaticName ) THROWDEF_RTE
+OUString SAL_CALL AnalysisAddIn::getDisplayFunctionName( const OUString& aProgrammaticName ) throw( uno::RuntimeException )
 {
     OUString          aRet;
 
@@ -341,7 +340,7 @@ OUString SAL_CALL AnalysisAddIn::getDisplayFunctionName( const OUString& aProgra
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getFunctionDescription( const OUString& aProgrammaticName ) THROWDEF_RTE
+OUString SAL_CALL AnalysisAddIn::getFunctionDescription( const OUString& aProgrammaticName ) throw( uno::RuntimeException )
 {
     OUString          aRet;
 
@@ -353,7 +352,7 @@ OUString SAL_CALL AnalysisAddIn::getFunctionDescription( const OUString& aProgra
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getDisplayArgumentName( const OUString& aName, sal_Int32 nArg ) THROWDEF_RTE
+OUString SAL_CALL AnalysisAddIn::getDisplayArgumentName( const OUString& aName, sal_Int32 nArg ) throw( uno::RuntimeException )
 {
     OUString          aRet;
 
@@ -371,7 +370,7 @@ OUString SAL_CALL AnalysisAddIn::getDisplayArgumentName( const OUString& aName,
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getArgumentDescription( const OUString& aName, sal_Int32 nArg ) THROWDEF_RTE
+OUString SAL_CALL AnalysisAddIn::getArgumentDescription( const OUString& aName, sal_Int32 nArg ) throw( uno::RuntimeException )
 {
     OUString          aRet;
 
@@ -392,7 +391,7 @@ OUString SAL_CALL AnalysisAddIn::getArgumentDescription( const OUString& aName,
 static const char*  pDefCatName = "Add-In";
 
 
-OUString SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const OUString& aName ) THROWDEF_RTE
+OUString SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const OUString& aName ) throw( uno::RuntimeException )
 {
     //  return non-translated strings
 //  return STRFROMASCII( "Add-In" );
@@ -422,7 +421,7 @@ OUString SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const OUString& aN
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) THROWDEF_RTE
+OUString SAL_CALL AnalysisAddIn::getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw( uno::RuntimeException )
 {
     //  return translated strings, not used for predefined categories
 //  return STRFROMASCII( "Add-In" );
@@ -459,7 +458,7 @@ static const sal_uInt32     nNumOfLoc = SAL_N_ELEMENTS(pLang);
 
 void AnalysisAddIn::InitDefLocales( void )
 {
-    pDefLocales = new ::com::sun::star::lang::Locale[ nNumOfLoc ];
+    pDefLocales = new lang::Locale[ nNumOfLoc ];
 
     for( sal_uInt32 n = 0 ; n < nNumOfLoc ; n++ )
     {
@@ -469,7 +468,7 @@ void AnalysisAddIn::InitDefLocales( void )
 }
 
 
-inline const ::com::sun::star::lang::Locale& AnalysisAddIn::GetLocale( sal_uInt32 nInd )
+inline const lang::Locale& AnalysisAddIn::GetLocale( sal_uInt32 nInd )
 {
     if( !pDefLocales )
         InitDefLocales();
@@ -481,23 +480,23 @@ inline const ::com::sun::star::lang::Locale& AnalysisAddIn::GetLocale( sal_uInt3
 }
 
 
-SEQofLocName SAL_CALL AnalysisAddIn::getCompatibilityNames( const OUString& aProgrammaticName ) THROWDEF_RTE
+uno::Sequence< sheet::LocalizedName > SAL_CALL AnalysisAddIn::getCompatibilityNames( const OUString& aProgrammaticName ) throw( uno::RuntimeException )
 {
     const FuncData*             p = pFD->Get( aProgrammaticName );
 
     if( !p )
-        return SEQofLocName( 0 );
+        return uno::Sequence< sheet::LocalizedName >( 0 );
 
     const StringList&           r = p->GetCompNameList();
     sal_uInt32                  nCount = r.Count();
 
-    SEQofLocName                aRet( nCount );
+    uno::Sequence< sheet::LocalizedName >                aRet( nCount );
 
-    ::com::sun::star::sheet::LocalizedName*  pArray = aRet.getArray();
+    sheet::LocalizedName*  pArray = aRet.getArray();
 
     for( sal_uInt32 n = 0 ; n < nCount ; n++ )
     {
-        pArray[ n ] = ::com::sun::star::sheet::LocalizedName( GetLocale( n ), *r.Get( n ) );
+        pArray[ n ] = sheet::LocalizedName( GetLocale( n ), *r.Get( n ) );
     }
 
     return aRet;
@@ -510,8 +509,8 @@ SEQofLocName SAL_CALL AnalysisAddIn::getCompatibilityNames( const OUString& aPro
  * Workday
  */
 
-sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( constREFXPS& xOptions,
-    sal_Int32 nDate, sal_Int32 nDays, const ANY& aHDay ) THROWDEF_RTE_IAE
+sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( const uno::Reference< beans::XPropertySet >& xOptions,
+    sal_Int32 nDate, sal_Int32 nDays, const uno::Any& aHDay ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( !nDays )
         return nDate;
@@ -571,15 +570,15 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( constREFXPS& xOptions,
  * Yearfrac
  */
 
-double SAL_CALL AnalysisAddIn::getYearfrac( constREFXPS& xOpt,
-    sal_Int32 nStartDate, sal_Int32 nEndDate, const ANY& rMode ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getYearfrac( const uno::Reference< beans::XPropertySet >& xOpt,
+    sal_Int32 nStartDate, sal_Int32 nEndDate, const uno::Any& rMode ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = GetYearFrac( xOpt, nStartDate, nEndDate, getDateMode( xOpt, rMode ) );
     RETURN_FINITE( fRet );
 }
 
 
-sal_Int32 SAL_CALL AnalysisAddIn::getEdate( constREFXPS& xOpt, sal_Int32 nStartDate, sal_Int32 nMonths ) THROWDEF_RTE_IAE
+sal_Int32 SAL_CALL AnalysisAddIn::getEdate( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nStartDate, sal_Int32 nMonths ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Int32 nNullDate = GetNullDate( xOpt );
     ScaDate aDate( nNullDate, nStartDate, 5 );
@@ -588,7 +587,7 @@ sal_Int32 SAL_CALL AnalysisAddIn::getEdate( constREFXPS& xOpt, sal_Int32 nStartD
 }
 
 
-sal_Int32 SAL_CALL AnalysisAddIn::getWeeknum( constREFXPS& xOpt, sal_Int32 nDate, sal_Int32 nMode ) THROWDEF_RTE_IAE
+sal_Int32 SAL_CALL AnalysisAddIn::getWeeknum( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     nDate += GetNullDate( xOpt );
 
@@ -602,7 +601,7 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWeeknum( constREFXPS& xOpt, sal_Int32 nDate
 }
 
 
-sal_Int32 SAL_CALL AnalysisAddIn::getEomonth( constREFXPS& xOpt, sal_Int32 nDate, sal_Int32 nMonths ) THROWDEF_RTE_IAE
+sal_Int32 SAL_CALL AnalysisAddIn::getEomonth( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nDate, sal_Int32 nMonths ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Int32   nNullDate = GetNullDate( xOpt );
     nDate += nNullDate;
@@ -629,8 +628,8 @@ sal_Int32 SAL_CALL AnalysisAddIn::getEomonth( constREFXPS& xOpt, sal_Int32 nDate
 }
 
 
-sal_Int32 SAL_CALL AnalysisAddIn::getNetworkdays( constREFXPS& xOpt,
-        sal_Int32 nStartDate, sal_Int32 nEndDate, const ANY& aHDay ) THROWDEF_RTE_IAE
+sal_Int32 SAL_CALL AnalysisAddIn::getNetworkdays( const uno::Reference< beans::XPropertySet >& xOpt,
+        sal_Int32 nStartDate, sal_Int32 nEndDate, const uno::Any& aHDay ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Int32                   nNullDate = GetNullDate( xOpt );
 
@@ -667,20 +666,20 @@ sal_Int32 SAL_CALL AnalysisAddIn::getNetworkdays( constREFXPS& xOpt,
 }
 
 
-sal_Int32 SAL_CALL AnalysisAddIn::getIseven( sal_Int32 nVal ) THROWDEF_RTE_IAE
+sal_Int32 SAL_CALL AnalysisAddIn::getIseven( sal_Int32 nVal ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     return ( nVal & 0x00000001 )? 0 : 1;
 }
 
 
-sal_Int32 SAL_CALL AnalysisAddIn::getIsodd( sal_Int32 nVal ) THROWDEF_RTE_IAE
+sal_Int32 SAL_CALL AnalysisAddIn::getIsodd( sal_Int32 nVal ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     return ( nVal & 0x00000001 )? 1 : 0;
 }
 
 double SAL_CALL
-AnalysisAddIn::getMultinomial( constREFXPS& xOpt, const SEQSEQ( sal_Int32 )& aVLst,
-                               const SEQ( uno::Any )& aOptVLst ) THROWDEF_RTE_IAE
+AnalysisAddIn::getMultinomial( const uno::Reference< beans::XPropertySet >& xOpt, const uno::Sequence< uno::Sequence< sal_Int32 > >& aVLst,
+                               const uno::Sequence< uno::Any >& aOptVLst ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     ScaDoubleListGE0 aValList;
 
@@ -697,7 +696,7 @@ AnalysisAddIn::getMultinomial( constREFXPS& xOpt, const SEQSEQ( sal_Int32 )& aVL
     {
         double n = (*p >= 0.0) ? rtl::math::approxFloor( *p ) : rtl::math::approxCeil( *p );
         if ( n < 0.0 )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
 
         if( n > 0.0 )
         {
@@ -709,13 +708,13 @@ AnalysisAddIn::getMultinomial( constREFXPS& xOpt, const SEQSEQ( sal_Int32 )& aVL
 }
 
 
-double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, const uno::Sequence< uno::Sequence< double > >& aCoeffList ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double                          fRet = 0.0;
 
     // #i32269# 0^0 is undefined, Excel returns #NUM! error
     if( fX == 0.0 && fN == 0 )
-        THROW_RTE;
+        throw uno::RuntimeException();
 
     if( fX != 0.0 )
     {
@@ -725,7 +724,7 @@ double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, co
 
         for( n1 = 0 ; n1 < nE1 ; n1++ )
         {
-            const SEQ( double )&    rList = aCoeffList[ n1 ];
+            const uno::Sequence< double >&    rList = aCoeffList[ n1 ];
             nE2 = rList.getLength();
             const double*           pList = rList.getConstArray();
 
@@ -742,7 +741,7 @@ double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, co
 }
 
 
-double SAL_CALL AnalysisAddIn::getQuotient( double fNum, double fDenom ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getQuotient( double fNum, double fDenom ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet;
     if( (fNum < 0) != (fDenom < 0) )
@@ -753,7 +752,7 @@ double SAL_CALL AnalysisAddIn::getQuotient( double fNum, double fDenom ) THROWDE
 }
 
 
-double SAL_CALL AnalysisAddIn::getMround( double fNum, double fMult ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getMround( double fNum, double fMult ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( fMult == 0.0 )
         return fMult;
@@ -763,19 +762,19 @@ double SAL_CALL AnalysisAddIn::getMround( double fNum, double fMult ) THROWDEF_R
 }
 
 
-double SAL_CALL AnalysisAddIn::getSqrtpi( double fNum ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getSqrtpi( double fNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = sqrt( fNum * PI );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     fMin = ::rtl::math::round( fMin, 0, rtl_math_RoundingMode_Up );
     fMax = ::rtl::math::round( fMax, 0, rtl_math_RoundingMode_Up );
     if( fMin > fMax )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     // fMax -> range
     double fRet = fMax - fMin + 1.0;
@@ -787,7 +786,7 @@ double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) THROWD
 }
 
 
-double SAL_CALL AnalysisAddIn::getGcd( constREFXPS& xOpt, const SEQSEQ( double )& aVLst, const SEQ( uno::Any )& aOptVLst ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getGcd( const uno::Reference< beans::XPropertySet >& xOpt, const uno::Sequence< uno::Sequence< double > >& aVLst, const uno::Sequence< uno::Any >& aOptVLst ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     ScaDoubleListGT0 aValList;
 
@@ -812,7 +811,7 @@ double SAL_CALL AnalysisAddIn::getGcd( constREFXPS& xOpt, const SEQSEQ( double )
 }
 
 
-double SAL_CALL AnalysisAddIn::getLcm( constREFXPS& xOpt, const SEQSEQ( double )& aVLst, const SEQ( uno::Any )& aOptVLst ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getLcm( const uno::Reference< beans::XPropertySet >& xOpt, const uno::Sequence< uno::Sequence< double > >& aVLst, const uno::Sequence< uno::Any >& aOptVLst ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     ScaDoubleListGE0 aValList;
 
@@ -844,34 +843,34 @@ double SAL_CALL AnalysisAddIn::getLcm( constREFXPS& xOpt, const SEQSEQ( double )
 }
 
 
-double SAL_CALL AnalysisAddIn::getBesseli( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE
+double SAL_CALL AnalysisAddIn::getBesseli( double fNum, sal_Int32 nOrder ) throw( uno::RuntimeException, lang::IllegalArgumentException, sheet::NoConvergenceException )
 {
     double fRet = sca::analysis::BesselI( fNum, nOrder );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getBesselj( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE
+double SAL_CALL AnalysisAddIn::getBesselj( double fNum, sal_Int32 nOrder ) throw( uno::RuntimeException, lang::IllegalArgumentException, sheet::NoConvergenceException )
 {
     double fRet = sca::analysis::BesselJ( fNum, nOrder );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getBesselk( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE
+double SAL_CALL AnalysisAddIn::getBesselk( double fNum, sal_Int32 nOrder ) throw( uno::RuntimeException, lang::IllegalArgumentException, sheet::NoConvergenceException )
 {
     if( nOrder < 0 || fNum <= 0.0 )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     double fRet = sca::analysis::BesselK( fNum, nOrder );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getBessely( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE
+double SAL_CALL AnalysisAddIn::getBessely( double fNum, sal_Int32 nOrder ) throw( uno::RuntimeException, lang::IllegalArgumentException, sheet::NoConvergenceException )
 {
     if( nOrder < 0 || fNum <= 0.0 )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     double fRet = sca::analysis::BesselY( fNum, nOrder );
     RETURN_FINITE( fRet );
@@ -887,7 +886,7 @@ const double    SCA_MIN16       = -SCA_MAX16-1.0;   // min. val for hexadecimal
 const sal_Int32 SCA_MAXPLACES   = 10;               // max. number of places
 
 
-OUString SAL_CALL AnalysisAddIn::getBin2Oct( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getBin2Oct( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fVal = ConvertToDec( aNum, 2, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -896,14 +895,14 @@ OUString SAL_CALL AnalysisAddIn::getBin2Oct( constREFXPS& xOpt, const OUString&
 }
 
 
-double SAL_CALL AnalysisAddIn::getBin2Dec( const OUString& aNum ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getBin2Dec( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = ConvertToDec( aNum, 2, SCA_MAXPLACES );
     RETURN_FINITE( fRet );
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getBin2Hex( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getBin2Hex( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fVal = ConvertToDec( aNum, 2, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -912,7 +911,7 @@ OUString SAL_CALL AnalysisAddIn::getBin2Hex( constREFXPS& xOpt, const OUString&
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getOct2Bin( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getOct2Bin( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fVal = ConvertToDec( aNum, 8, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -921,14 +920,14 @@ OUString SAL_CALL AnalysisAddIn::getOct2Bin( constREFXPS& xOpt, const OUString&
 }
 
 
-double SAL_CALL AnalysisAddIn::getOct2Dec( const OUString& aNum ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getOct2Dec( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = ConvertToDec( aNum, 8, SCA_MAXPLACES );
     RETURN_FINITE( fRet );
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getOct2Hex( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getOct2Hex( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fVal = ConvertToDec( aNum, 8, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -937,7 +936,7 @@ OUString SAL_CALL AnalysisAddIn::getOct2Hex( constREFXPS& xOpt, const OUString&
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getDec2Bin( constREFXPS& xOpt, sal_Int32 nNum, const ANY& rPlaces ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getDec2Bin( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Int32 nPlaces = 0;
     sal_Bool bUsePlaces = aAnyConv.getInt32( nPlaces, xOpt, rPlaces );
@@ -945,7 +944,7 @@ OUString SAL_CALL AnalysisAddIn::getDec2Bin( constREFXPS& xOpt, sal_Int32 nNum,
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getDec2Oct( constREFXPS& xOpt, sal_Int32 nNum, const ANY& rPlaces ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getDec2Oct( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Int32 nPlaces = 0;
     sal_Bool bUsePlaces = aAnyConv.getInt32( nPlaces, xOpt, rPlaces );
@@ -953,7 +952,7 @@ OUString SAL_CALL AnalysisAddIn::getDec2Oct( constREFXPS& xOpt, sal_Int32 nNum,
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getDec2Hex( constREFXPS& xOpt, double fNum, const ANY& rPlaces ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getDec2Hex( const uno::Reference< beans::XPropertySet >& xOpt, double fNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Int32 nPlaces = 0;
     sal_Bool bUsePlaces = aAnyConv.getInt32( nPlaces, xOpt, rPlaces );
@@ -961,7 +960,7 @@ OUString SAL_CALL AnalysisAddIn::getDec2Hex( constREFXPS& xOpt, double fNum, con
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getHex2Bin( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getHex2Bin( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fVal = ConvertToDec( aNum, 16, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -970,14 +969,14 @@ OUString SAL_CALL AnalysisAddIn::getHex2Bin( constREFXPS& xOpt, const OUString&
 }
 
 
-double SAL_CALL AnalysisAddIn::getHex2Dec( const OUString& aNum ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getHex2Dec( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = ConvertToDec( aNum, 16, SCA_MAXPLACES );
     RETURN_FINITE( fRet );
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getHex2Oct( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getHex2Oct( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fVal = ConvertToDec( aNum, 16, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -986,13 +985,13 @@ OUString SAL_CALL AnalysisAddIn::getHex2Oct( constREFXPS& xOpt, const OUString&
 }
 
 
-sal_Int32 SAL_CALL AnalysisAddIn::getDelta( constREFXPS& xOpt, double fNum1, const ANY& rNum2 ) THROWDEF_RTE_IAE
+sal_Int32 SAL_CALL AnalysisAddIn::getDelta( const uno::Reference< beans::XPropertySet >& xOpt, double fNum1, const uno::Any& rNum2 ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     return fNum1 == aAnyConv.getDouble( xOpt, rNum2, 0.0 );
 }
 
 
-double SAL_CALL AnalysisAddIn::getErf( constREFXPS& xOpt, double fLL, const ANY& rUL ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getErf( const uno::Reference< beans::XPropertySet >& xOpt, double fLL, const uno::Any& rUL ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fUL, fRet;
     sal_Bool bContainsValue = aAnyConv.getDouble( fUL, xOpt, rUL );
@@ -1002,41 +1001,41 @@ double SAL_CALL AnalysisAddIn::getErf( constREFXPS& xOpt, double fLL, const ANY&
 }
 
 
-double SAL_CALL AnalysisAddIn::getErfc( double f ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getErfc( double f ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = Erfc( f );
     RETURN_FINITE( fRet );
 }
 
 
-sal_Int32 SAL_CALL AnalysisAddIn::getGestep( constREFXPS& xOpt, double fNum, const ANY& rStep ) THROWDEF_RTE_IAE
+sal_Int32 SAL_CALL AnalysisAddIn::getGestep( const uno::Reference< beans::XPropertySet >& xOpt, double fNum, const uno::Any& rStep ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     return fNum >= aAnyConv.getDouble( xOpt, rStep, 0.0 );
 }
 
 
-double SAL_CALL AnalysisAddIn::getFactdouble( sal_Int32 nNum ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getFactdouble( sal_Int32 nNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = FactDouble( nNum );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getImabs( const OUString& aNum ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getImabs( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = Complex( aNum ).Abs();
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getImaginary( const OUString& aNum ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getImaginary( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = Complex( aNum ).Imag();
     RETURN_FINITE( fRet );
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImpower( const OUString& aNum, double f ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImpower( const OUString& aNum, double f ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1046,14 +1045,14 @@ OUString SAL_CALL AnalysisAddIn::getImpower( const OUString& aNum, double f ) TH
 }
 
 
-double SAL_CALL AnalysisAddIn::getImargument( const OUString& aNum ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getImargument( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = Complex( aNum ).Arg();
     RETURN_FINITE( fRet );
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImcos( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImcos( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1063,7 +1062,7 @@ OUString SAL_CALL AnalysisAddIn::getImcos( const OUString& aNum ) THROWDEF_RTE_I
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImdiv( const OUString& aDivid, const OUString& aDivis ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImdiv( const OUString& aDivid, const OUString& aDivis ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aDivid );
 
@@ -1073,7 +1072,7 @@ OUString SAL_CALL AnalysisAddIn::getImdiv( const OUString& aDivid, const OUStrin
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImexp( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImexp( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1083,7 +1082,7 @@ OUString SAL_CALL AnalysisAddIn::getImexp( const OUString& aNum ) THROWDEF_RTE_I
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImconjugate( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImconjugate( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1093,7 +1092,7 @@ OUString SAL_CALL AnalysisAddIn::getImconjugate( const OUString& aNum ) THROWDEF
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImln( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImln( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1103,7 +1102,7 @@ OUString SAL_CALL AnalysisAddIn::getImln( const OUString& aNum ) THROWDEF_RTE_IA
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImlog10( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImlog10( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1113,7 +1112,7 @@ OUString SAL_CALL AnalysisAddIn::getImlog10( const OUString& aNum ) THROWDEF_RTE
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImlog2( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImlog2( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1123,7 +1122,7 @@ OUString SAL_CALL AnalysisAddIn::getImlog2( const OUString& aNum ) THROWDEF_RTE_
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImproduct( constREFXPS&, const SEQSEQ( OUString )& aNum1, const SEQ( uno::Any )& aNL ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImproduct( const uno::Reference< beans::XPropertySet >&, const uno::Sequence< uno::Sequence< OUString > >& aNum1, const uno::Sequence< uno::Any >& aNL ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     ComplexList     z_list;
 
@@ -1144,14 +1143,14 @@ OUString SAL_CALL AnalysisAddIn::getImproduct( constREFXPS&, const SEQSEQ( OUStr
 }
 
 
-double SAL_CALL AnalysisAddIn::getImreal( const OUString& aNum ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getImreal( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double fRet = Complex( aNum ).Real();
     RETURN_FINITE( fRet );
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImsin( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImsin( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1161,7 +1160,7 @@ OUString SAL_CALL AnalysisAddIn::getImsin( const OUString& aNum ) THROWDEF_RTE_I
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImsub( const OUString& aNum1, const OUString& aNum2 ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImsub( const OUString& aNum1, const OUString& aNum2 ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum1 );
 
@@ -1171,7 +1170,7 @@ OUString SAL_CALL AnalysisAddIn::getImsub( const OUString& aNum1, const OUString
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const SEQSEQ( OUString )& aNum1, const SEQ( ::com::sun::star::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImsum( const uno::Reference< beans::XPropertySet >&, const uno::Sequence< uno::Sequence< OUString > >& aNum1, const uno::Sequence< uno::Any >& aFollowingPars ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     ComplexList     z_list;
 
@@ -1192,7 +1191,7 @@ OUString SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const SEQSEQ( OUString
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImsqrt( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImsqrt( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1202,7 +1201,7 @@ OUString SAL_CALL AnalysisAddIn::getImsqrt( const OUString& aNum ) THROWDEF_RTE_
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImtan( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImtan( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1212,7 +1211,7 @@ OUString SAL_CALL AnalysisAddIn::getImtan( const OUString& aNum ) THROWDEF_RTE_I
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImsec( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImsec( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1222,7 +1221,7 @@ OUString SAL_CALL AnalysisAddIn::getImsec( const OUString& aNum ) THROWDEF_RTE_I
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImcsc( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImcsc( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1232,7 +1231,7 @@ OUString SAL_CALL AnalysisAddIn::getImcsc( const OUString& aNum ) THROWDEF_RTE_I
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImcot( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImcot( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1242,7 +1241,7 @@ OUString SAL_CALL AnalysisAddIn::getImcot( const OUString& aNum ) THROWDEF_RTE_I
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImsinh( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImsinh( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1252,7 +1251,7 @@ OUString SAL_CALL AnalysisAddIn::getImsinh( const OUString& aNum ) THROWDEF_RTE_
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImcosh( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImcosh( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1262,7 +1261,7 @@ OUString SAL_CALL AnalysisAddIn::getImcosh( const OUString& aNum ) THROWDEF_RTE_
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImsech( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImsech( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1272,7 +1271,7 @@ OUString SAL_CALL AnalysisAddIn::getImsech( const OUString& aNum ) THROWDEF_RTE_
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getImcsch( const OUString& aNum ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getImcsch( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Complex     z( aNum );
 
@@ -1282,7 +1281,7 @@ OUString SAL_CALL AnalysisAddIn::getImcsch( const OUString& aNum ) THROWDEF_RTE_
 }
 
 
-OUString SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const ANY& rSuff ) THROWDEF_RTE_IAE
+OUString SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const uno::Any& rSuff ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Bool    bi;
 
@@ -1296,18 +1295,18 @@ OUString SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const ANY& rS
             const OUString*   pSuff = ( const OUString* ) rSuff.getValue();
             bi = pSuff->compareToAscii( "i" ) == 0 || pSuff->isEmpty();
             if( !bi && pSuff->compareToAscii( "j" ) != 0 )
-                THROW_IAE;
+                throw lang::IllegalArgumentException();
             }
             break;
         default:
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
     }
 
     return Complex( fR, fI, bi ? 'i' : 'j' ).GetString();
 }
 
 
-double SAL_CALL AnalysisAddIn::getConvert( double f, const OUString& aFU, const OUString& aTU ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getConvert( double f, const OUString& aFU, const OUString& aTU ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( !pCDL )
         pCDL = new ConvertDataList();
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index 42bb70128784..c46e7757639f 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -41,19 +41,19 @@ class ConvertDataList;
 class ResMgr;
 
 
-REF( ::com::sun::star::uno::XInterface ) SAL_CALL AnalysisAddIn_CreateInstance( const REF( ::com::sun::star::lang::XMultiServiceFactory )& );
+css::uno::Reference< css::uno::XInterface > SAL_CALL AnalysisAddIn_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
 
 
 class AnalysisAddIn : public cppu::WeakImplHelper5<
-                            ::com::sun::star::sheet::XAddIn,
-                            ::com::sun::star::sheet::XCompatibilityNames,
-                            ::com::sun::star::sheet::addin::XAnalysis,
-                            ::com::sun::star::lang::XServiceName,
-                            ::com::sun::star::lang::XServiceInfo >
+                            css::sheet::XAddIn,
+                            css::sheet::XCompatibilityNames,
+                            css::sheet::addin::XAnalysis,
+                            css::lang::XServiceName,
+                            css::lang::XServiceInfo >
 {
 private:
-    ::com::sun::star::lang::Locale           aFuncLoc;
-    ::com::sun::star::lang::Locale*          pDefLocales;
+    css::lang::Locale           aFuncLoc;
+    css::lang::Locale*          pDefLocales;
     FuncDataList*               pFD;
     double*                     pFactDoubles;
     ConvertDataList*            pCDL;
@@ -61,177 +61,177 @@ private:
 
     ScaAnyConverter             aAnyConv;
 
-    ResMgr&                     GetResMgr( void ) THROWDEF_RTE;
-    OUString                      GetDisplFuncStr( sal_uInt16 nFuncNum ) THROWDEF_RTE;
-    OUString                      GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) THROWDEF_RTE;
+    ResMgr&                     GetResMgr( void ) throw( css::uno::RuntimeException );
+    OUString                      GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( css::uno::RuntimeException );
+    OUString                      GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException );
     void                        InitDefLocales( void );
-    inline const ::com::sun::star::lang::Locale& GetLocale( sal_uInt32 nInd );
+    inline const css::lang::Locale& GetLocale( sal_uInt32 nInd );
     void                        InitData( void );
 
                                 /// Converts an Any to sal_Int32 in the range from 0 to 4 (date calculation mode).
     sal_Int32                   getDateMode(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropSet,
-                                    const ::com::sun::star::uno::Any& rAny )
-                                throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    const css::uno::Reference< css::beans::XPropertySet >& xPropSet,
+                                    const css::uno::Any& rAny )
+                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
 public:
                                 AnalysisAddIn(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
+                                    const css::uno::Reference< css::uno::XComponentContext >& xContext );
     virtual                     ~AnalysisAddIn();
 
-    double                      FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE;
+    double                      FactDouble( sal_Int32 nNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
     static OUString               getImplementationName_Static();
-    static SEQ( OUString )        getSupportedServiceNames_Static();
+    static css::uno::Sequence< OUString >        getSupportedServiceNames_Static();
 
                                 // XAddIn
-    virtual OUString SAL_CALL     getProgrammaticFuntionName( const OUString& aDisplayName ) THROWDEF_RTE;
-    virtual OUString SAL_CALL     getDisplayFunctionName( const OUString& aProgrammaticName ) THROWDEF_RTE;
-    virtual OUString SAL_CALL     getFunctionDescription( const OUString& aProgrammaticName ) THROWDEF_RTE;
-    virtual OUString SAL_CALL     getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) THROWDEF_RTE;
-    virtual OUString SAL_CALL     getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) THROWDEF_RTE;
-    virtual OUString SAL_CALL     getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) THROWDEF_RTE;
-    virtual OUString SAL_CALL     getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) THROWDEF_RTE;
+    virtual OUString SAL_CALL     getProgrammaticFuntionName( const OUString& aDisplayName ) throw( css::uno::RuntimeException );
+    virtual OUString SAL_CALL     getDisplayFunctionName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException );
+    virtual OUString SAL_CALL     getFunctionDescription( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException );
+    virtual OUString SAL_CALL     getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw( css::uno::RuntimeException );
+    virtual OUString SAL_CALL     getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw( css::uno::RuntimeException );
+    virtual OUString SAL_CALL     getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) throw( css::uno::RuntimeException );
+    virtual OUString SAL_CALL     getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw( css::uno::RuntimeException );
 
                                 // XCompatibilityNames
-    virtual SEQofLocName SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) THROWDEF_RTE;
+    virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException );
 
                                 // XLocalizable
-    virtual void SAL_CALL       setLocale( const ::com::sun::star::lang::Locale& eLocale ) THROWDEF_RTE;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) THROWDEF_RTE;
+    virtual void SAL_CALL       setLocale( const css::lang::Locale& eLocale ) throw( css::uno::RuntimeException );
+    virtual css::lang::Locale SAL_CALL getLocale(  ) throw( css::uno::RuntimeException );
 
                                 // XServiceName
-    virtual OUString SAL_CALL     getServiceName(  ) THROWDEF_RTE;
+    virtual OUString SAL_CALL     getServiceName(  ) throw( css::uno::RuntimeException );
 
                                 // XServiceInfo
-    virtual OUString SAL_CALL     getImplementationName(  ) THROWDEF_RTE;
-    virtual sal_Bool SAL_CALL   supportsService( const OUString& ServiceName ) THROWDEF_RTE;
-    virtual SEQ( OUString ) SAL_CALL  getSupportedServiceNames(  ) THROWDEF_RTE;
+    virtual OUString SAL_CALL     getImplementationName(  ) throw( css::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL   supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< OUString > SAL_CALL  getSupportedServiceNames(  ) throw( css::uno::RuntimeException );
 
     //  methods from own interfaces start here
 
                             // XAnalysis
-//    virtual double SAL_CALL       get_Test( constREFXPS&, sal_Int32 nMode, double f1, double f2, double f3 ) THROWDEF_RTE;
-
-    virtual sal_Int32 SAL_CALL  getWorkday( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nDays, const ANY& aHDay ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getYearfrac( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nEndDate, const ANY& aMode ) THROWDEF_RTE_IAE;
-    virtual sal_Int32 SAL_CALL  getEdate( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMonths ) THROWDEF_RTE_IAE;
-    virtual sal_Int32 SAL_CALL  getWeeknum( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMode ) THROWDEF_RTE_IAE;
-    virtual sal_Int32 SAL_CALL  getEomonth( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMonths ) THROWDEF_RTE_IAE;
-    virtual sal_Int32 SAL_CALL  getNetworkdays( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nEndDate, const ANY& aHDay ) THROWDEF_RTE_IAE;
-
-    virtual sal_Int32 SAL_CALL  getIseven( sal_Int32 nVal ) THROWDEF_RTE_IAE;
-    virtual sal_Int32 SAL_CALL  getIsodd( sal_Int32 nVal ) THROWDEF_RTE_IAE;
-
-    virtual double SAL_CALL     getMultinomial( constREFXPS& xOpt, const SEQSEQ( sal_Int32 )& aVLst, const SEQ( com::sun::star::uno::Any )& aOptVLst ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getSeriessum( double fX, double fN, double fM, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getQuotient( double fNum, double fDenum ) THROWDEF_RTE_IAE;
-
-    virtual double SAL_CALL     getMround( double fNum, double fMult ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getSqrtpi( double fNum ) THROWDEF_RTE_IAE;
-
-    virtual double SAL_CALL     getRandbetween( double fMin, double fMax ) THROWDEF_RTE_IAE;
-
-    virtual double SAL_CALL     getGcd( constREFXPS& xOpt, const SEQSEQ( double )& aVLst, const SEQ( ANY )& aOptVLst ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getLcm( constREFXPS& xOpt, const SEQSEQ( double )& aVLst, const SEQ( ANY )& aOptVLst ) THROWDEF_RTE_IAE;
-
-    virtual double SAL_CALL     getBesseli( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
-    virtual double SAL_CALL     getBesselj( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
-    virtual double SAL_CALL     getBesselk( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
-    virtual double SAL_CALL     getBessely( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
-
-    virtual OUString SAL_CALL     getBin2Oct( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getBin2Dec( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getBin2Hex( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
-
-    virtual OUString SAL_CALL     getOct2Bin( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getOct2Dec( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getOct2Hex( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
-
-    virtual OUString SAL_CALL     getDec2Bin( constREFXPS& xOpt, sal_Int32 fNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getDec2Oct( constREFXPS& xOpt, sal_Int32 fNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getDec2Hex( constREFXPS& xOpt, double fNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
-
-    virtual OUString SAL_CALL     getHex2Bin( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getHex2Dec( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getHex2Oct( constREFXPS& xOpt, const OUString& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
-
-    virtual sal_Int32 SAL_CALL  getDelta( constREFXPS& xOpt, double fNum1, const ANY& rNum2 ) THROWDEF_RTE_IAE;
-
-    virtual double SAL_CALL     getErf( constREFXPS& xOpt, double fLowerLimit, const ANY& rUpperLimit ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getErfc( double fLowerLimit ) THROWDEF_RTE_IAE;
-
-    virtual sal_Int32 SAL_CALL  getGestep( constREFXPS& xOpt, double fNum, const ANY& rStep ) THROWDEF_RTE_IAE;
-
-    virtual double SAL_CALL     getFactdouble( sal_Int32 nNum ) THROWDEF_RTE_IAE;
-
-    virtual double SAL_CALL     getImabs( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getImaginary( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImpower( const OUString& aNum, double fPower ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getImargument( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImcos( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImdiv( const OUString& aDivident, const OUString& aDivisor ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImexp( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImconjugate( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImln( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImlog10( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImlog2( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImproduct( constREFXPS& xOpt, const SEQSEQ( OUString )& aNum1, const SEQ_ANY& aNumList ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getImreal( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImsin( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImsub( const OUString& aNum1, const OUString& aNum2 ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImsum( constREFXPS& xOpt, const SEQSEQ( OUString )& aNum1, const SEQ( ANY )& aFollowingPars ) THROWDEF_RTE_IAE;
-
-    virtual OUString SAL_CALL     getImsqrt( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImtan( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImsec( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImcsc( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImcot( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImsinh( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImcosh( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImsech( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getImcsch( const OUString& aNum ) THROWDEF_RTE_IAE;
-    virtual OUString SAL_CALL     getComplex( double fReal, double fImaginary, const ANY& rSuffix ) THROWDEF_RTE_IAE;
-
-    virtual double SAL_CALL     getConvert( double fVal, const OUString& aFromUnit, const OUString& aToUnit ) THROWDEF_RTE_IAE;
-
-    virtual double SAL_CALL     getAmordegrc( constREFXPS&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getAmorlinc( constREFXPS&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getAccrint( constREFXPS& xOpt, sal_Int32 nIssue, sal_Int32 nFirstInter, sal_Int32 nSettle, double fRate, const ANY& rVal, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getAccrintm( constREFXPS& xOpt, sal_Int32 nIssue, sal_Int32 nSettle, double fRate, const ANY& rVal, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getReceived( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fDisc, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getDisc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getDuration( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getEffect( double fNominal, sal_Int32 nPeriods ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getCumprinc( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getCumipmt( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getPrice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getPricedisc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getPricemat( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fYield, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getMduration( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getNominal( double fRate, sal_Int32 nPeriods ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getDollarfr( double fDollarDec, sal_Int32 nFrac ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getDollarde( double fDollarFrac, sal_Int32 nFrac ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getYield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getYielddisc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getYieldmat( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fPrice, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getTbilleq( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getTbillprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getTbillyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getOddfprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getOddfyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getOddlprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getOddlyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getXirr( constREFXPS& xOpt, const SEQSEQ( double )& rValues, const SEQSEQ( sal_Int32 )& rDates, const ANY& rGuess ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getXnpv( double fRate, const SEQSEQ( double )& rValues, const SEQSEQ( sal_Int32 )& rDates ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getIntrate( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getCoupncd( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getCoupdays( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getCoupdaysnc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getCoupdaybs( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getCouppcd( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getCoupnum( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
-    virtual double SAL_CALL     getFvschedule( double fPrinc, const SEQSEQ( double )& rSchedule ) THROWDEF_RTE_IAE;
+//    virtual double SAL_CALL       get_Test( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nMode, double f1, double f2, double f3 ) throw( css::uno::RuntimeException );
+
+    virtual sal_Int32 SAL_CALL  getWorkday( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nDays, const css::uno::Any& aHDay ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getYearfrac( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nEndDate, const css::uno::Any& aMode ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual sal_Int32 SAL_CALL  getEdate( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nMonths ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual sal_Int32 SAL_CALL  getWeeknum( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nMode ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual sal_Int32 SAL_CALL  getEomonth( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nMonths ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual sal_Int32 SAL_CALL  getNetworkdays( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nEndDate, const css::uno::Any& aHDay ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual sal_Int32 SAL_CALL  getIseven( sal_Int32 nVal ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual sal_Int32 SAL_CALL  getIsodd( sal_Int32 nVal ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual double SAL_CALL     getMultinomial( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& aVLst, const css::uno::Sequence< com::sun::star::uno::Any >& aOptVLst ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getSeriessum( double fX, double fN, double fM, const css::uno::Sequence< css::uno::Sequence< double > >& aCoeffList ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getQuotient( double fNum, double fDenum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual double SAL_CALL     getMround( double fNum, double fMult ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getSqrtpi( double fNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual double SAL_CALL     getRandbetween( double fMin, double fMax ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual double SAL_CALL     getGcd( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& aVLst, const css::uno::Sequence< css::uno::Any >& aOptVLst ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getLcm( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& aVLst, const css::uno::Sequence< css::uno::Any >& aOptVLst ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual double SAL_CALL     getBesseli( double fNum, sal_Int32 nOrder ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
+    virtual double SAL_CALL     getBesselj( double fNum, sal_Int32 nOrder ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
+    virtual double SAL_CALL     getBesselk( double fNum, sal_Int32 nOrder ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
+    virtual double SAL_CALL     getBessely( double fNum, sal_Int32 nOrder ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
+
+    virtual OUString SAL_CALL     getBin2Oct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getBin2Dec( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getBin2Hex( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual OUString SAL_CALL     getOct2Bin( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getOct2Dec( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getOct2Hex( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual OUString SAL_CALL     getDec2Bin( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 fNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getDec2Oct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 fNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getDec2Hex( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual OUString SAL_CALL     getHex2Bin( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getHex2Dec( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getHex2Oct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual sal_Int32 SAL_CALL  getDelta( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fNum1, const css::uno::Any& rNum2 ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual double SAL_CALL     getErf( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fLowerLimit, const css::uno::Any& rUpperLimit ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getErfc( double fLowerLimit ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual sal_Int32 SAL_CALL  getGestep( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fNum, const css::uno::Any& rStep ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual double SAL_CALL     getFactdouble( sal_Int32 nNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual double SAL_CALL     getImabs( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getImaginary( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImpower( const OUString& aNum, double fPower ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getImargument( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImcos( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImdiv( const OUString& aDivident, const OUString& aDivisor ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImexp( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImconjugate( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImln( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImlog10( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImlog2( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImproduct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< OUString > >& aNum1, const css::uno::Sequence< css::uno::Any >& aNumList ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getImreal( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImsin( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImsub( const OUString& aNum1, const OUString& aNum2 ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImsum( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< OUString > >& aNum1, const css::uno::Sequence< css::uno::Any >& aFollowingPars ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual OUString SAL_CALL     getImsqrt( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImtan( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImsec( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImcsc( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImcot( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImsinh( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImcosh( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImsech( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getImcsch( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual OUString SAL_CALL     getComplex( double fReal, double fImaginary, const css::uno::Any& rSuffix ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual double SAL_CALL     getConvert( double fVal, const OUString& aFromUnit, const OUString& aToUnit ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+
+    virtual double SAL_CALL     getAmordegrc( const css::uno::Reference< css::beans::XPropertySet >&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getAmorlinc( const css::uno::Reference< css::beans::XPropertySet >&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getAccrint( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nIssue, sal_Int32 nFirstInter, sal_Int32 nSettle, double fRate, const css::uno::Any& rVal, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getAccrintm( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nIssue, sal_Int32 nSettle, double fRate, const css::uno::Any& rVal, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getReceived( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fDisc, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getDisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getDuration( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getEffect( double fNominal, sal_Int32 nPeriods ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getCumprinc( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getCumipmt( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getPrice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getPricedisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getPricemat( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fYield, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getMduration( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getNominal( double fRate, sal_Int32 nPeriods ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getDollarfr( double fDollarDec, sal_Int32 nFrac ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getDollarde( double fDollarFrac, sal_Int32 nFrac ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getYield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getYielddisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getYieldmat( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fPrice, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getTbilleq( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getTbillprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getTbillyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getOddfprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getOddfyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getOddlprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getOddlyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getXirr( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates, const css::uno::Any& rGuess ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getXnpv( double fRate, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getIntrate( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fRedemp, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getCoupncd( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getCoupdays( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getCoupdaysnc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getCoupdaybs( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getCouppcd( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getCoupnum( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual double SAL_CALL     getFvschedule( double fPrinc, const css::uno::Sequence< css::uno::Sequence< double > >& rSchedule ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 };
 
 //------------------------------------------------------------------
diff --git a/scaddins/source/analysis/analysisdefs.hxx b/scaddins/source/analysis/analysisdefs.hxx
index 9ca0a9e7a54a..08423d4b0699 100644
--- a/scaddins/source/analysis/analysisdefs.hxx
+++ b/scaddins/source/analysis/analysisdefs.hxx
@@ -20,25 +20,12 @@
 #ifndef ANALYSISDEFS_HXX
 #define ANALYSISDEFS_HXX
 
-#define XPROPSET            ::com::sun::star::beans::XPropertySet
-#define REF(c)              ::com::sun::star::uno::Reference< c >
-#define constREFXPS         const REF(XPROPSET)
-#define SEQ(c)              ::com::sun::star::uno::Sequence< c >
-#define SEQSEQ(c)           ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< c > >
-#define SEQofLocName        SEQ( ::com::sun::star::sheet::LocalizedName )
-#define ANY                 ::com::sun::star::uno::Any
-#define SEQ_ANY             SEQ(ANY)
 #define STRFROMASCII(s)     OUString::createFromAscii( s )
 #define STRFROMANSI(s)      OUString( s, strlen( s ), RTL_TEXTENCODING_MS_1252 )
-#define THROWDEF_RTE        throw(::com::sun::star::uno::RuntimeException)
-#define THROW_RTE           throw ::com::sun::star::uno::RuntimeException()
-#define THROWDEF_RTE_IAE    throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IllegalArgumentException)
-#define THROW_IAE           throw ::com::sun::star::lang::IllegalArgumentException()
-#define THROWDEF_RTE_IAE_NCE    throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IllegalArgumentException,::com::sun::star::sheet::NoConvergenceException)
 
 #define CHK_Freq            ( nFreq != 1 && nFreq != 2 && nFreq != 4 )
-#define CHK_FINITE(d)       if( !::rtl::math::isFinite( d ) ) THROW_IAE
-#define RETURN_FINITE(d)    if( ::rtl::math::isFinite( d ) ) return d; else THROW_IAE
+#define CHK_FINITE(d)       if( !::rtl::math::isFinite( d ) ) throw css::lang::IllegalArgumentException()
+#define RETURN_FINITE(d)    if( ::rtl::math::isFinite( d ) ) return d; else throw css::lang::IllegalArgumentException()
 
 #endif
 
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index ddcaec6462d6..7514b6bdd07d 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -28,7 +28,6 @@
 #include "analysishelper.hxx"
 #include "analysis.hrc"
 
-using namespace                 ::rtl;
 using namespace                 ::com::sun::star;
 
 
@@ -248,13 +247,13 @@ void DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt
  *
  */
 
-sal_Int32 GetNullDate( constREFXPS& xOpt ) THROWDEF_RTE
+sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOpt ) throw( uno::RuntimeException )
 {
     if( xOpt.is() )
     {
         try
         {
-            ANY aAny = xOpt->getPropertyValue( STRFROMASCII( "NullDate" ) );
+            uno::Any aAny = xOpt->getPropertyValue( STRFROMASCII( "NullDate" ) );
             util::Date  aDate;
             if( aAny >>= aDate )
                 return DateToDays( aDate.Day, aDate.Month, aDate.Year );
@@ -334,7 +333,7 @@ sal_Int32 GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 nYear2 )
 
 
 void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
-    sal_uInt16& rYears, sal_Int32& rDayDiffPart, sal_Int32& rDaysInYear ) THROWDEF_RTE_IAE
+    sal_uInt16& rYears, sal_Int32& rDayDiffPart, sal_Int32& rDaysInYear ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nStartDate > nEndDate )
     {
@@ -396,7 +395,7 @@ void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate
             nDayDiff %= nDaysInYear;
             break;
         default:
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
     }
 
     rYears = nYears;
@@ -406,7 +405,7 @@ void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate
 
 
 sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
-    sal_Int32* pOptDaysIn1stYear ) THROWDEF_RTE_IAE
+    sal_Int32* pOptDaysIn1stYear ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Bool    bNeg = nStartDate > nEndDate;
 
@@ -470,14 +469,14 @@ sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEnd
                 *pOptDaysIn1stYear = 365;
             break;
         default:
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
     }
 
     return bNeg? -nRet : nRet;
 }
 
 
-double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) THROWDEF_RTE_IAE
+double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Int32   nDays1stYear;
     sal_Int32   nTotalDays = GetDiffDate( nNullDate, nStartDate, nEndDate, nMode, &nDays1stYear );
@@ -486,7 +485,7 @@ double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDat
 }
 
 
-sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode ) THROWDEF_RTE_IAE
+sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     switch( nMode )
     {
@@ -504,12 +503,12 @@ sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode )
         case 3:         //3=exact/365
             return 365;
         default:
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
     }
 }
 
 
-double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) THROWDEF_RTE_IAE
+double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nStartDate == nEndDate )
         return 0.0;     // nothing to do...
@@ -562,14 +561,14 @@ double GetGcd( double f1, double f2 )
 }
 
 
-double ConvertToDec( const OUString& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim ) THROWDEF_RTE_IAE
+double ConvertToDec( const OUString& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if ( nBase < 2 || nBase > 36 )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     sal_uInt32      nStrLen = aStr.getLength();
     if( nStrLen > nCharLim )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
     else if( !nStrLen )
         return 0.0;
 
@@ -605,7 +604,7 @@ double ConvertToDec( const OUString& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim
         }
         else
             // illegal char!
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
 
         p++;
 
@@ -629,14 +628,14 @@ static inline sal_Char GetMaxChar( sal_uInt16 nBase )
 
 
 OUString ConvertFromDec( double fNum, double fMin, double fMax, sal_uInt16 nBase,
-    sal_Int32 nPlaces, sal_Int32 nMaxPlaces, sal_Bool bUsePlaces ) THROWDEF_RTE_IAE
+    sal_Int32 nPlaces, sal_Int32 nMaxPlaces, sal_Bool bUsePlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     fNum = ::rtl::math::approxFloor( fNum );
     fMin = ::rtl::math::approxFloor( fMin );
     fMax = ::rtl::math::approxFloor( fMax );
 
     if( fNum < fMin || fNum > fMax || ( bUsePlaces && ( nPlaces <= 0 || nPlaces > nMaxPlaces ) ) )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     sal_Int64 nNum = static_cast< sal_Int64 >( fNum );
     sal_Bool        bNeg = nNum < 0;
@@ -651,7 +650,7 @@ OUString ConvertFromDec( double fNum, double fMin, double fMax, sal_uInt16 nBase
         sal_Int32 nLen = aRet.getLength();
         if( !bNeg && nLen > nPlaces )
         {
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         }
         else if( ( bNeg && nLen < nMaxPlaces ) || ( !bNeg && nLen < nPlaces ) )
         {
@@ -892,10 +891,10 @@ OUString GetString( double f, sal_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 ) THROWDEF_RTE_IAE
+    double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nBase == 2 )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     sal_uInt32  nPer = sal_uInt32( fPer );
     double      fUsePer = 1.0 / fRate;
@@ -940,10 +939,10 @@ 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 ) THROWDEF_RTE_IAE
+    double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nBase == 2 )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     sal_uInt32  nPer = sal_uInt32( fPer );
     double      fOneRate = fCost * fRate;
@@ -963,7 +962,7 @@ double GetAmorlinc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int3
 
 
 double GetDuration( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup,
-    double fYield, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE
+    double fYield, sal_Int32 nFreq, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double          fYearfrac = GetYearFrac( nNullDate, nSettle, nMat, nBase );
     double          fNumOfCoups = GetCoupnum( nNullDate, nSettle, nMat, nFreq, nBase );
@@ -996,7 +995,7 @@ double GetDuration( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, doub
 
 
 double GetYieldmat( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
-    double fRate, double fPrice, sal_Int32 nBase ) THROWDEF_RTE_IAE
+    double fRate, double fPrice, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double      fIssMat = GetYearFrac( nNullDate, nIssue, nMat, nBase );
     double      fIssSet = GetYearFrac( nNullDate, nIssue, nSettle, nBase );
@@ -1013,14 +1012,14 @@ double GetYieldmat( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_
 
 double GetOddfprice( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /*nMat*/, sal_Int32 /*nIssue*/,
     sal_Int32 /*nFirstCoup*/, double /*fRate*/, double /*fYield*/, double /*fRedemp*/, sal_Int32 /*nFreq*/,
-    sal_Int32 /*nBase*/ ) THROWDEF_RTE_IAE
+    sal_Int32 /*nBase*/ ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
-    THROW_RTE;  // #87380#
+    throw uno::RuntimeException();  // #87380#
 }
 
 
 double getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice,
-                    double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE
+                    double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double      fRate = fCoup;
     double      fPriceN = 0.0;
@@ -1065,14 +1064,14 @@ double getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double
     }
 
     if( fabs( fPrice - fPriceN ) > fPrice / 100.0 )
-        THROW_IAE;      // result not precise enough
+        throw lang::IllegalArgumentException();      // result not precise enough
 
     return fYieldN;
 }
 
 
 double getPrice_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield,
-                    double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE
+                    double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double      fFreq = nFreq;
 
@@ -1096,14 +1095,14 @@ double getPrice_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double
 
 double GetOddfyield( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /*nMat*/, sal_Int32 /*nIssue*/,
     sal_Int32 /*nFirstCoup*/, double /*fRate*/, double /*fPrice*/, double /*fRedemp*/, sal_Int32 /*nFreq*/,
-    sal_Int32 /*nBase*/ ) THROWDEF_RTE_IAE
+    sal_Int32 /*nBase*/ ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
-    THROW_RTE;  // #87380#
+    throw uno::RuntimeException();  // #87380#
 }
 
 
 double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastCoup,
-    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE
+    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double      fFreq = double( nFreq );
     double      fDCi = GetYearFrac( nNullDate, nLastCoup, nMat, nBase ) * fFreq;
@@ -1119,7 +1118,7 @@ double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal
 
 
 double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastCoup,
-    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE
+    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     double      fFreq = double( nFreq );
     double      fDCi = GetYearFrac( nNullDate, nLastCoup, nMat, nBase ) * fFreq;
@@ -1189,10 +1188,10 @@ static void lcl_GetCouppcd( ScaDate& rDate, const ScaDate& rSettle, const ScaDat
 }
 
 double GetCouppcd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    THROWDEF_RTE_IAE
+    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     ScaDate aDate;
     lcl_GetCouppcd( aDate, ScaDate( nNullDate, nSettle, nBase ), ScaDate( nNullDate, nMat, nBase ), nFreq );
@@ -1214,10 +1213,10 @@ static void lcl_GetCoupncd( ScaDate& rDate, const ScaDate& rSettle, const ScaDat
 }
 
 double GetCoupncd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    THROWDEF_RTE_IAE
+    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     ScaDate aDate;
     lcl_GetCoupncd( aDate, ScaDate( nNullDate, nSettle, nBase ), ScaDate( nNullDate, nMat, nBase ), nFreq );
@@ -1228,10 +1227,10 @@ double GetCoupncd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_I
 //-------
 // COUPDAYBS: get day count: coupon date before settlement <-> settlement
 double GetCoupdaybs( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    THROWDEF_RTE_IAE
+    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     ScaDate aSettle( nNullDate, nSettle, nBase );
     ScaDate aDate;
@@ -1243,10 +1242,10 @@ double GetCoupdaybs( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal
 //-------
 // COUPDAYSNC: get day count: settlement <-> coupon date after settlement
 double GetCoupdaysnc( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    THROWDEF_RTE_IAE
+    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     if( (nBase != 0) && (nBase != 4) )
     {
@@ -1262,10 +1261,10 @@ double GetCoupdaysnc( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sa
 //-------
 // COUPDAYS: get day count: coupon date before settlement <-> coupon date after settlement
 double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    THROWDEF_RTE_IAE
+    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     if( nBase == 1 )
     {
@@ -1282,10 +1281,10 @@ double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_
 //-------
 // COUPNUM: get count of coupon dates
 double GetCoupnum( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    THROWDEF_RTE_IAE
+    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     ScaDate aMat( nNullDate, nMat, nBase );
     ScaDate aDate;
@@ -1695,10 +1694,10 @@ sal_Bool ScaDoubleListGE0::CheckInsert( double fValue ) const throw( uno::Runtim
 
 //-----------------------------------------------------------------------------
 
-Complex::Complex( const OUString& rStr ) THROWDEF_RTE_IAE
+Complex::Complex( const OUString& rStr ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( !ParseString( rStr, *this ) )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 }
 
 
@@ -1776,7 +1775,7 @@ sal_Bool Complex::ParseString( const OUString& rStr, Complex& rCompl )
 }
 
 
-OUString Complex::GetString() const THROWDEF_RTE_IAE
+OUString Complex::GetString() const throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     CHK_FINITE(r);
     CHK_FINITE(i);
@@ -1805,10 +1804,10 @@ OUString Complex::GetString() const THROWDEF_RTE_IAE
 }
 
 
-double Complex::Arg( void ) const THROWDEF_RTE_IAE
+double Complex::Arg( void ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( r == 0.0 && i == 0.0 )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     double  phi = acos( r / Abs() );
 
@@ -1819,7 +1818,7 @@ double Complex::Arg( void ) const THROWDEF_RTE_IAE
 }
 
 
-void Complex::Power( double fPower ) THROWDEF_RTE_IAE
+void Complex::Power( double fPower ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( r == 0.0 && i == 0.0 )
     {
@@ -1829,7 +1828,7 @@ void Complex::Power( double fPower ) THROWDEF_RTE_IAE
             return;
         }
         else
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
     }
 
     double      p, phi;
@@ -1859,10 +1858,10 @@ void Complex::Sqrt( void )
 }
 
 
-void Complex::Sin( void ) THROWDEF_RTE_IAE
+void Complex::Sin( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( !::rtl::math::isValidArcArg( r ) )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     if( i )
     {
@@ -1877,10 +1876,10 @@ void Complex::Sin( void ) THROWDEF_RTE_IAE
 }
 
 
-void Complex::Cos( void ) THROWDEF_RTE_IAE
+void Complex::Cos( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
 	if( !::rtl::math::isValidArcArg( r ) )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     if( i )
     {
@@ -1895,10 +1894,10 @@ void Complex::Cos( void ) THROWDEF_RTE_IAE
 }
 
 
-void Complex::Div( const Complex& z ) THROWDEF_RTE_IAE
+void Complex::Div( const Complex& z ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( z.r == 0 && z.i == 0 )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     double  a1 = r;
     double  a2 = z.r;
@@ -1922,10 +1921,10 @@ void Complex::Exp( void )
 }
 
 
-void Complex::Ln( void ) THROWDEF_RTE_IAE
+void Complex::Ln( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( r == 0.0 && i == 0.0 )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     double      fAbs = Abs();
     sal_Bool    bNegi = i < 0.0;
@@ -1939,26 +1938,26 @@ void Complex::Ln( void ) THROWDEF_RTE_IAE
 }
 
 
-void Complex::Log10( void ) THROWDEF_RTE_IAE
+void Complex::Log10( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Ln();
     Mult( 0.434294481903251828 );   // * log10( e )
 }
 
 
-void Complex::Log2( void ) THROWDEF_RTE_IAE
+void Complex::Log2( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     Ln();
     Mult( 1.442695040888963407 );   // * log2( e )
 }
 
 
-void Complex::Tan(void) THROWDEF_RTE_IAE
+void Complex::Tan(void) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         double fScale =1.0 / ( cos( 2.0 * r ) + cosh( 2.0 * i ));
         r = sin( 2.0 * r ) * fScale;
         i = sinh( 2.0 * i ) * fScale;
@@ -1966,18 +1965,18 @@ void Complex::Tan(void) THROWDEF_RTE_IAE
     else
     {
         if( !::rtl::math::isValidArcArg( r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         r = tan( r );
     }
 }
 
 
-void Complex::Sec( void ) THROWDEF_RTE_IAE
+void Complex::Sec( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( i )
     {
         if( !::rtl::math::isValidArcArg( 2 * r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         double fScale = 1.0 / (cosh( 2.0 * i) + cos ( 2.0 * r));
         double  r_;
         r_ = 2.0 * cos( r ) * cosh( i ) * fScale;
@@ -1987,18 +1986,18 @@ void Complex::Sec( void ) THROWDEF_RTE_IAE
     else
     {
         if( !::rtl::math::isValidArcArg( r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         r = 1.0 / cos( r );
     }
 }
 
 
-void Complex::Csc( void ) THROWDEF_RTE_IAE
+void Complex::Csc( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( i )
     {
         if( !::rtl::math::isValidArcArg( 2 * r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         double fScale = 1.0 / (cosh( 2.0 * i) - cos ( 2.0 * r));
         double  r_;
         r_ = 2.0 * sin( r ) * cosh( i ) * fScale;
@@ -2008,18 +2007,18 @@ void Complex::Csc( void ) THROWDEF_RTE_IAE
     else
     {
         if( !::rtl::math::isValidArcArg( r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         r = 1.0 / sin( r );
     }
 }
 
 
-void Complex::Cot(void) THROWDEF_RTE_IAE
+void Complex::Cot(void) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         double fScale =1.0 / ( cosh( 2.0 * i ) - cos( 2.0 * r ) );
         r = sin( 2.0 * r ) * fScale;
         i = - ( sinh( 2.0 * i ) * fScale );
@@ -2027,16 +2026,16 @@ void Complex::Cot(void) THROWDEF_RTE_IAE
     else
     {
         if( !::rtl::math::isValidArcArg( r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         r = 1.0 / tan( r );
     }
 }
 
 
-void Complex::Sinh( void ) THROWDEF_RTE_IAE
+void Complex::Sinh( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( !::rtl::math::isValidArcArg( r ) )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     if( i )
     {
@@ -2050,10 +2049,10 @@ void Complex::Sinh( void ) THROWDEF_RTE_IAE
 }
 
 
-void Complex::Cosh( void ) THROWDEF_RTE_IAE
+void Complex::Cosh( void ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( !::rtl::math::isValidArcArg( r ) )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     if( i )
     {
@@ -2067,12 +2066,12 @@ void Complex::Cosh( void ) THROWDEF_RTE_IAE
 }
 
 
-void Complex::Sech(void) THROWDEF_RTE_IAE
+void Complex::Sech(void) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         double fScale =1.0 / ( cosh( 2.0 * r ) + cos( 2.0 * i ));
         double r_;
         r_ = 2.0 * cosh( r ) * cos( i ) * fScale;
@@ -2082,18 +2081,18 @@ void Complex::Sech(void) THROWDEF_RTE_IAE
     else
     {
         if( !::rtl::math::isValidArcArg( r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         r = 1.0 / cosh( r );
     }
 }
 
 
-void Complex::Csch(void) THROWDEF_RTE_IAE
+void Complex::Csch(void) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         double fScale =1.0 / ( cosh( 2.0 * r ) - cos( 2.0 * i ));
         double r_;
         r_ = 2.0 * sinh( r ) * cos( i ) * fScale;
@@ -2103,7 +2102,7 @@ void Complex::Csch(void) THROWDEF_RTE_IAE
     else
     {
         if( !::rtl::math::isValidArcArg( r ) )
-            THROW_IAE;
+            throw lang::IllegalArgumentException();
         r = 1.0 / sinh( r );
     }
 }
@@ -2116,7 +2115,7 @@ ComplexList::~ComplexList()
 }
 
 
-void ComplexList::Append( const SEQSEQ( OUString )& r, ComplListAppendHandl eAH ) THROWDEF_RTE_IAE
+void ComplexList::Append( const uno::Sequence< uno::Sequence< OUString > >& r, ComplListAppendHandl eAH ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Int32   n1, n2;
     sal_Int32   nE1 = r.getLength();
@@ -2126,7 +2125,7 @@ void ComplexList::Append( const SEQSEQ( OUString )& r, ComplListAppendHandl eAH
 
     for( n1 = 0 ; n1 < nE1 ; n1++ )
     {
-        const SEQ( OUString )&    rList = r[ n1 ];
+        const uno::Sequence< OUString >&    rList = r[ n1 ];
         nE2 = rList.getLength();
 
         for( n2 = 0 ; n2 < nE2 ; n2++ )
@@ -2138,13 +2137,13 @@ void ComplexList::Append( const SEQSEQ( OUString )& r, ComplListAppendHandl eAH
             else if( bEmpty0 )
                 Append( new Complex( 0.0 ) );
             else if( bErrOnEmpty )
-                THROW_IAE;
+                throw lang::IllegalArgumentException();
         }
     }
 }
 
 
-void ComplexList::Append( const SEQ( ANY )& aMultPars, ComplListAppendHandl eAH ) THROWDEF_RTE_IAE
+void ComplexList::Append( const uno::Sequence< uno::Any >& aMultPars, ComplListAppendHandl eAH ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     sal_Int32       nEle = aMultPars.getLength();
     sal_Bool        bEmpty0 = eAH == AH_EmpyAs0;
@@ -2152,7 +2151,7 @@ void ComplexList::Append( const SEQ( ANY )& aMultPars, ComplListAppendHandl eAH
 
     for( sal_Int32 i = 0 ; i < nEle ; i++ )
     {
-        const ANY&  r = aMultPars[ i ];
+        const uno::Any&  r = aMultPars[ i ];
         switch( r.getValueTypeClass() )
         {
             case uno::TypeClass_VOID:       break;
@@ -2165,7 +2164,7 @@ void ComplexList::Append( const SEQ( ANY )& aMultPars, ComplListAppendHandl eAH
                 else if( bEmpty0 )
                     Append( new Complex( 0.0 ) );
                 else if( bErrOnEmpty )
-                    THROW_IAE;
+                    throw lang::IllegalArgumentException();
                 }
                 break;
             case uno::TypeClass_DOUBLE:
@@ -2173,20 +2172,20 @@ void ComplexList::Append( const SEQ( ANY )& aMultPars, ComplListAppendHandl eAH
                 break;
             case uno::TypeClass_SEQUENCE:
                 {
-                SEQSEQ( ANY )           aValArr;
+                uno::Sequence< uno::Sequence< uno::Any > >           aValArr;
                 if( r >>= aValArr )
                 {
                     sal_Int32           nE = aValArr.getLength();
-                    const SEQ( ANY )*   pArr = aValArr.getConstArray();
+                    const uno::Sequence< uno::Any >*   pArr = aValArr.getConstArray();
                     for( sal_Int32 n = 0 ; n < nE ; n++ )
                         Append( pArr[ n ], eAH );
                 }
                 else
-                    THROW_IAE;
+                    throw lang::IllegalArgumentException();
                 }
                 break;
             default:
-                THROW_IAE;
+                throw lang::IllegalArgumentException();
         }
     }
 }
@@ -2310,10 +2309,10 @@ sal_Int16 ConvertData::GetMatchingLevel( const OUString& rRef ) const
 
 
 double ConvertData::Convert(
-    double f, const ConvertData& r, sal_Int16 nLevFrom, sal_Int16 nLevTo ) const THROWDEF_RTE_IAE
+    double f, const ConvertData& r, sal_Int16 nLevFrom, sal_Int16 nLevTo ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( Class() != r.Class() )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 
     sal_Bool bBinFromLev = ( nLevFrom > 0 && ( nLevFrom % 10 ) == 0 );
     sal_Bool bBinToLev   = ( nLevTo > 0 && ( nLevTo % 10 ) == 0 );
@@ -2363,10 +2362,10 @@ ConvertDataLinear::~ConvertDataLinear()
 }
 
 double ConvertDataLinear::Convert(
-    double f, const ConvertData& r, sal_Int16 nLevFrom, sal_Int16 nLevTo ) const THROWDEF_RTE_IAE
+    double f, const ConvertData& r, sal_Int16 nLevFrom, sal_Int16 nLevTo ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( Class() != r.Class() )
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
     return r.ConvertFromBase( ConvertToBase( f, nLevFrom ), nLevTo );
 }
 
@@ -2584,7 +2583,7 @@ ConvertDataList::~ConvertDataList()
 }
 
 
-double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUString& rTo ) THROWDEF_RTE_IAE
+double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUString& rTo ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     ConvertData*    pFrom = NULL;
     ConvertData*    pTo = NULL;
@@ -2640,7 +2639,7 @@ double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUStr
     if( pFrom && pTo )
         return pFrom->Convert( fVal, *pTo, nLevelFrom, nLevelTo );
     else
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
 }
 
 
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 50092327be1c..871ad917684a 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -68,39 +68,39 @@ inline sal_Bool     IsLeapYear( sal_uInt16 nYear );
 
 sal_uInt16          DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear );
 sal_Int32           DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear );
-void                DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt16& rYear ) throw( ::com::sun::star::lang::IllegalArgumentException );
-sal_Int32           GetNullDate( const REF( ::com::sun::star::beans::XPropertySet )& xOptions ) THROWDEF_RTE;
+void                DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt16& rYear ) throw( css::lang::IllegalArgumentException );
+sal_Int32           GetNullDate( const css::uno::Reference< css::beans::XPropertySet >& xOptions ) throw( css::uno::RuntimeException );
 sal_Int32           GetDiffDate360(
                         sal_uInt16 nDay1, sal_uInt16 nMonth1, sal_uInt16 nYear1, sal_Bool bLeapYear1,
                         sal_uInt16 nDay2, sal_uInt16 nMonth2, sal_uInt16 nYear2,
                         sal_Bool bUSAMethod );
-inline sal_Int32    GetDiffDate360( constREFXPS& xOpt, sal_Int32 nDate1, sal_Int32 nDate2, sal_Bool bUSAMethod );
+inline sal_Int32    GetDiffDate360( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nDate1, sal_Int32 nDate2, sal_Bool bUSAMethod );
 sal_Int32           GetDiffDate360( sal_Int32 nNullDate, sal_Int32 nDate1, sal_Int32 nDate2, sal_Bool bUSAMethod );
 
 sal_Int32           GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 nYear2 );
 inline sal_Int16    GetDayOfWeek( sal_Int32 nDate );
 void                GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
-                        sal_uInt16& rYears, sal_Int32& rDayDiffPart, sal_Int32& rDaysInYear ) THROWDEF_RTE_IAE;
+                        sal_uInt16& rYears, sal_Int32& rDayDiffPart, sal_Int32& rDaysInYear ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
                         // rYears = full num of years
                         // rDayDiffPart = num of days for last year
                         // rDaysInYear = num of days in first year
 sal_Int32           GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
-                                sal_Int32* pOptDaysIn1stYear = NULL ) THROWDEF_RTE_IAE;
+                                sal_Int32* pOptDaysIn1stYear = NULL ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
-                                THROWDEF_RTE_IAE;
-sal_Int32           GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode ) THROWDEF_RTE_IAE;
+                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+sal_Int32           GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
-                        THROWDEF_RTE_IAE;
-inline double       GetYearFrac( constREFXPS& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
-                        THROWDEF_RTE_IAE;
+                        throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+inline double       GetYearFrac( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
+                        throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 inline void         AlignDate( sal_uInt16& rDay, sal_uInt16 nMonth, sal_uInt16 nYear );
 
 double              BinomialCoefficient( double n, double k );
 double              GetGcd( double f1, double f2 );
-double              ConvertToDec( const OUString& rFromNum, sal_uInt16 nBaseFrom, sal_uInt16 nCharLim ) THROWDEF_RTE_IAE;
+double              ConvertToDec( const OUString& rFromNum, sal_uInt16 nBaseFrom, sal_uInt16 nCharLim ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 OUString              ConvertFromDec(
                         double fNum, double fMin, double fMax, sal_uInt16 nBase,
-                        sal_Int32 nPlaces, sal_Int32 nMaxPlaces, sal_Bool bUsePlaces ) THROWDEF_RTE_IAE;
+                        sal_Int32 nPlaces, sal_Int32 nMaxPlaces, sal_Bool bUsePlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              Erf( double fX );
 double              Erfc( double fX );
 sal_Bool            ParseDouble( const sal_Unicode*& rpDoubleAsString, double& rReturn );
@@ -108,43 +108,43 @@ OUString              GetString( double fNumber, sal_Bool bLeadingSign = sal_Fal
 inline double       Exp10( sal_Int16 nPower );      // 10 ^ nPower
 
 double              GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
-                                double fRestVal, double fPer, double fRate, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetAmorlinc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
-                                double fRestVal, double fPer, double fRate, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetDuration( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup,
-                                double fYield, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                double fYield, sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetYieldmat( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
-                                double fRate, double fPrice, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                double fRate, double fPrice, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetOddfprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
                                 sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp,
-                                sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice,
-                                double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              getPrice_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield,
-                                double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetOddfyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
                                 sal_Int32 nFirstCoup, double fRate, double fPrice, double fRedemp,
-                                sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
-                                double fRate, double fYield, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                double fRate, double fYield, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
-                                double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetRmz( double fZins, double fZzr, double fBw, double fZw, sal_Int32 nF );
 double              GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF );
 
 double              GetCouppcd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
-                                sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetCoupncd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
-                                sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetCoupdaybs( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
-                                sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetCoupdaysnc( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
-                                sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
 double              GetCoupnum( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat,
-                                sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 double              GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
-                                sal_Int32 nBase ) THROWDEF_RTE_IAE;
+                                sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
 
 
@@ -328,15 +328,15 @@ protected:
     void                        Insert( sal_Int32 nDay );
     void                        Insert( sal_Int32 nDay, sal_Int32 nNullDate, sal_Bool bInsertOnWeekend );
     void                        Insert( double fDay, sal_Int32 nNullDate, sal_Bool bInsertOnWeekend )
-                                    throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
                                 /** @param rAnyConv  must be an initialized ScaAnyConmverter
                                     @param bInsertOnWeekend  insertion mode: sal_False = holidays on weekend are omitted */
     void                        InsertHolidayList(
                                     const ScaAnyConverter& rAnyConv,
-                                    const ::com::sun::star::uno::Any& rHolAny,
+                                    const css::uno::Any& rHolAny,
                                     sal_Int32 nNullDate,
-                                    sal_Bool bInsertOnWeekend ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    sal_Bool bInsertOnWeekend ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
 public:
                                 SortedIndividualInt32List();
@@ -355,10 +355,10 @@ public:
                                     @param bInsertOnWeekend  insertion mode: sal_False = holidays on weekend are omitted */
     void                        InsertHolidayList(
                                     ScaAnyConverter& rAnyConv,
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xOptions,
-                                    const ::com::sun::star::uno::Any& rHolAny,
+                                    const css::uno::Reference< css::beans::XPropertySet >& xOptions,
+                                    const css::uno::Any& rHolAny,
                                     sal_Int32 nNullDate,
-                                    sal_Bool bInsertOnWeekend ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    sal_Bool bInsertOnWeekend ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 };
 
 
@@ -370,29 +370,29 @@ protected:
     inline void                 ListAppend( double fValue ) { MyList::Append( new double( fValue ) ); }
 
     using MyList::Append;
-    inline void                 Append( double fValue ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException )
+    inline void                 Append( double fValue ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
                                     { if( CheckInsert( fValue ) ) ListAppend( fValue ); }
 
                                 /** @param rAnyConv  must be an initialized ScaAnyConmverter
                                     @param bIgnoreEmpty  handling of empty Any's/strings: sal_False = inserted as 0.0; sal_True = omitted */
     void                        Append(
                                     const ScaAnyConverter& rAnyConv,
-                                    const ::com::sun::star::uno::Any& rAny,
-                                    sal_Bool bIgnoreEmpty ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    const css::uno::Any& rAny,
+                                    sal_Bool bIgnoreEmpty ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
                                 /** @param rAnyConv  must be an initialized ScaAnyConmverter
                                     @param bIgnoreEmpty  handling of empty Any's/strings: sal_False = inserted as 0.0; sal_True = omitted */
     void                        Append(
                                     const ScaAnyConverter& rAnyConv,
-                                    const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rAnySeq,
-                                    sal_Bool bIgnoreEmpty ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    const css::uno::Sequence< css::uno::Any >& rAnySeq,
+                                    sal_Bool bIgnoreEmpty ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
                                 /** @param rAnyConv  must be an initialized ScaAnyConmverter
                                     @param bIgnoreEmpty  handling of empty Any's/strings: sal_False = inserted as 0.0; sal_True = omitted */
     void                        Append(
                                     const ScaAnyConverter& rAnyConv,
-                                    const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rAnySeq,
-                                    sal_Bool bIgnoreEmpty ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& rAnySeq,
+                                    sal_Bool bIgnoreEmpty ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
 public:
     virtual                     ~ScaDoubleList();
@@ -404,21 +404,21 @@ public:
     inline const double*        First() { return static_cast< const double* >( MyList::First() ); }
     inline const double*        Next()  { return static_cast< const double* >( MyList::Next() ); }
 
-    void                        Append( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& rValueArr )
-                                    throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
-    void                        Append( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& rValueArr )
-                                    throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+    void                        Append( const css::uno::Sequence< css::uno::Sequence< double > >& rValueArr )
+                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                        Append( const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rValueArr )
+                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
                                 /** @param rAnyConv  is an initialized or uninitialized ScaAnyConverter
                                     @param bIgnoreEmpty  handling of empty Any's/strings: sal_False = inserted as 0.0; sal_True = omitted */
     void                        Append(
                                     ScaAnyConverter& rAnyConv,
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xOpt,
-                                    const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rAnySeq,
-                                    sal_Bool bIgnoreEmpty = sal_True ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+                                    const css::uno::Sequence< css::uno::Any >& rAnySeq,
+                                    sal_Bool bIgnoreEmpty = sal_True ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
     virtual sal_Bool            CheckInsert( double fValue ) const
-                                    throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 };
 
 
@@ -429,7 +429,7 @@ class ScaDoubleListGT0 : public ScaDoubleList
 {
 public:
     virtual sal_Bool            CheckInsert( double fValue ) const
-                                    throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 };
 
 
@@ -440,7 +440,7 @@ class ScaDoubleListGE0 : public ScaDoubleList
 {
 public:
     virtual sal_Bool            CheckInsert( double fValue ) const
-                                    throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 };
 
 
@@ -454,41 +454,41 @@ class Complex
 
 public:
     inline                  Complex( double fReal, double fImag = 0.0, sal_Unicode cC = '\0' );
-                            Complex( const OUString& rComplexAsString ) THROWDEF_RTE_IAE;
+                            Complex( const OUString& rComplexAsString ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
     inline static sal_Bool  IsImagUnit( sal_Unicode c );
     static sal_Bool         ParseString( const OUString& rComplexAsString, Complex& rReturn );
-    OUString                  GetString() const THROWDEF_RTE_IAE;
+    OUString                  GetString() const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
     inline double           Real( void ) const;
     inline double           Imag( void ) const;
 
-    double                  Arg( void ) const THROWDEF_RTE_IAE;
+    double                  Arg( void ) const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
     inline double           Abs( void ) const;
 
     // following functions change the complex number itself to avoid unnecessary copy actions!
-    void                    Power( double fPower ) THROWDEF_RTE_IAE;
+    void                    Power( double fPower ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
     void                    Sqrt( void );
-    void                    Sin( void ) THROWDEF_RTE_IAE;
-    void                    Cos( void ) THROWDEF_RTE_IAE;
-    void                    Div( const Complex& rDivisor ) THROWDEF_RTE_IAE;
+    void                    Sin( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Cos( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Div( const Complex& rDivisor ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
     void                    Exp( void );
     inline void             Conjugate( void );
-    void                    Ln( void ) THROWDEF_RTE_IAE;
-    void                    Log10( void ) THROWDEF_RTE_IAE;
-    void                    Log2( void ) THROWDEF_RTE_IAE;
+    void                    Ln( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Log10( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Log2( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
     inline void             Mult( double fFact );
     inline void             Mult( const Complex& rMult );
     inline void             Sub( const Complex& rMult );
     inline void             Add( const Complex& rAdd );
-    void                    Tan( void ) THROWDEF_RTE_IAE;
-    void                    Sec( void ) THROWDEF_RTE_IAE;
-    void                    Csc( void ) THROWDEF_RTE_IAE;
-    void                    Cot( void ) THROWDEF_RTE_IAE;
-    void                    Sinh( void ) THROWDEF_RTE_IAE;
-    void                    Cosh( void ) THROWDEF_RTE_IAE;
-    void                    Sech( void ) THROWDEF_RTE_IAE;
-    void                    Csch( void ) THROWDEF_RTE_IAE;
+    void                    Tan( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Sec( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Csc( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Cot( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Sinh( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Cosh( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Sech( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Csch( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
 };
 
@@ -516,8 +516,8 @@ public:
 
     using MyList::Append;
     inline void             Append( Complex* pNew );
-    void                    Append( const SEQSEQ( OUString )& rComplexNumList, ComplListAppendHandl eAH = AH_EmpyAs0 ) THROWDEF_RTE_IAE;
-    void                    Append( const SEQ( ANY )& aMultPars,ComplListAppendHandl eAH = AH_EmpyAs0 ) THROWDEF_RTE_IAE;
+    void                    Append( const css::uno::Sequence< css::uno::Sequence< OUString > >& rComplexNumList, ComplListAppendHandl eAH = AH_EmpyAs0 ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Append( const css::uno::Sequence< css::uno::Any >& aMultPars,ComplListAppendHandl eAH = AH_EmpyAs0 ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 };
 
 
@@ -562,7 +562,7 @@ public:
                                     //  rest gives power for 10 represented by the prefix (e.g. 3 for k or -9 for n
 
     virtual double          Convert( double fVal, const ConvertData& rTo,
-                                sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const THROWDEF_RTE_IAE;
+                                sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
                                     // converts fVal from this unit to rFrom unit
                                     // throws exception if not from same class
                                     // this implementation is for proportional cases only
@@ -591,7 +591,7 @@ public:
     virtual                 ~ConvertDataLinear();
 
     virtual double          Convert( double fVal, const ConvertData& rTo,
-                                sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const THROWDEF_RTE_IAE;
+                                sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
                                     // for cases where f(x) = a + bx applies (e.g. Temperatures)
 
     virtual double          ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const;
@@ -611,7 +611,7 @@ public:
                             ConvertDataList( void );
     virtual                 ~ConvertDataList();
 
-    double                  Convert( double fVal, const OUString& rFrom, const OUString& rTo ) THROWDEF_RTE_IAE;
+    double                  Convert( double fVal, const OUString& rFrom, const OUString& rTo ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 };
 
 
@@ -623,7 +623,7 @@ inline sal_Bool IsLeapYear( sal_uInt16 n )
 }
 
 
-inline sal_Int32 GetDiffDate360( constREFXPS& xOpt, sal_Int32 nDate1, sal_Int32 nDate2, sal_Bool bUSAMethod )
+inline sal_Int32 GetDiffDate360( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nDate1, sal_Int32 nDate2, sal_Bool bUSAMethod )
 {
     return GetDiffDate360( GetNullDate( xOpt ), nDate1, nDate2, bUSAMethod );
 }
@@ -635,7 +635,7 @@ inline sal_Int16 GetDayOfWeek( sal_Int32 n )
 }
 
 
-inline double GetYearFrac( constREFXPS& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) THROWDEF_RTE_IAE
+inline double GetYearFrac( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     return GetYearFrac( GetNullDate( xOpt ), nStartDate, nEndDate, nMode );
 }
@@ -962,7 +962,7 @@ private:
     sal_Int32                   getDaysInYearRange( sal_uInt16 nFrom, sal_uInt16 nTo ) const;
 
                                 /// Adds/subtracts the given count of years, does not adjust day.
-    void                        doAddYears( sal_Int32 nYearCount ) throw( ::com::sun::star::lang::IllegalArgumentException );
+    void                        doAddYears( sal_Int32 nYearCount ) throw( css::lang::IllegalArgumentException );
 
 public:
                                 ScaDate();
@@ -984,17 +984,17 @@ public:
     inline sal_uInt16           getYear() const     { return nYear; };
 
                                 /// adds/subtracts the given count of months, adjusts day
-    void                        addMonths( sal_Int32 nMonthCount ) throw( ::com::sun::star::lang::IllegalArgumentException );
+    void                        addMonths( sal_Int32 nMonthCount ) throw( css::lang::IllegalArgumentException );
 
                                 /// sets the given year, adjusts day
     inline void                 setYear( sal_uInt16 nNewYear );
                                 /// adds/subtracts the given count of years, adjusts day
-    inline void                 addYears( sal_Int32 nYearCount ) throw( ::com::sun::star::lang::IllegalArgumentException );
+    inline void                 addYears( sal_Int32 nYearCount ) throw( css::lang::IllegalArgumentException );
 
                                 /// @return  the internal number of the current date
     sal_Int32                   getDate( sal_Int32 nNullDate ) const;
                                 /// @return  the number of days between the two dates
-    static sal_Int32            getDiff( const ScaDate& rFrom, const ScaDate& rTo ) throw( ::com::sun::star::lang::IllegalArgumentException );
+    static sal_Int32            getDiff( const ScaDate& rFrom, const ScaDate& rTo ) throw( css::lang::IllegalArgumentException );
 
     sal_Bool                    operator<( const ScaDate& rCmp ) const;
     inline sal_Bool             operator<=( const ScaDate& rCmp ) const { return !(rCmp < *this); }
@@ -1018,7 +1018,7 @@ inline void ScaDate::setYear( sal_uInt16 nNewYear )
     setDay();
 }
 
-inline void ScaDate::addYears( sal_Int32 nYearCount ) throw( ::com::sun::star::lang::IllegalArgumentException )
+inline void ScaDate::addYears( sal_Int32 nYearCount ) throw( css::lang::IllegalArgumentException )
 {
     doAddYears( nYearCount );
     setDay();
@@ -1031,7 +1031,7 @@ inline void ScaDate::addYears( sal_Int32 nYearCount ) throw( ::com::sun::star::l
 class ScaAnyConverter
 {
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter2 > xFormatter;
+    css::uno::Reference< css::util::XNumberFormatter2 > xFormatter;
     sal_Int32                   nDefaultFormat;
     sal_Bool                    bHasValidFormat;
 
@@ -1042,17 +1042,17 @@ private:
                                     @return  the converted double value. */
     double                      convertToDouble(
                                     const ::rtl::OUString& rString ) const
-                                throw( ::com::sun::star::lang::IllegalArgumentException );
+                                throw( css::lang::IllegalArgumentException );
 
 public:
                                 ScaAnyConverter(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
+                                    const css::uno::Reference< css::uno::XComponentContext >& xContext );
                                 ~ScaAnyConverter();
 
                                 /// Initializing with current language settings
     void                        init(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropSet )
-                                throw( ::com::sun::star::uno::RuntimeException );
+                                    const css::uno::Reference< css::beans::XPropertySet >& xPropSet )
+                                throw( css::uno::RuntimeException );
 
                                 /** Converts an Any to double (without initialization).
                                     The Any can be empty or contain a double or string.
@@ -1062,8 +1062,8 @@ public:
                                              sal_False if the Any is empty or the string is empty */
     sal_Bool                    getDouble(
                                     double& rfResult,
-                                    const ::com::sun::star::uno::Any& rAny ) const
-                                throw( ::com::sun::star::lang::IllegalArgumentException );
+                                    const css::uno::Any& rAny ) const
+                                throw( css::lang::IllegalArgumentException );
 
                                 /** Converts an Any to double (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -1073,9 +1073,9 @@ public:
                                              sal_False if the Any is empty or the string is empty */
     sal_Bool                    getDouble(
                                     double& rfResult,
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropSet,
-                                    const ::com::sun::star::uno::Any& rAny )
-                                throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    const css::uno::Reference< css::beans::XPropertySet >& xPropSet,
+                                    const css::uno::Any& rAny )
+                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
                                 /** Converts an Any to double (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -1083,10 +1083,10 @@ public:
                                         on other Any types or on invalid strings.
                                     @return  the value of the double or string or fDefault if the Any or string is empty */
     double                      getDouble(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropSet,
-                                    const ::com::sun::star::uno::Any& rAny,
+                                    const css::uno::Reference< css::beans::XPropertySet >& xPropSet,
+                                    const css::uno::Any& rAny,
                                     double fDefault )
-                                throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
                                 /** Converts an Any to sal_Int32 (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -1096,9 +1096,9 @@ public:
                                              sal_False if the Any is empty or the string is empty */
     sal_Bool                    getInt32(
                                     sal_Int32& rnResult,
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropSet,
-                                    const ::com::sun::star::uno::Any& rAny )
-                                throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                    const css::uno::Reference< css::beans::XPropertySet >& xPropSet,
+                                    const css::uno::Any& rAny )
+                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
                                 /** Converts an Any to sal_Int32 (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -1106,10 +1106,10 @@ public:
                                         on other Any types or on invalid values or strings.
                                     @return  the truncated value of the double or string or nDefault if the Any or string is empty */
     sal_Int32                   getInt32(
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropSet,
-                                    const ::com::sun::star::uno::Any& rAny,
+                                    const css::uno::Reference< css::beans::XPropertySet >& xPropSet,
+                                    const css::uno::Any& rAny,
                                     sal_Int32 nDefault )
-                                throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 };
 
 
diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx
index eb1cac59a372..dd637c69f15f 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -22,95 +22,94 @@
 #include <rtl/math.hxx>
 
 
-
-double SAL_CALL AnalysisAddIn::getAmordegrc( constREFXPS& xOpt,
+double SAL_CALL AnalysisAddIn::getAmordegrc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal,
-    double fPer, double fRate, const ANY& rOB ) THROWDEF_RTE_IAE
+    double fPer, double fRate, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( nDate > nFirstPer || fRate <= 0.0 || fRestVal > fCost )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = GetAmordegrc( GetNullDate( xOpt ), fCost, nDate, nFirstPer, fRestVal, fPer, fRate, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getAmorlinc( constREFXPS& xOpt,
+double SAL_CALL AnalysisAddIn::getAmorlinc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal,
-    double fPer, double fRate, const ANY& rOB ) THROWDEF_RTE_IAE
+    double fPer, double fRate, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( nDate > nFirstPer || fRate <= 0.0 || fRestVal > fCost )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = GetAmorlinc( GetNullDate( xOpt ), fCost, nDate, nFirstPer, fRestVal, fPer, fRate, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getAccrint( constREFXPS& xOpt,
+double SAL_CALL AnalysisAddIn::getAccrint( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nIssue, sal_Int32 /*nFirstInter*/, sal_Int32 nSettle, double fRate,
-    const ANY &rVal, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+    const css::uno::Any &rVal, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     double      fVal = aAnyConv.getDouble( xOpt, rVal, 1000.0 );
 
     if( fRate <= 0.0 || fVal <= 0.0 || CHK_Freq || nIssue >= nSettle )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = fVal * fRate * GetYearDiff( GetNullDate( xOpt ), nIssue, nSettle, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getAccrintm( constREFXPS& xOpt,
-    sal_Int32 nIssue, sal_Int32 nSettle, double fRate, const ANY& rVal, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getAccrintm( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nIssue, sal_Int32 nSettle, double fRate, const css::uno::Any& rVal, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     double      fVal = aAnyConv.getDouble( xOpt, rVal, 1000.0 );
 
     if( fRate <= 0.0 || fVal <= 0.0 || nIssue >= nSettle )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = fVal * fRate * GetYearDiff( GetNullDate( xOpt ), nIssue, nSettle, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getReceived( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fDisc, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getReceived( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fDisc, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fInvest <= 0.0 || fDisc <= 0.0 )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = fInvest / ( 1.0 - ( fDisc * GetYearDiff( GetNullDate( xOpt ), nSettle, nMat, getDateMode( xOpt, rOB ) ) ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getDisc( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getDisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fPrice <= 0.0 || fRedemp <= 0.0 || nSettle >= nMat )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
     double fRet = ( 1.0 - fPrice / fRedemp ) / GetYearFrac( xOpt, nSettle, nMat, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getDuration( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const ANY& rOB )
-    THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getDuration( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const css::uno::Any& rOB )
+    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fCoup < 0.0 || fYield < 0.0 || CHK_Freq || nSettle >= nMat )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = GetDuration( GetNullDate( xOpt ),  nSettle, nMat, fCoup, fYield, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getEffect( double fNominal, sal_Int32 nPeriods ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getEffect( double fNominal, sal_Int32 nPeriods ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( nPeriods < 1 || fNominal <= 0.0 )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double  fPeriods = nPeriods;
 
@@ -120,13 +119,13 @@ double SAL_CALL AnalysisAddIn::getEffect( double fNominal, sal_Int32 nPeriods )
 
 
 double SAL_CALL AnalysisAddIn::getCumprinc( double fRate, sal_Int32 nNumPeriods, double fVal,
-    sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) THROWDEF_RTE_IAE
+    sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     double fRmz, fKapZ;
 
     if( nStartPer < 1 || nEndPer < nStartPer || fRate <= 0.0 || nEndPer > nNumPeriods  || nNumPeriods <= 0 ||
         fVal <= 0.0 || ( nPayType != 0 && nPayType != 1 ) )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     fRmz = GetRmz( fRate, nNumPeriods, fVal, 0.0, nPayType );
 
@@ -158,13 +157,13 @@ double SAL_CALL AnalysisAddIn::getCumprinc( double fRate, sal_Int32 nNumPeriods,
 
 
 double SAL_CALL AnalysisAddIn::getCumipmt( double fRate, sal_Int32 nNumPeriods, double fVal,
-    sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) THROWDEF_RTE_IAE
+    sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     double fRmz, fZinsZ;
 
     if( nStartPer < 1 || nEndPer < nStartPer || fRate <= 0.0 || nEndPer > nNumPeriods  || nNumPeriods <= 0 ||
         fVal <= 0.0 || ( nPayType != 0 && nPayType != 1 ) )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     fRmz = GetRmz( fRate, nNumPeriods, fVal, 0.0, nPayType );
 
@@ -195,35 +194,35 @@ double SAL_CALL AnalysisAddIn::getCumipmt( double fRate, sal_Int32 nNumPeriods,
 }
 
 
-double SAL_CALL AnalysisAddIn::getPrice( constREFXPS& xOpt,
+double SAL_CALL AnalysisAddIn::getPrice( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield, double fRedemp, sal_Int32 nFreq,
-    const ANY& rOB ) THROWDEF_RTE_IAE
+    const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fYield < 0.0 || fRate < 0.0 || fRedemp <= 0.0 || CHK_Freq || nSettle >= nMat )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = getPrice_( GetNullDate( xOpt ), nSettle, nMat, fRate, fYield, fRedemp, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getPricedisc( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getPricedisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fDisc <= 0.0 || fRedemp <= 0.0 || nSettle >= nMat )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = fRedemp * ( 1.0 - fDisc * GetYearDiff( GetNullDate( xOpt ), nSettle, nMat, getDateMode( xOpt, rOB ) ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getPricemat( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fYield, const ANY& rOB )
-    THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getPricemat( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fYield, const css::uno::Any& rOB )
+    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fRate < 0.0 || fYield < 0.0 || nSettle >= nMat )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     sal_Int32   nNullDate = GetNullDate( xOpt );
     sal_Int32   nBase = getDateMode( xOpt, rOB );
@@ -241,12 +240,12 @@ double SAL_CALL AnalysisAddIn::getPricemat( constREFXPS& xOpt,
 }
 
 
-double SAL_CALL AnalysisAddIn::getMduration( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const ANY& rOB )
-    THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getMduration( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const css::uno::Any& rOB )
+    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fCoup < 0.0 || fYield < 0.0 || CHK_Freq )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double      fRet = GetDuration( GetNullDate( xOpt ),  nSettle, nMat, fCoup, fYield, nFreq, getDateMode( xOpt, rOB ) );
     fRet /= 1.0 + ( fYield / double( nFreq ) );
@@ -254,10 +253,10 @@ double SAL_CALL AnalysisAddIn::getMduration( constREFXPS& xOpt,
 }
 
 
-double SAL_CALL AnalysisAddIn::getNominal( double fRate, sal_Int32 nPeriods ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getNominal( double fRate, sal_Int32 nPeriods ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fRate <= 0.0 || nPeriods < 0 )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double  fPeriods = nPeriods;
     double fRet = ( pow( fRate + 1.0, 1.0 / fPeriods ) - 1.0 ) * fPeriods;
@@ -265,10 +264,10 @@ double SAL_CALL AnalysisAddIn::getNominal( double fRate, sal_Int32 nPeriods ) TH
 }
 
 
-double SAL_CALL AnalysisAddIn::getDollarfr( double fDollarDec, sal_Int32 nFrac ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getDollarfr( double fDollarDec, sal_Int32 nFrac ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( nFrac <= 0 )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double  fInt;
     double  fFrac = nFrac;
@@ -285,10 +284,10 @@ double SAL_CALL AnalysisAddIn::getDollarfr( double fDollarDec, sal_Int32 nFrac )
 }
 
 
-double SAL_CALL AnalysisAddIn::getDollarde( double fDollarFrac, sal_Int32 nFrac ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getDollarde( double fDollarFrac, sal_Int32 nFrac ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( nFrac <= 0 )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double  fInt;
     double  fFrac = nFrac;
@@ -305,23 +304,23 @@ double SAL_CALL AnalysisAddIn::getDollarde( double fDollarFrac, sal_Int32 nFrac
 }
 
 
-double SAL_CALL AnalysisAddIn::getYield( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOB )
-    THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getYield( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB )
+    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fCoup < 0.0 || fPrice <= 0.0 || fRedemp <= 0.0 || CHK_Freq || nSettle >= nMat )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = getYield_( GetNullDate( xOpt ), nSettle, nMat, fCoup, fPrice, fRedemp, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getYielddisc( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getYielddisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fPrice <= 0.0 || fRedemp <= 0.0 || nSettle >= nMat )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     sal_Int32   nNullDate = GetNullDate( xOpt );
 
@@ -332,38 +331,38 @@ double SAL_CALL AnalysisAddIn::getYielddisc( constREFXPS& xOpt,
 }
 
 
-double SAL_CALL AnalysisAddIn::getYieldmat( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fPrice, const ANY& rOB )
-    THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getYieldmat( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fPrice, const css::uno::Any& rOB )
+    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fPrice <= 0.0 || fRate <= 0.0 || nSettle >= nMat )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = GetYieldmat( GetNullDate( xOpt ),  nSettle, nMat, nIssue, fRate, fPrice, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getTbilleq( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getTbilleq( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     nMat++;
 
     sal_Int32   nDiff = GetDiffDate360( xOpt, nSettle, nMat, sal_True );
 
     if( fDisc <= 0.0 || nSettle >= nMat || nDiff > 360 )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = ( 365 * fDisc ) / ( 360 - ( fDisc * double( nDiff ) ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getTbillprice( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getTbillprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fDisc <= 0.0 || nSettle > nMat )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     nMat++;
 
@@ -371,21 +370,21 @@ double SAL_CALL AnalysisAddIn::getTbillprice( constREFXPS& xOpt,
 
     double  fDummy;
     if( modf( fFraction, &fDummy ) == 0.0 )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = 100.0 * ( 1.0 - fDisc * fFraction );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getTbillyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice )
-    THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getTbillyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice )
+    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     sal_Int32   nDiff = GetDiffDate360( xOpt, nSettle, nMat, sal_True );
     nDiff++;
 
     if( fPrice <= 0.0 || nSettle >= nMat || nDiff > 360 )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double      fRet = 100.0;
     fRet /= fPrice;
@@ -397,24 +396,24 @@ double SAL_CALL AnalysisAddIn::getTbillyield( constREFXPS& xOpt, sal_Int32 nSett
 }
 
 
-double SAL_CALL AnalysisAddIn::getOddfprice( constREFXPS& xOpt,
+double SAL_CALL AnalysisAddIn::getOddfprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup,
-    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fRate < 0.0 || fYield < 0.0 || CHK_Freq || nMat <= nFirstCoup || nFirstCoup <= nSettle || nSettle <= nIssue )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = GetOddfprice( GetNullDate( xOpt ), nSettle, nMat, nIssue, nFirstCoup, fRate, fYield, fRedemp, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getOddfyield( constREFXPS& xOpt,
+double SAL_CALL AnalysisAddIn::getOddfyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup,
-    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fRate < 0.0 || fPrice <= 0.0 || CHK_Freq || nMat <= nFirstCoup || nFirstCoup <= nSettle || nSettle <= nIssue )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = GetOddfyield( GetNullDate( xOpt ), nSettle, nMat, nIssue, nFirstCoup, fRate, fPrice, fRedemp, nFreq,
                         getDateMode( xOpt, rOB ) );
@@ -422,12 +421,12 @@ double SAL_CALL AnalysisAddIn::getOddfyield( constREFXPS& xOpt,
 }
 
 
-double SAL_CALL AnalysisAddIn::getOddlprice( constREFXPS& xOpt,
+double SAL_CALL AnalysisAddIn::getOddlprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
-    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fRate < 0.0 || fYield < 0.0 || CHK_Freq || nMat <= nSettle || nSettle <= nLastInterest )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = GetOddlprice( GetNullDate( xOpt ), nSettle, nMat, nLastInterest, fRate, fYield, fRedemp, nFreq,
                         getDateMode( xOpt, rOB ) );
@@ -435,12 +434,12 @@ double SAL_CALL AnalysisAddIn::getOddlprice( constREFXPS& xOpt,
 }
 
 
-double SAL_CALL AnalysisAddIn::getOddlyield( constREFXPS& xOpt,
+double SAL_CALL AnalysisAddIn::getOddlyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
-    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fRate < 0.0 || fPrice <= 0.0 || CHK_Freq || nMat <= nSettle || nSettle <= nLastInterest )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = GetOddlyield( GetNullDate( xOpt ), nSettle, nMat, nLastInterest, fRate, fPrice, fRedemp, nFreq,
                         getDateMode( xOpt, rOB ) );
@@ -513,19 +512,19 @@ static double lcl_sca_XirrResult_Deriv1( const ScaDoubleList& rValues, const Sca
 // XIRR calculation
 
 double SAL_CALL AnalysisAddIn::getXirr(
-    constREFXPS& xOpt, const SEQSEQ( double )& rValues, const SEQSEQ( sal_Int32 )& rDates, const ANY& rGuessRate ) THROWDEF_RTE_IAE
+    const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates, const css::uno::Any& rGuessRate ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     ScaDoubleList aValues, aDates;
     aValues.Append( rValues );
     aDates.Append( rDates );
 
     if( (aValues.Count() < 2) || (aValues.Count() != aDates.Count()) )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     // result interest rate, initialized with passed guessed rate, or 10%
     double fResultRate = aAnyConv.getDouble( xOpt, rGuessRate, 0.1 );
     if( fResultRate <= -1 )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     // maximum epsilon for end of iteration
     static const double fMaxEps = 1e-10;
@@ -547,7 +546,7 @@ double SAL_CALL AnalysisAddIn::getXirr(
     while( bContLoop && (++nIter < nMaxIter) );
 
     if( bContLoop )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
     RETURN_FINITE( fResultRate );
 }
 
@@ -555,7 +554,7 @@ double SAL_CALL AnalysisAddIn::getXirr(
 // ============================================================================
 
 double SAL_CALL AnalysisAddIn::getXnpv(
-    double fRate, const SEQSEQ( double )& rValues, const SEQSEQ( sal_Int32 )& rDates ) THROWDEF_RTE_IAE
+    double fRate, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     ScaDoubleList aValList;
     ScaDoubleList aDateList;
@@ -566,7 +565,7 @@ double SAL_CALL AnalysisAddIn::getXnpv(
     sal_Int32           nNum = aValList.Count();
 
     if( nNum != sal_Int32( aDateList.Count() ) || nNum < 2 )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double              fRet = 0.0;
     double              fNull = *aDateList.Get( 0 );
@@ -579,66 +578,66 @@ double SAL_CALL AnalysisAddIn::getXnpv(
 }
 
 
-double SAL_CALL AnalysisAddIn::getIntrate( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fRedemp, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getIntrate( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fRedemp, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     if( fInvest <= 0.0 || fRedemp <= 0.0 || nSettle >= nMat )
-        THROW_IAE;
+        throw css::lang::IllegalArgumentException();
 
     double fRet = ( ( fRedemp / fInvest ) - 1.0 ) / GetYearDiff( GetNullDate( xOpt ), nSettle, nMat, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getCoupncd( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getCoupncd( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     double fRet = GetCoupncd( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getCoupdays( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getCoupdays( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     double fRet = GetCoupdays( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getCoupdaysnc( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getCoupdaysnc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     double fRet = GetCoupdaysnc( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getCoupdaybs( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getCoupdaybs( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     double fRet = GetCoupdaybs( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getCouppcd( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getCouppcd( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     double fRet = GetCouppcd( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getCoupnum( constREFXPS& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getCoupnum( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     double fRet = GetCoupnum( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getFvschedule( double fPrinc, const SEQSEQ( double )& rSchedule ) THROWDEF_RTE_IAE
+double SAL_CALL AnalysisAddIn::getFvschedule( double fPrinc, const css::uno::Sequence< css::uno::Sequence< double > >& rSchedule ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
 {
     ScaDoubleList aSchedList;
 
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 48f37d7934b3..d4da90135819 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -546,11 +546,11 @@ bool getinput_putcall(bs::types::PutCall& pc, const OUString& str) {
     return true;
 }
 
-bool getinput_putcall(bs::types::PutCall& pc, const ANY& anyval) {
+bool getinput_putcall(bs::types::PutCall& pc, const uno::Any& anyval) {
     OUString str;
-    if(anyval.getValueTypeClass() == ::com::sun::star::uno::TypeClass_STRING) {
+    if(anyval.getValueTypeClass() == uno::TypeClass_STRING) {
         anyval >>= str;
-    } else if(anyval.getValueTypeClass() == ::com::sun::star::uno::TypeClass_VOID) {
+    } else if(anyval.getValueTypeClass() == uno::TypeClass_VOID) {
         str="c";        // call as default
     } else {
         return false;
@@ -558,10 +558,10 @@ bool getinput_putcall(bs::types::PutCall& pc, const ANY& anyval) {
     return getinput_putcall(pc, str);
 }
 
-bool getinput_strike(double& strike, const ANY& anyval) {
-    if(anyval.getValueTypeClass() == ::com::sun::star::uno::TypeClass_DOUBLE) {
+bool getinput_strike(double& strike, const uno::Any& anyval) {
+    if(anyval.getValueTypeClass() == uno::TypeClass_DOUBLE) {
         anyval >>= strike;
-    } else if(anyval.getValueTypeClass() == ::com::sun::star::uno::TypeClass_VOID) {
+    } else if(anyval.getValueTypeClass() == uno::TypeClass_VOID) {
         strike=-1.0;        // -1 as default (means not set)
     } else {
         return false;
@@ -602,11 +602,11 @@ bool getinput_fordom(bs::types::ForDom& fd, const OUString& str) {
     return true;
 }
 
-bool getinput_greek(bs::types::Greeks& greek, const ANY& anyval) {
+bool getinput_greek(bs::types::Greeks& greek, const uno::Any& anyval) {
     OUString str;
-    if(anyval.getValueTypeClass() == ::com::sun::star::uno::TypeClass_STRING) {
+    if(anyval.getValueTypeClass() == uno::TypeClass_STRING) {
         anyval >>= str;
-    } else if(anyval.getValueTypeClass() == ::com::sun::star::uno::TypeClass_VOID) {
+    } else if(anyval.getValueTypeClass() == uno::TypeClass_VOID) {
         str="value";
     } else {
         return false;
@@ -645,7 +645,7 @@ double SAL_CALL ScaPricingAddIn::getOptBarrier( double spot, double vol,
             double r, double rf, double T, double strike,
             double barrier_low, double barrier_up, double rebate,
             const OUString& put_call, const OUString& in_out,
-            const OUString& barriercont, const ANY& greekstr ) THROWDEF_RTE_IAE
+            const OUString& barriercont, const uno::Any& greekstr ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     bs::types::PutCall pc;
     bs::types::BarrierKIO kio;
@@ -657,7 +657,7 @@ double SAL_CALL ScaPricingAddIn::getOptBarrier( double spot, double vol,
                 !getinput_inout(kio,in_out) ||
                 !getinput_barrier(bcont,barriercont) ||
                 !getinput_greek(greek,greekstr) ){
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
     }
 
     double fRet=bs::barrier(spot,vol,r,rf,T,strike, barrier_low,barrier_up,
@@ -671,7 +671,7 @@ double SAL_CALL ScaPricingAddIn::getOptTouch( double spot, double vol,
             double r, double rf, double T,
             double barrier_low, double barrier_up,
             const OUString& for_dom, const OUString& in_out,
-            const OUString& barriercont, const ANY& greekstr ) THROWDEF_RTE_IAE
+            const OUString& barriercont, const uno::Any& greekstr ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     bs::types::ForDom fd;
     bs::types::BarrierKIO kio;
@@ -683,7 +683,7 @@ double SAL_CALL ScaPricingAddIn::getOptTouch( double spot, double vol,
                 !getinput_inout(kio,in_out) ||
                 !getinput_barrier(bcont,barriercont) ||
                 !getinput_greek(greek,greekstr) ){
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
     }
 
     double fRet=bs::touch(spot,vol,r,rf,T,barrier_low,barrier_up,
@@ -695,11 +695,11 @@ double SAL_CALL ScaPricingAddIn::getOptTouch( double spot, double vol,
 // OPT_PRB_HIT(...)
 double SAL_CALL ScaPricingAddIn::getOptProbHit( double spot, double vol,
             double mu, double T,
-            double barrier_low, double barrier_up ) THROWDEF_RTE_IAE
+            double barrier_low, double barrier_up ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     // read and check input values
     if( spot<=0.0 || vol<=0.0 || T<0.0 ) {
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
     }
 
     double fRet=bs::prob_hit(spot,vol,mu,T,barrier_low,barrier_up);
@@ -711,7 +711,7 @@ double SAL_CALL ScaPricingAddIn::getOptProbHit( double spot, double vol,
 double SAL_CALL ScaPricingAddIn::getOptProbInMoney( double spot, double vol,
             double mu, double T,
             double barrier_low, double barrier_up,
-            const ANY& strikeval, const ANY& put_call ) THROWDEF_RTE_IAE
+            const uno::Any& strikeval, const uno::Any& put_call ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     bs::types::PutCall pc=bs::types::Call;
     double  K;
@@ -720,7 +720,7 @@ double SAL_CALL ScaPricingAddIn::getOptProbInMoney( double spot, double vol,
     if( spot<=0.0 || vol<=0.0 || T<0.0 ||
             !getinput_putcall(pc,put_call) ||
             !getinput_strike(K,strikeval) ) {
-        THROW_IAE;
+        throw lang::IllegalArgumentException();
     }
 
     double fRet=bs::prob_in_money(spot,vol,mu,T,K,barrier_low,barrier_up,pc);
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 67315cdcf439..5cb509cec08f 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -43,10 +43,7 @@
 #include <tools/rc.hxx>
 #include <tools/resary.hxx>
 
-#define ANY                 ::com::sun::star::uno::Any
-#define THROWDEF_RTE_IAE    throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IllegalArgumentException)
-#define THROW_IAE           throw ::com::sun::star::lang::IllegalArgumentException()
-#define RETURN_FINITE(d)    if( ::rtl::math::isFinite( d ) ) return d; else THROW_IAE
+#define RETURN_FINITE(d)    if( ::rtl::math::isFinite( d ) ) return d; else throw css::lang::IllegalArgumentException()
 
 
 
@@ -325,64 +322,64 @@ inline ScaFuncData* ScaFuncDataList::Next()
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL PricingFunctionAddIn_CreateInstance(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
+css::uno::Reference< css::uno::XInterface > SAL_CALL PricingFunctionAddIn_CreateInstance(
+    const css::uno::Reference< css::lang::XMultiServiceFactory >& );
 
 
 // AddIn class for pricing functions
 
 class ScaPricingAddIn : public ::cppu::WeakImplHelper5<
-                                ::com::sun::star::sheet::XAddIn,
-                                ::com::sun::star::sheet::XCompatibilityNames,
-                                ::com::sun::star::sheet::addin::XPricingFunctions,
-                                ::com::sun::star::lang::XServiceName,
-                                ::com::sun::star::lang::XServiceInfo >
+                                css::sheet::XAddIn,
+                                css::sheet::XCompatibilityNames,
+                                css::sheet::addin::XPricingFunctions,
+                                css::lang::XServiceName,
+                                css::lang::XServiceInfo >
 {
 private:
-    ::com::sun::star::lang::Locale  aFuncLoc;
-    ::com::sun::star::lang::Locale* pDefLocales;
+    css::lang::Locale  aFuncLoc;
+    css::lang::Locale* pDefLocales;
     ResMgr*                     pResMgr;
     sca::pricing::ScaFuncDataList*            pFuncDataList;
 
 
     void                        InitDefLocales();
-    const ::com::sun::star::lang::Locale& GetLocale( sal_uInt32 nIndex );
-    ResMgr&                     GetResMgr() throw( ::com::sun::star::uno::RuntimeException );
+    const css::lang::Locale& GetLocale( sal_uInt32 nIndex );
+    ResMgr&                     GetResMgr() throw( css::uno::RuntimeException );
     void                        InitData();
 
-    ::rtl::OUString             GetDisplFuncStr( sal_uInt16 nResId ) throw( ::com::sun::star::uno::RuntimeException );
-    ::rtl::OUString             GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( ::com::sun::star::uno::RuntimeException );
+    ::rtl::OUString             GetDisplFuncStr( sal_uInt16 nResId ) throw( css::uno::RuntimeException );
+    ::rtl::OUString             GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException );
 
 public:
                                 ScaPricingAddIn();
     virtual                     ~ScaPricingAddIn();
 
     static ::rtl::OUString      getImplementationName_Static();
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static();
+    static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static();
 
                                 // XAddIn
-    virtual ::rtl::OUString SAL_CALL getProgrammaticFuntionName( const ::rtl::OUString& aDisplayName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getDisplayFunctionName( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getFunctionDescription( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getDisplayArgumentName( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getArgumentDescription( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getProgrammaticCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getDisplayCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getProgrammaticFuntionName( const ::rtl::OUString& aDisplayName ) throw( css::uno::RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getDisplayFunctionName( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getFunctionDescription( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getDisplayArgumentName( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getArgumentDescription( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getProgrammaticCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getDisplayCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException );
 
                                 // XCompatibilityNames
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException );
 
                                 // XLocalizable
-    virtual void SAL_CALL       setLocale( const ::com::sun::star::lang::Locale& eLocale ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       setLocale( const css::lang::Locale& eLocale ) throw( css::uno::RuntimeException );
+    virtual css::lang::Locale SAL_CALL getLocale() throw( css::uno::RuntimeException );
 
                                 // XServiceName
-    virtual ::rtl::OUString SAL_CALL getServiceName() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getServiceName() throw( css::uno::RuntimeException );
 
                                 // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL   supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL   supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException );
 
     // ----------------------------------------
     //  methods from own interfaces start here
@@ -392,22 +389,22 @@ public:
             double r, double rf, double T, double strike,
             double barrier_low, double barrier_up, double rebate,
             const OUString& put_call, const OUString& in_out,
-            const OUString& continuous, const ANY& greek ) THROWDEF_RTE_IAE;
+            const OUString& continuous, const css::uno::Any& greek ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
    virtual double SAL_CALL getOptTouch( double spot, double vol,
             double r, double rf, double T,
             double barrier_low, double barrier_up,
             const OUString& for_dom, const OUString& in_out,
-            const OUString& barriercont, const ANY& greekstr ) THROWDEF_RTE_IAE;
+            const OUString& barriercont, const css::uno::Any& greekstr ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
    virtual double SAL_CALL getOptProbHit( double spot, double vol,
             double mu, double T,
-            double barrier_low, double barrier_up ) THROWDEF_RTE_IAE;
+            double barrier_low, double barrier_up ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
    virtual double SAL_CALL getOptProbInMoney( double spot, double vol,
             double mu, double T,
             double barrier_low, double barrier_up,
-            const ANY& strikeval, const ANY& put_call ) THROWDEF_RTE_IAE;
+            const css::uno::Any& strikeval, const css::uno::Any& put_call ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
 };
 //------------------------------------------------------------------