merge origin/master

12 files changed, 94 insertions, 138 deletions

diff --git a/scaddins/AllLangResTarget_analysis.mk b/scaddins/AllLangResTarget_analysis.mk
index 3cc38af64526..4fe094d512d9 100644
--- a/scaddins/AllLangResTarget_analysis.mk
+++ b/scaddins/AllLangResTarget_analysis.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,scaddins/analysis))
 
 $(eval $(call gb_SrsTarget_set_include,scaddins/analysis,\
     $$(INCLUDE) \
-    -I$(realpath $(SRCDIR)/scaddins/source/analysis) \
+    -I$(SRCDIR)/scaddins/source/analysis \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,scaddins/analysis,\
diff --git a/scaddins/AllLangResTarget_date.mk b/scaddins/AllLangResTarget_date.mk
index 0c130b665a03..6742f91d8460 100644
--- a/scaddins/AllLangResTarget_date.mk
+++ b/scaddins/AllLangResTarget_date.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,scaddins/date))
 
 $(eval $(call gb_SrsTarget_set_include,scaddins/date,\
     $$(INCLUDE) \
-    -I$(realpath $(SRCDIR)/scaddins/source/datefunc) \
+    -I$(SRCDIR)/scaddins/source/datefunc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,scaddins/date,\
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index 42038e74b74b..3401adbb9332 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_componentfile,analysis,scaddins/source/analysis/ana
 
 $(eval $(call gb_Library_set_include,analysis,\
     $$(INCLUDE) \
-    -I$(realpath $(SRCDIR)/scaddins/source/analysis) \
+	-I$(WORKDIR)/UnoApiHeaders/offapi \
 ))
 
 $(eval $(call gb_Library_add_internal_comprehensive_api,analysis,\
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index ca3fad8978bf..72577fed3ed5 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_componentfile,date,scaddins/source/datefunc/date))
 
 $(eval $(call gb_Library_set_include,date,\
     $$(INCLUDE) \
-    -I$(realpath $(SRCDIR)/scaddins/source/datefunc) \
+	-I$(WORKDIR)/UnoApiHeaders/offapi \
 ))
 
 $(eval $(call gb_Library_add_internal_comprehensive_api,date,\
diff --git a/scaddins/Makefile b/scaddins/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/scaddins/Makefile
+++ b/scaddins/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/scaddins/README b/scaddins/README
new file mode 100644
index 000000000000..3ad6de64e5c1
--- /dev/null
+++ b/scaddins/README
@@ -0,0 +1,8 @@
+Extra functions for calc.
+
+These provide UNO components that implement more exotic calc
+functions. If you want to do the same, here can be a good place to
+start.
+
+See also:
+[http://wiki.services.openoffice.org/wiki/Scaddins]
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 357706e470c7..e62265f0a252 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -467,7 +467,7 @@ static const sal_uInt32     nNumOfLoc = SAL_N_ELEMENTS(pLang);
 
 void AnalysisAddIn::InitDefLocales( void )
 {
-    pDefLocales = new CSS::lang::Locale[ nNumOfLoc ];
+    pDefLocales = new ::com::sun::star::lang::Locale[ nNumOfLoc ];
 
     for( sal_uInt32 n = 0 ; n < nNumOfLoc ; n++ )
     {
@@ -477,7 +477,7 @@ void AnalysisAddIn::InitDefLocales( void )
 }
 
 
-inline const CSS::lang::Locale& AnalysisAddIn::GetLocale( sal_uInt32 nInd )
+inline const ::com::sun::star::lang::Locale& AnalysisAddIn::GetLocale( sal_uInt32 nInd )
 {
     if( !pDefLocales )
         InitDefLocales();
@@ -501,11 +501,11 @@ SEQofLocName SAL_CALL AnalysisAddIn::getCompatibilityNames( const STRING& aProgr
 
     SEQofLocName                aRet( nCount );
 
-    CSS::sheet::LocalizedName*  pArray = aRet.getArray();
+    ::com::sun::star::sheet::LocalizedName*  pArray = aRet.getArray();
 
     for( sal_uInt32 n = 0 ; n < nCount ; n++ )
     {
-        pArray[ n ] = CSS::sheet::LocalizedName( GetLocale( n ), *r.Get( n ) );
+        pArray[ n ] = ::com::sun::star::sheet::LocalizedName( GetLocale( n ), *r.Get( n ) );
     }
 
     return aRet;
@@ -1184,7 +1184,7 @@ STRING SAL_CALL AnalysisAddIn::getImsub( const STRING& aNum1, const STRING& aNum
 }
 
 
-STRING SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const SEQSEQ( STRING )& aNum1, const SEQ( CSS::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE
+STRING SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const SEQSEQ( STRING )& aNum1, const SEQ( ::com::sun::star::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE
 {
     ComplexList     z_list;
 
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index cc6e115fda78..3e0fd4a99e73 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -51,19 +51,19 @@ class ConvertDataList;
 class ResMgr;
 
 
-REF( CSS::uno::XInterface ) SAL_CALL AnalysisAddIn_CreateInstance( const REF( CSS::lang::XMultiServiceFactory )& );
+REF( ::com::sun::star::uno::XInterface ) SAL_CALL AnalysisAddIn_CreateInstance( const REF( ::com::sun::star::lang::XMultiServiceFactory )& );
 
 
 class AnalysisAddIn : public cppu::WeakImplHelper5<
-                            CSS::sheet::XAddIn,
-                            CSS::sheet::XCompatibilityNames,
-                            CSS::sheet::addin::XAnalysis,
-                            CSS::lang::XServiceName,
-                            CSS::lang::XServiceInfo >
+                            ::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 >
 {
 private:
-    CSS::lang::Locale           aFuncLoc;
-    CSS::lang::Locale*          pDefLocales;
+    ::com::sun::star::lang::Locale           aFuncLoc;
+    ::com::sun::star::lang::Locale*          pDefLocales;
     FuncDataList*               pFD;
     double*                     pFactDoubles;
     ConvertDataList*            pCDL;
@@ -75,18 +75,18 @@ private:
     STRING                      GetDisplFuncStr( sal_uInt16 nFuncNum ) THROWDEF_RTE;
     STRING                      GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) THROWDEF_RTE;
     void                        InitDefLocales( void );
-    inline const CSS::lang::Locale& GetLocale( sal_uInt32 nInd );
+    inline const ::com::sun::star::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 CSS::uno::Reference< CSS::beans::XPropertySet >& xPropSet,
-                                    const CSS::uno::Any& rAny )
-                                throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    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 );
 
 public:
                                 AnalysisAddIn(
-                                    const CSS::uno::Reference< CSS::lang::XMultiServiceFactory >& xServiceFact );
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFact );
     virtual                     ~AnalysisAddIn();
 
     double                      FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE;
@@ -107,8 +107,8 @@ public:
     virtual SEQofLocName SAL_CALL getCompatibilityNames( const STRING& aProgrammaticName ) THROWDEF_RTE;
 
                                 // XLocalizable
-    virtual void SAL_CALL       setLocale( const CSS::lang::Locale& eLocale ) THROWDEF_RTE;
-    virtual CSS::lang::Locale SAL_CALL getLocale(  ) THROWDEF_RTE;
+    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;
 
                                 // XServiceName
     virtual STRING SAL_CALL     getServiceName(  ) THROWDEF_RTE;
diff --git a/scaddins/source/analysis/analysisdefs.hxx b/scaddins/source/analysis/analysisdefs.hxx
index a438291b99dd..6e0f3a9d759f 100644
--- a/scaddins/source/analysis/analysisdefs.hxx
+++ b/scaddins/source/analysis/analysisdefs.hxx
@@ -29,24 +29,23 @@
 #ifndef ANALYSISDEFS_HXX
 #define ANALYSISDEFS_HXX
 
-#define CSS                 ::com::sun::star
-#define XPROPSET            CSS::beans::XPropertySet
-#define REF(c)              CSS::uno::Reference< c >
+#define XPROPSET            ::com::sun::star::beans::XPropertySet
+#define REF(c)              ::com::sun::star::uno::Reference< c >
 #define constREFXPS         const REF(XPROPSET)
-#define SEQ(c)              CSS::uno::Sequence< c >
-#define SEQSEQ(c)           CSS::uno::Sequence< CSS::uno::Sequence< c > >
-#define SEQofLocName        SEQ( CSS::sheet::LocalizedName )
-#define ANY                 CSS::uno::Any
+#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 STRING              ::rtl::OUString
 #define STRFROMASCII(s)     STRING::createFromAscii( s )
 #define STRFROMANSI(s)      STRING( s, strlen( s ), RTL_TEXTENCODING_MS_1252 )
-#define THROWDEF_RTE        throw(CSS::uno::RuntimeException)
-#define THROW_RTE           throw CSS::uno::RuntimeException()
-#define THROWDEF_RTE_IAE    throw(CSS::uno::RuntimeException,CSS::lang::IllegalArgumentException)
-#define THROW_IAE           throw CSS::lang::IllegalArgumentException()
-#define THROWDEF_RTE_IAE_NCE    throw(CSS::uno::RuntimeException,CSS::lang::IllegalArgumentException,CSS::sheet::NoConvergenceException)
-#define THROW_NCE           throw CSS::sheet::NoConvergenceException()
+#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 THROW_NCE           throw ::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
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index d9da5ba24c9e..82b5db3d8471 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -61,7 +61,7 @@ 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( CSS::beans::XPropertySet )& xOptions ) THROWDEF_RTE;
+sal_Int32           GetNullDate( const REF( ::com::sun::star::beans::XPropertySet )& xOptions ) THROWDEF_RTE;
 sal_Int32           GetDiffDate360(
                         sal_uInt16 nDay1, sal_uInt16 nMonth1, sal_uInt16 nYear1, sal_Bool bLeapYear1,
                         sal_uInt16 nDay2, sal_uInt16 nMonth2, sal_uInt16 nYear2,
@@ -320,15 +320,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( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::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 CSS::uno::Any& rHolAny,
+                                    const ::com::sun::star::uno::Any& rHolAny,
                                     sal_Int32 nNullDate,
-                                    sal_Bool bInsertOnWeekend ) throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    sal_Bool bInsertOnWeekend ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 
 public:
                                 SortedIndividualInt32List();
@@ -347,10 +347,10 @@ public:
                                     @param bInsertOnWeekend  insertion mode: sal_False = holidays on weekend are omitted */
     void                        InsertHolidayList(
                                     ScaAnyConverter& rAnyConv,
-                                    const CSS::uno::Reference< CSS::beans::XPropertySet >& xOptions,
-                                    const CSS::uno::Any& rHolAny,
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xOptions,
+                                    const ::com::sun::star::uno::Any& rHolAny,
                                     sal_Int32 nNullDate,
-                                    sal_Bool bInsertOnWeekend ) throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    sal_Bool bInsertOnWeekend ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 };
 
 
@@ -362,29 +362,29 @@ protected:
     inline void                 ListAppend( double fValue ) { MyList::Append( new double( fValue ) ); }
 
     using MyList::Append;
-    inline void                 Append( double fValue ) throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException )
+    inline void                 Append( double fValue ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::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 CSS::uno::Any& rAny,
-                                    sal_Bool bIgnoreEmpty ) throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    const ::com::sun::star::uno::Any& rAny,
+                                    sal_Bool bIgnoreEmpty ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::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 CSS::uno::Sequence< CSS::uno::Any >& rAnySeq,
-                                    sal_Bool bIgnoreEmpty ) throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    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 );
 
                                 /** @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 CSS::uno::Sequence< CSS::uno::Sequence< CSS::uno::Any > >& rAnySeq,
-                                    sal_Bool bIgnoreEmpty ) throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    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 );
 
 public:
     virtual                     ~ScaDoubleList();
@@ -396,21 +396,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 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 );
+    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 );
 
                                 /** @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 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 );
+                                    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 );
 
     virtual sal_Bool            CheckInsert( double fValue ) const
-                                    throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 };
 
 
@@ -421,7 +421,7 @@ class ScaDoubleListGT0 : public ScaDoubleList
 {
 public:
     virtual sal_Bool            CheckInsert( double fValue ) const
-                                    throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 };
 
 
@@ -432,7 +432,7 @@ class ScaDoubleListGE0 : public ScaDoubleList
 {
 public:
     virtual sal_Bool            CheckInsert( double fValue ) const
-                                    throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 };
 
 
@@ -945,7 +945,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( CSS::lang::IllegalArgumentException );
+    void                        doAddYears( sal_Int32 nYearCount ) throw( ::com::sun::star::lang::IllegalArgumentException );
 
 public:
                                 ScaDate();
@@ -967,17 +967,17 @@ public:
     inline sal_uInt16           getYear() const     { return nYear; };
 
                                 /// adds/subtracts the given count of months, adjusts day
-    void                        addMonths( sal_Int32 nMonthCount ) throw( CSS::lang::IllegalArgumentException );
+    void                        addMonths( sal_Int32 nMonthCount ) throw( ::com::sun::star::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( CSS::lang::IllegalArgumentException );
+    inline void                 addYears( sal_Int32 nYearCount ) throw( ::com::sun::star::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( CSS::lang::IllegalArgumentException );
+    static sal_Int32            getDiff( const ScaDate& rFrom, const ScaDate& rTo ) throw( ::com::sun::star::lang::IllegalArgumentException );
 
     sal_Bool                    operator<( const ScaDate& rCmp ) const;
     inline sal_Bool             operator<=( const ScaDate& rCmp ) const { return !(rCmp < *this); }
@@ -1001,7 +1001,7 @@ inline void ScaDate::setYear( sal_uInt16 nNewYear )
     setDay();
 }
 
-inline void ScaDate::addYears( sal_Int32 nYearCount ) throw( CSS::lang::IllegalArgumentException )
+inline void ScaDate::addYears( sal_Int32 nYearCount ) throw( ::com::sun::star::lang::IllegalArgumentException )
 {
     doAddYears( nYearCount );
     setDay();
@@ -1014,7 +1014,7 @@ inline void ScaDate::addYears( sal_Int32 nYearCount ) throw( CSS::lang::IllegalA
 class ScaAnyConverter
 {
 private:
-    CSS::uno::Reference< CSS::util::XNumberFormatter > xFormatter;
+    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > xFormatter;
     sal_Int32                   nDefaultFormat;
     sal_Bool                    bHasValidFormat;
 
@@ -1025,17 +1025,17 @@ private:
                                     @return  the converted double value. */
     double                      convertToDouble(
                                     const ::rtl::OUString& rString ) const
-                                throw( CSS::lang::IllegalArgumentException );
+                                throw( ::com::sun::star::lang::IllegalArgumentException );
 
 public:
                                 ScaAnyConverter(
-                                    const CSS::uno::Reference< CSS::lang::XMultiServiceFactory >& xServiceFact );
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFact );
                                 ~ScaAnyConverter();
 
                                 /// Initializing with current language settings
     void                        init(
-                                    const CSS::uno::Reference< CSS::beans::XPropertySet >& xPropSet )
-                                throw( CSS::uno::RuntimeException );
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropSet )
+                                throw( ::com::sun::star::uno::RuntimeException );
 
                                 /** Converts an Any to double (without initialization).
                                     The Any can be empty or contain a double or string.
@@ -1045,8 +1045,8 @@ public:
                                              sal_False if the Any is empty or the string is empty */
     sal_Bool                    getDouble(
                                     double& rfResult,
-                                    const CSS::uno::Any& rAny ) const
-                                throw( CSS::lang::IllegalArgumentException );
+                                    const ::com::sun::star::uno::Any& rAny ) const
+                                throw( ::com::sun::star::lang::IllegalArgumentException );
 
                                 /** Converts an Any to double (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -1056,9 +1056,9 @@ public:
                                              sal_False if the Any is empty or the string is empty */
     sal_Bool                    getDouble(
                                     double& rfResult,
-                                    const CSS::uno::Reference< CSS::beans::XPropertySet >& xPropSet,
-                                    const CSS::uno::Any& rAny )
-                                throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    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 );
 
                                 /** Converts an Any to double (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -1066,10 +1066,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 CSS::uno::Reference< CSS::beans::XPropertySet >& xPropSet,
-                                    const CSS::uno::Any& rAny,
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropSet,
+                                    const ::com::sun::star::uno::Any& rAny,
                                     double fDefault )
-                                throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 
                                 /** Converts an Any to sal_Int32 (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -1079,9 +1079,9 @@ public:
                                              sal_False if the Any is empty or the string is empty */
     sal_Bool                    getInt32(
                                     sal_Int32& rnResult,
-                                    const CSS::uno::Reference< CSS::beans::XPropertySet >& xPropSet,
-                                    const CSS::uno::Any& rAny )
-                                throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                    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 );
 
                                 /** Converts an Any to sal_Int32 (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -1089,10 +1089,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 CSS::uno::Reference< CSS::beans::XPropertySet >& xPropSet,
-                                    const CSS::uno::Any& rAny,
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropSet,
+                                    const ::com::sun::star::uno::Any& rAny,
                                     sal_Int32 nDefault )
-                                throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
+                                throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 };
 
 
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 4ae9543a3fc4..6ba6d4409a8f 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -83,23 +83,6 @@ void ScaList::_Grow()
     pData = pNewData;
 }
 
-void ScaList::Insert( void* pNew, sal_uInt32 nIndex )
-{
-    if( nIndex >= nCount )
-        Append( pNew );
-    else
-    {
-        Grow();
-
-        void** pIns = pData + nIndex;
-        memmove( pIns + 1, pIns, (nCount - nIndex) * sizeof( void* ) );
-
-        *pIns = pNew;
-        nCount++;
-    }
-}
-
-
 //------------------------------------------------------------------
 
 ScaStringList::~ScaStringList()
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index fae798310673..61ba8da5e416 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -76,7 +76,6 @@ public:
     inline void*                Next()  { return (nCurr + 1 < nCount) ? pData[ ++nCurr ] : NULL; }
 
     inline void                 Append( void* pNew );
-    void                        Insert( void* pNew, sal_uInt32 nIndex );
 };