loplugin:staticmethods

Change-Id: Id3d6b50e07ea0850af18ab9bdadfffe0e4602aab

59 files changed, 112 insertions, 113 deletions

diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index e5b3e3401ba2..70a8c287dfcb 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -251,7 +251,7 @@ public:
     friend class FilterAllListenerImpl;
 
 private:
-    Reference<XEventListener> attachListenerForTarget(
+    static Reference<XEventListener> attachListenerForTarget(
         const Reference<XIntrospectionAccess>& xAccess,
         const Reference<XInvocationAdapterFactory2>& xInvocationAdapterFactory,
         const Reference<XAllListener>& xAllListener,
diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx
index abc727adb04e..0663303ffcfc 100644
--- a/i18npool/inc/calendar_hijri.hxx
+++ b/i18npool/inc/calendar_hijri.hxx
@@ -64,11 +64,11 @@ protected:
     static const sal_Int32 LeapYear[];
 
 private:
-    double NewMoon(sal_Int32 n);
-    void getHijri(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year);
-    void ToGregorian(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year);
-    void getGregorianDay(sal_Int32 jd, sal_Int32 *pnDay, sal_Int32 *pnMonth, sal_Int32 *pnYear);
-    double getJulianDay(sal_Int32 day, sal_Int32 month, sal_Int32 year);
+    static double NewMoon(sal_Int32 n);
+    static void getHijri(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year);
+    static void ToGregorian(sal_Int32 *day, sal_Int32 *month, sal_Int32 *year);
+    static void getGregorianDay(sal_Int32 jd, sal_Int32 *pnDay, sal_Int32 *pnMonth, sal_Int32 *pnYear);
+    static double getJulianDay(sal_Int32 day, sal_Int32 month, sal_Int32 year);
 };
 
 } } } }
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 1a559173569b..4c295e1b5bd8 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -136,7 +136,7 @@ private:
     sal_Unicode                 cDecimalSep;
 
     /// Get corresponding KParseTokens flag for a character
-    sal_Int32 getParseTokensType( const sal_Unicode* aStr, sal_Int32 nPos );
+    static sal_Int32 getParseTokensType( const sal_Unicode* aStr, sal_Int32 nPos );
 
     /// Access parser table flags.
     UPT_FLAG_TYPE getFlags( const sal_Unicode* aStr, sal_Int32 nPos );
@@ -171,7 +171,7 @@ private:
     bool setupInternational( const com::sun::star::lang::Locale& rLocale );
 
     /// Implementation of getCharacterType() for one single character
-    sal_Int32 SAL_CALL getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
+    static sal_Int32 SAL_CALL getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
 
 };
 
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 9114c0ee1a4b..510b8aa1bd3a 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -72,7 +72,7 @@ private :
 
     com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedInputSequenceChecker >& SAL_CALL getInputSequenceChecker(sal_Char* rLanguage)
         throw (com::sun::star::uno::RuntimeException);
-    sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
+    static sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
 };
 
 } } } }
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index 65bb0056fe7f..511a765607ef 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -62,9 +62,9 @@ private:
 
     void setupLocale( const ::com::sun::star::lang::Locale& rLocale );
     void getFormats( const ::com::sun::star::lang::Locale& rLocale );
-    OUString mapElementTypeShortToString(sal_Int16 formatType);
-    sal_Int16 mapElementTypeStringToShort(const OUString& formatType);
-    OUString mapElementUsageShortToString(sal_Int16 formatUsage);
+    static OUString mapElementTypeShortToString(sal_Int16 formatType);
+    static sal_Int16 mapElementTypeStringToShort(const OUString& formatType);
+    static OUString mapElementUsageShortToString(sal_Int16 formatUsage);
     sal_Int16 mapElementUsageStringToShort(const OUString& formatUsage);
     void createLocaleDataObject();
 };
diff --git a/include/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx
index 32677e095c75..97cacb5dbba6 100644
--- a/include/xmloff/SettingsExportHelper.hxx
+++ b/include/xmloff/SettingsExportHelper.hxx
@@ -60,7 +60,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper
                         const OUString& rName) const;
 
     void exportBool(const bool bValue, const OUString& rName) const;
-    void exportByte(const sal_Int8 nValue, const OUString& rName) const;
+    static void exportByte(const sal_Int8 nValue, const OUString& rName);
     void exportShort(const sal_Int16 nValue, const OUString& rName) const;
     void exportInt(const sal_Int32 nValue, const OUString& rName) const;
     void exportLong(const sal_Int64 nValue, const OUString& rName) const;
diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx
index 7aaf8a5af969..05c0a69792fb 100644
--- a/include/xmloff/formlayerexport.hxx
+++ b/include/xmloff/formlayerexport.hxx
@@ -142,7 +142,7 @@ namespace xmloff
 
         /** determines whether the given page contains logical forms
         */
-        bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage ) const;
+        static bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage );
 
         /** determines whether the given page contains XForm instances
         */
diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx
index 084f3f32707c..dcb35932488a 100644
--- a/include/xmloff/formlayerimport.hxx
+++ b/include/xmloff/formlayerimport.hxx
@@ -65,7 +65,7 @@ namespace xmloff
 
         /** creates an import context for the office:forms element
         */
-        SvXMLImportContext* createOfficeFormsContext(
+        static SvXMLImportContext* createOfficeFormsContext(
             SvXMLImport& _rImport,
             sal_uInt16 _nPrefix,
             const OUString& _rLocalName);
diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx
index e72be961c891..a99c66270299 100644
--- a/include/xmloff/nmspmap.hxx
+++ b/include/xmloff/nmspmap.hxx
@@ -136,7 +136,7 @@ public:
 
 /* deprecated */ bool AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix,
                      const OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN );
-/* deprecated */ sal_uInt16 GetIndexByKey( sal_uInt16 nKey ) const;
+/* deprecated */ static sal_uInt16 GetIndexByKey( sal_uInt16 nKey );
 /* deprecated */ sal_uInt16 GetIndexByPrefix( const OUString& rPrefix ) const;
 /* deprecated */ sal_uInt16 GetFirstIndex() const;
 /* deprecated */ sal_uInt16 GetNextIndex( sal_uInt16 nOldIdx ) const;
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 583f3557843e..8ce29d50ed2b 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -78,10 +78,10 @@ protected:
     bool translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames();
 
     //UUUU provider for often used sets
-    const OldFillStyleDefinitionSet& getStandardSet();
-    const OldFillStyleDefinitionSet& getHeaderSet();
-    const OldFillStyleDefinitionSet& getFooterSet();
-    const OldFillStyleDefinitionSet& getParaSet();
+    static const OldFillStyleDefinitionSet& getStandardSet();
+    static const OldFillStyleDefinitionSet& getHeaderSet();
+    static const OldFillStyleDefinitionSet& getFooterSet();
+    static const OldFillStyleDefinitionSet& getParaSet();
 
     virtual void SetAttribute( sal_uInt16 nPrefixKey,
                                const OUString& rLocalName,
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index a6d3a25ddbd9..de960236ac86 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -327,7 +327,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xFrameAttrList);
-    SvXMLImportContext* CreateFrameChildContext(
+    static SvXMLImportContext* CreateFrameChildContext(
         SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 03b2319ce069..e179fd4c257d 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -375,7 +375,7 @@ private:
     /// ugly, but implementation of this is in XMLPropertyBackpatcher.cxx
     struct BackpatcherImpl;
     std::shared_ptr<BackpatcherImpl> m_xBackpatcherImpl;
-    std::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl();
+    static std::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl();
 
 protected:
     virtual SvXMLImportContext *CreateTableChildContext(
diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx
index baa7cee25dca..9a2e0293efdc 100644
--- a/include/xmloff/txtimppr.hxx
+++ b/include/xmloff/txtimppr.hxx
@@ -29,12 +29,12 @@ class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public SvXMLImportPropertyM
     sal_Int32 nSizeTypeIndex;
     sal_Int32 nWidthTypeIndex;
 
-    void FontFinished(
+    static void FontFinished(
                 XMLPropertyState *pFontFamilyNameState,
                 XMLPropertyState *pFontStyleNameState,
                 XMLPropertyState *pFontFamilyState,
                 XMLPropertyState *pFontPitchState,
-                XMLPropertyState *pFontCharsetState ) const;
+                XMLPropertyState *pFontCharsetState );
 
     void FontDefaultsCheck(
                 XMLPropertyState*pFontFamilyName,
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index d4faf1002ec9..7b94d38e05cd 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -180,7 +180,7 @@ protected:
     inline bool HasShapeImport() const { return mxShapeImport.is(); }
     inline void ClearShapeImport() { mxShapeImport = 0; }
 
-    SchXMLImportHelper* CreateChartImport();
+    static SchXMLImportHelper* CreateChartImport();
     ::xmloff::OFormLayerXMLImport* CreateFormImport();
 
     void SetFontDecls( XMLFontStylesContext *pFontDecls );
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 00d8a34521aa..66698fa05413 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -207,8 +207,8 @@ public:
     /** convert NumberingType to num-forat and num-letter-sync values */
     void convertNumFormat( OUStringBuffer& rBuffer,
                            sal_Int16 nType ) const;
-    void convertNumLetterSync( OUStringBuffer& rBuffer,
-                                  sal_Int16 nType ) const;
+    static void convertNumLetterSync( OUStringBuffer& rBuffer,
+                                  sal_Int16 nType );
 
     static void convertPropertySet(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps,
                         const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& aProperties);
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 3e8e4cd33b45..02421d872fec 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -320,7 +320,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
         {
             GetScImport().GetFormImport()->startPage(GetScImport().GetTables().GetCurrentXDrawPage());
             bStartFormPage = true;
-            pContext = GetScImport().GetFormImport()->createOfficeFormsContext( GetScImport(), nPrefix, rLName );
+            pContext = xmloff::OFormLayerXMLImport::createOfficeFormsContext( GetScImport(), nPrefix, rLName );
         }
         break;
     case XML_TOK_TABLE_EVENT_LISTENERS:
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index ae8736115c79..a5d17b3a5063 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -268,7 +268,7 @@ public:
     }
     #endif
 
-    void parseError( const char* pMessage, iteratorT pLocation )
+    static void parseError( const char* pMessage, iteratorT pLocation )
     {
         throw_( pLocation, pMessage );
     }
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 569813d35522..6841331b23f8 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -462,7 +462,7 @@ void SwXMLExport::_ExportContent()
                 xPage, GetFormExport() );
 
             // #i36597#
-            if ( GetFormExport()->pageContainsForms( xPage ) || GetFormExport()->documentContainsXForms() )
+            if ( xmloff::OFormLayerXMLExport::pageContainsForms( xPage ) || GetFormExport()->documentContainsXForms() )
             {
                 ::xmloff::OOfficeFormsExport aOfficeForms(*this);
 
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index f99b1affde36..c4e46cfe7faa 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -63,21 +63,21 @@ private:
     sal_Int32 SAL_CALL
     impl_getColumnCount();
 
-    void SAL_CALL
+    static void SAL_CALL
     impl_getCurrentContentIdentifierString(
             com::sun::star::uno::Any& rAny
             , com::sun::star::uno::Reference<
                 com::sun::star::ucb::XContentAccess > xContentAccess )
             throw ( com::sun::star::uno::RuntimeException );
 
-    void SAL_CALL
+    static void SAL_CALL
     impl_getCurrentContentIdentifier(
             com::sun::star::uno::Any& rAny
             , com::sun::star::uno::Reference<
                 com::sun::star::ucb::XContentAccess > xContentAccess )
             throw ( com::sun::star::uno::RuntimeException );
 
-    void SAL_CALL
+    static void SAL_CALL
     impl_getCurrentContent(
             com::sun::star::uno::Any& rAny
             , com::sun::star::uno::Reference<
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 7e51e7f9caec..a225fb969862 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -136,28 +136,28 @@ class SortedResultSet: public cppu::WeakImplHelper8 <
     SortedEntryList     maS2O;          // maps the sorted entries to the original ones
     SimpleList          maO2S;          // maps the original Entries to the sorted ones
     SimpleList          maModList;      // keeps track of modified entries
-    sal_IntPtr                mnLastSort;     // index of the last sorted entry;
-    sal_IntPtr                mnCurEntry;     // index of the current entry
-    sal_IntPtr                mnCount;        // total count of the elements
-    bool            mbIsCopy;
+    sal_IntPtr          mnLastSort;     // index of the last sorted entry;
+    sal_IntPtr          mnCurEntry;     // index of the current entry
+    sal_IntPtr          mnCount;        // total count of the elements
+    bool                mbIsCopy;
 
 
 private:
 
-    sal_IntPtr                FindPos( SortListData *pEntry, sal_IntPtr nStart, sal_IntPtr nEnd )
+    sal_IntPtr          FindPos( SortListData *pEntry, sal_IntPtr nStart, sal_IntPtr nEnd )
                             throw( css::sdbc::SQLException, css::uno::RuntimeException );
-    sal_IntPtr                Compare( SortListData *pOne,
+    sal_IntPtr          Compare( SortListData *pOne,
                                  SortListData *pTwo )
                             throw( css::sdbc::SQLException, css::uno::RuntimeException );
     void                BuildSortInfo( css::uno::Reference< css::sdbc::XResultSet > aResult,
                                        const css::uno::Sequence < css::ucb::NumberedSortingInfo > &xSortInfo,
                                        const css::uno::Reference< css::ucb::XAnyCompareFactory > &xCompFac );
-    sal_IntPtr                CompareImpl( css::uno::Reference < css::sdbc::XResultSet > xResultOne,
+    static sal_IntPtr   CompareImpl( css::uno::Reference < css::sdbc::XResultSet > xResultOne,
                                      css::uno::Reference < css::sdbc::XResultSet > xResultTwo,
                                      sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo,
                                      SortInfo* pSortInfo )
                             throw( css::sdbc::SQLException, css::uno::RuntimeException );
-    sal_IntPtr                CompareImpl( css::uno::Reference < css::sdbc::XResultSet > xResultOne,
+    sal_IntPtr          CompareImpl( css::uno::Reference < css::sdbc::XResultSet > xResultOne,
                                      css::uno::Reference < css::sdbc::XResultSet > xResultTwo,
                                      sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo )
                             throw( css::sdbc::SQLException, css::uno::RuntimeException );
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 50614776caa6..6610964cca1b 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -399,7 +399,7 @@ protected:
             ::com::sun::star::beans::XPropertySetInfo > & rPropertySetInfo );
 
     /// for XDependentTextFields, get PropertySet of FieldMaster
-    ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >
+    static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >
     GetMasterPropertySet(const ::com::sun::star::uno::Reference <
                          ::com::sun::star::text::XTextField > & rTextField);
 
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 4023aacf2c93..f423513f0d55 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -179,7 +179,7 @@ protected:
 
     /// force an update of the field's value
     /// call update on optional XUptadeable interface; (disable Fixed property)
-    void ForceUpdate(
+    static void ForceUpdate(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet> & rPropertySet);
 };
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 9b80507d1927..07a83724ca43 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -165,9 +165,9 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartDocument > & xChartDoc );
 
-    ::com::sun::star::awt::Size getPageSize(
+    static ::com::sun::star::awt::Size getPageSize(
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xChartDoc ) const;
+            ::com::sun::star::chart2::XChartDocument > & xChartDoc );
 
     /** first parseDocument: collect autostyles and store names in this queue
         second parseDocument: export content and use names from this queue
@@ -3520,7 +3520,7 @@ void SchXMLExportHelper_Impl::addSize( Reference< drawing::XShape > xShape, bool
         addSize( xShape->getSize(), bIsOOoNamespace );
 }
 
-awt::Size SchXMLExportHelper_Impl::getPageSize( const Reference< chart2::XChartDocument > & xChartDoc ) const
+awt::Size SchXMLExportHelper_Impl::getPageSize( const Reference< chart2::XChartDocument > & xChartDoc )
 {
     awt::Size aSize( 8000, 7000 );
     uno::Reference< embed::XVisualObject > xVisualObject( xChartDoc, uno::UNO_QUERY );
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 7e8a68d6635c..3c4edf5047c2 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -195,7 +195,7 @@ void XMLSettingsExportHelper::exportBool(const bool bValue, const OUString& rNam
     m_rContext.EndElement( false );
 }
 
-void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const OUString& rName) const
+void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const OUString& rName)
 {
     (void) nValue; (void) rName;
     OSL_ENSURE(false, "XMLSettingsExportHelper::exportByte(): #i114162#:\n"
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 2f78a6a530ea..e41fb921437b 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -364,7 +364,7 @@ sal_uInt16 SvXMLNamespaceMap::GetNextKey( sal_uInt16 nLastKey ) const
 
 // All methods after this are deprecated...
 
-sal_uInt16 SvXMLNamespaceMap::GetIndexByKey( sal_uInt16 nKey ) const
+sal_uInt16 SvXMLNamespaceMap::GetIndexByKey( sal_uInt16 nKey )
 {
     return nKey;
 }
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index fa31e599a45a..bbca3fe41d2f 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -683,7 +683,7 @@ void SvXMLUnitConverter::convertNumFormat( OUStringBuffer& rBuffer,
 }
 
 void SvXMLUnitConverter::convertNumLetterSync( OUStringBuffer& rBuffer,
-                               sal_Int16 nType ) const
+                               sal_Int16 nType )
 {
     enum XMLTokenEnum eSync = XML_TOKEN_INVALID;
     switch( nType )
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 4129b72369fa..92c5031d2b5e 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -513,9 +513,9 @@ public:
     void exportAudio( const Reference< XAudio >& xAudio );
     void exportCommand( const Reference< XCommand >& xCommand );
 
-    Reference< XInterface > getParagraphTarget( const ParagraphTarget* pTarget ) const;
+    static Reference< XInterface > getParagraphTarget( const ParagraphTarget* pTarget );
 
-    void convertPath( OUStringBuffer& sTmp, const Any& rPath ) const;
+    static void convertPath( OUStringBuffer& sTmp, const Any& rPath );
     void convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue ) const;
     void convertTiming( OUStringBuffer& sTmp, const Any& rTiming ) const;
     void convertSource( OUStringBuffer& sTmp, const Any& rSource ) const;
@@ -1412,7 +1412,7 @@ void AnimationsExporterImpl::exportCommand( const Reference< XCommand >& xComman
     }
 }
 
-Reference< XInterface > AnimationsExporterImpl::getParagraphTarget( const ParagraphTarget* pTarget ) const
+Reference< XInterface > AnimationsExporterImpl::getParagraphTarget( const ParagraphTarget* pTarget )
 {
     if( pTarget ) try
     {
@@ -1437,7 +1437,7 @@ Reference< XInterface > AnimationsExporterImpl::getParagraphTarget( const Paragr
     return xRef;
 }
 
-void AnimationsExporterImpl::convertPath( OUStringBuffer& sTmp, const Any& rPath ) const
+void AnimationsExporterImpl::convertPath( OUStringBuffer& sTmp, const Any& rPath )
 {
     OUString aStr;
     rPath >>= aStr;
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 67df98731c51..1a3f2bdd890b 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -123,10 +123,10 @@ public:
     Sequence< Any > convertValueSequence( XMLTokenEnum eAttributeName, const OUString& rValue );
 
     Any convertTarget( const OUString& rValue );
-    Any convertPath( const OUString& rValue );
+    static Any convertPath( const OUString& rValue );
     Any convertTiming( const OUString& rValue );
-    Sequence< double > convertKeyTimes( const OUString& rValue );
-    Sequence< TimeFilterPair > convertTimeFilter( const OUString& rValue );
+    static Sequence< double > convertKeyTimes( const OUString& rValue );
+    static Sequence< TimeFilterPair > convertTimeFilter( const OUString& rValue );
 
     const OUString mastrHSL;
 };
@@ -993,7 +993,7 @@ void AnimationNodeContext::init_node(  const ::com::sun::star::uno::Reference< :
             case ANA_KeyTimes:
             {
                 if( xAnimate.is() )
-                    xAnimate->setKeyTimes( mpHelper->convertKeyTimes( rValue ) );
+                    xAnimate->setKeyTimes( AnimationsImportHelperImpl::convertKeyTimes( rValue ) );
             }
             break;
 
@@ -1046,7 +1046,7 @@ void AnimationNodeContext::init_node(  const ::com::sun::star::uno::Reference< :
             case ANA_KeySplines:
             {
                 if( xAnimate.is() )
-                    xAnimate->setTimeFilter( mpHelper->convertTimeFilter( rValue ) );
+                    xAnimate->setTimeFilter( AnimationsImportHelperImpl::convertTimeFilter( rValue ) );
             }
             break;
 
@@ -1054,7 +1054,7 @@ void AnimationNodeContext::init_node(  const ::com::sun::star::uno::Reference< :
             {
                 Reference< XAnimateMotion > xAnimateMotion( mxNode, UNO_QUERY );
                 if( xAnimateMotion.is() )
-                    xAnimateMotion->setPath( mpHelper->convertPath( rValue ) );
+                    xAnimateMotion->setPath( AnimationsImportHelperImpl::convertPath( rValue ) );
             }
             break;
 
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index f6e4f767b6d5..d60ed0f6de40 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -249,7 +249,7 @@ SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nPre
     else if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_FORMS ) )
     {
         if( GetImport().IsFormsSupported() )
-            pContext = GetImport().GetFormImport()->createOfficeFormsContext( GetImport(), nPrefix, rLocalName );
+            pContext = xmloff::OFormLayerXMLImport::createOfficeFormsContext( GetImport(), nPrefix, rLocalName );
     }
     else if( ((nPrefix == XML_NAMESPACE_OFFICE) || (nPrefix == XML_NAMESPACE_OFFICE_EXT)) && IsXMLToken( rLocalName, XML_ANNOTATION ) )
     {
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 610a30fd6621..954a0db3ff23 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1735,7 +1735,7 @@ namespace xmloff
         {
             FormCellBindingHelper aHelper( m_xProps, NULL );
             {
-                if ( aHelper.isCellBinding( aHelper.getCurrentBinding( ) ) )
+                if ( FormCellBindingHelper::isCellBinding( aHelper.getCurrentBinding( ) ) )
                 {
                     m_nIncludeBindings |= BA_LINKED_CELL;
                     if ( m_nClassId == FormComponentType::LISTBOX )
@@ -1745,7 +1745,7 @@ namespace xmloff
 
             // is it a list-like control which uses a calc cell range as list source?
             {
-                if ( aHelper.isCellRangeListSource( aHelper.getCurrentListSource( ) ) )
+                if ( FormCellBindingHelper::isCellRangeListSource( aHelper.getCurrentListSource( ) ) )
                     m_nIncludeBindings |= BA_LIST_CELL_RANGE;
             }
         }
@@ -1786,7 +1786,7 @@ namespace xmloff
 
                 if ( _bIncludeListLinkageType )
                 {
-                    sal_Int16 nLinkageType = aHelper.isCellIntegerBinding( xBinding ) ? 1 : 0;
+                    sal_Int16 nLinkageType = FormCellBindingHelper::isCellIntegerBinding( xBinding ) ? 1 : 0;
 
                     OUStringBuffer sBuffer;
                     SvXMLUnitConverter::convertEnum(
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index 230ff6dd49a5..a1a4344ff03c 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -238,7 +238,7 @@ namespace xmloff
         void setElementType(OControlElement::ElementType _eType) { m_eElementType = _eType; }
 
     protected:
-        void implTranslateValueProperty(
+        static void implTranslateValueProperty(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo,
             ::com::sun::star::beans::PropertyValue& /* [in/out] */ _rPropValue);
 
diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx
index b8720e99391b..61797c861a0e 100644
--- a/xmloff/source/forms/formcellbinding.cxx
+++ b/xmloff/source/forms/formcellbinding.cxx
@@ -320,22 +320,22 @@ bool FormCellBindingHelper::isCellBindingAllowed( const Reference< XModel >& _rx
     );
 }
 
-bool FormCellBindingHelper::isCellBinding( const Reference< XValueBinding >& _rxBinding ) const
+bool FormCellBindingHelper::isCellBinding( const Reference< XValueBinding >& _rxBinding )
 {
     return doesComponentSupport( _rxBinding.get(), SERVICE_CELLVALUEBINDING );
 }
 
-bool FormCellBindingHelper::isCellIntegerBinding( const Reference< XValueBinding >& _rxBinding ) const
+bool FormCellBindingHelper::isCellIntegerBinding( const Reference< XValueBinding >& _rxBinding )
 {
     return doesComponentSupport( _rxBinding.get(), SERVICE_LISTINDEXCELLBINDING );
 }
 
-bool FormCellBindingHelper::isCellRangeListSource( const Reference< XListEntrySource >& _rxSource ) const
+bool FormCellBindingHelper::isCellRangeListSource( const Reference< XListEntrySource >& _rxSource )
 {
     return doesComponentSupport( _rxSource.get(), SERVICE_CELLRANGELISTSOURCE );
 }
 
-bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const
+bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService )
 {
     Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY );
     bool bDoes = xSI.is() && xSI->supportsService( _rService );
diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx
index a71c425af9e5..5abffefaefcd 100644
--- a/xmloff/source/forms/formcellbinding.hxx
+++ b/xmloff/source/forms/formcellbinding.hxx
@@ -161,22 +161,22 @@ namespace xmloff
 
         /** checks whether a given binding is a spreadsheet cell binding
         */
-        bool            isCellBinding(
+        static bool     isCellBinding(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding
-                        ) const;
+                        );
 
         /** checks whether a given binding is a spreadsheet cell binding, exchanging
             integer values
         */
-        bool            isCellIntegerBinding(
+        static bool     isCellIntegerBinding(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding
-                        ) const;
+                        );
 
         /** checks whether a given list source is a spreadsheet cell list source
         */
-        bool            isCellRangeListSource(
+        static bool    isCellRangeListSource(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource
-                        ) const;
+                        );
 
     protected:
         /** creates an address object from a string representation of a cell address
@@ -209,10 +209,10 @@ namespace xmloff
 
         /** checkes whether a given component supports a given servive
         */
-        bool            doesComponentSupport(
+        static bool     doesComponentSupport(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent,
                             const OUString& _rService
-                        ) const;
+                        );
 
         /** uses the document (it's factory interface, respectively) to create a component instance
             @param _rService
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 1e8f43a459e3..15fbbf813f17 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -92,9 +92,9 @@ namespace xmloff
         m_pImpl->exportXForms();
     }
 
-    bool OFormLayerXMLExport::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage ) const
+    bool OFormLayerXMLExport::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage )
     {
-        return m_pImpl->pageContainsForms( _rxDrawPage );
+        return OFormLayerXMLExport_Impl::pageContainsForms( _rxDrawPage );
     }
 
     bool OFormLayerXMLExport::documentContainsXForms() const
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index c5e40ed606d7..5d496259a26e 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -68,7 +68,7 @@ namespace xmloff
         sal_uInt16 _nPrefix,
         const OUString& _rLocalName)
     {
-        return m_pImpl->createOfficeFormsContext(_rImport, _nPrefix, _rLocalName);
+        return OFormLayerXMLImport_Impl::createOfficeFormsContext(_rImport, _nPrefix, _rLocalName);
     }
 
     SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName,
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 4b618d47628d..a4a38614bbb4 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -292,7 +292,7 @@ namespace xmloff
         ::exportXForms( m_rContext );
     }
 
-    bool OFormLayerXMLExport_Impl::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage ) const
+    bool OFormLayerXMLExport_Impl::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage )
     {
         Reference< XFormsSupplier2 > xFormsSupp( _rxDrawPage, UNO_QUERY );
         DBG_ASSERT( xFormsSupp.is(), "OFormLayerXMLExport_Impl::pageContainsForms: no XFormsSupplier2!" );
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index 4a4e4146be94..5f8a3b319547 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -217,7 +217,7 @@ namespace xmloff
 
         /** determines whether the given page contains logical forms
         */
-        bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage ) const;
+        static bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage );
 
         /** determines whether the given page contains XForm instances
         */
@@ -232,7 +232,7 @@ namespace xmloff
         void exportAutoStyles();
 
     protected:
-        bool impl_isFormPageContainingForms(
+        static bool impl_isFormPageContainingForms(
             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage,
             ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxForms);
 
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index 8975318d4b4b..5c4cb6782658 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -144,7 +144,7 @@ namespace xmloff
 
         /** creates an import context for the office:forms element
         */
-        SvXMLImportContext* createOfficeFormsContext(
+        static SvXMLImportContext* createOfficeFormsContext(
             SvXMLImport& _rImport,
             sal_uInt16 _nPrefix,
             const OUString& _rLocalName);
diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx
index 1a4af65e4bda..8a32a6d1c659 100644
--- a/xmloff/source/forms/officeforms.hxx
+++ b/xmloff/source/forms/officeforms.hxx
@@ -69,9 +69,9 @@ namespace xmloff
         ~OFormsRootExport();
 
     private:
-        void addModelAttributes(SvXMLExport& _rExp);
+        static void addModelAttributes(SvXMLExport& _rExp);
 
-        void implExportBool(
+        static void implExportBool(
             SvXMLExport& _rExp,
             OfficeFormsAttributes _eAttribute,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps,
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index 2c38bc3862a1..510eb960a4e1 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -341,7 +341,7 @@ namespace xmloff
                 </ul>
                 If the type is not convertible, float is returned
         */
-        ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType);
+        static ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType);
 
 #ifdef DBG_UTIL
                 void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue);
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 18885fd25081..2e369b48da1f 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -60,12 +60,12 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum )
 
     addChaffWhenEncryptedStorage();
 
-    sal_uInt16 nPos = _GetNamespaceMap().GetIndexByKey( XML_NAMESPACE_DC );
+    sal_uInt16 nPos = SvXMLNamespaceMap::GetIndexByKey( XML_NAMESPACE_DC );
 
     AddAttribute( XML_NAMESPACE_NONE, _GetNamespaceMap().GetAttrNameByIndex( nPos ),
                              _GetNamespaceMap().GetNameByIndex ( nPos ) );
 
-    nPos = _GetNamespaceMap().GetIndexByKey( XML_NAMESPACE_FRAMEWORK );
+    nPos = SvXMLNamespaceMap::GetIndexByKey( XML_NAMESPACE_FRAMEWORK );
     AddAttribute( XML_NAMESPACE_NONE, _GetNamespaceMap().GetAttrNameByIndex( nPos ),
                              _GetNamespaceMap().GetNameByIndex ( nPos ) );
 
diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx
index ac2e7bebf691..96968fee69fd 100644
--- a/xmloff/source/style/PageMasterPropHdl.cxx
+++ b/xmloff/source/style/PageMasterPropHdl.cxx
@@ -200,7 +200,7 @@ bool XMLPMPropHdl_NumLetterSync::importXML(
 bool XMLPMPropHdl_NumLetterSync::exportXML(
         OUString& rStrExpValue,
         const Any& rValue,
-        const SvXMLUnitConverter& rUnitConverter ) const
+        const SvXMLUnitConverter& /*rUnitConverter*/ ) const
 {
     bool        bRet = false;
     sal_Int16   nNumType = sal_Int16();
@@ -208,7 +208,7 @@ bool XMLPMPropHdl_NumLetterSync::exportXML(
     if( rValue >>= nNumType )
     {
         OUStringBuffer aBuffer( 5 );
-        rUnitConverter.convertNumLetterSync( aBuffer, nNumType );
+        SvXMLUnitConverter::convertNumLetterSync( aBuffer, nNumType );
         rStrExpValue = aBuffer.makeStringAndClear();
         bRet = !rStrExpValue.isEmpty();
     }
diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx
index 90885a834b71..3d38bd7b5ac2 100644
--- a/xmloff/source/style/backhdl.cxx
+++ b/xmloff/source/style/backhdl.cxx
@@ -211,7 +211,7 @@ bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const uno
     return bRet;
 }
 
-void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePos, style::GraphicLocation eVert ) const
+void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePos, style::GraphicLocation eVert )
 {
     switch( ePos )
     {
@@ -245,7 +245,7 @@ void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePo
     }
 }
 
-void XMLBackGraphicPositionPropHdl::MergeXMLHoriPos( style::GraphicLocation& ePos, style::GraphicLocation eHori ) const
+void XMLBackGraphicPositionPropHdl::MergeXMLHoriPos( style::GraphicLocation& ePos, style::GraphicLocation eHori )
 {
     DBG_ASSERT( style::GraphicLocation_LEFT_MIDDLE==eHori || style::GraphicLocation_MIDDLE_MIDDLE==eHori || style::GraphicLocation_RIGHT_MIDDLE==eHori,
                 "lcl_frmitems_MergeXMLHoriPos: vertical pos must be middle" );
diff --git a/xmloff/source/style/backhdl.hxx b/xmloff/source/style/backhdl.hxx
index ff2fa597da26..7a6a934670dd 100644
--- a/xmloff/source/style/backhdl.hxx
+++ b/xmloff/source/style/backhdl.hxx
@@ -37,8 +37,8 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
 
 private:
-    void MergeXMLHoriPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eHori ) const;
-    void MergeXMLVertPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eVert ) const;
+    static void MergeXMLHoriPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eHori );
+    static void MergeXMLVertPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eVert );
 };
 
 #endif // INCLUDED_XMLOFF_SOURCE_STYLE_BACKHDL_HXX
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index c658ed14add6..8f86372d954d 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -329,7 +329,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
         GetExport().GetMM100UnitConverter().convertNumFormat( sTmp, eType );
         GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NUM_FORMAT,
                                        sTmp.makeStringAndClear() );
-        GetExport().GetMM100UnitConverter().convertNumLetterSync( sTmp, eType );
+        SvXMLUnitConverter::convertNumLetterSync( sTmp, eType );
         if( !sTmp.isEmpty() )
             GetExport().AddAttribute( XML_NAMESPACE_STYLE,
                                       XML_NUM_LETTER_SYNC,
diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx
index a36b8cd24af4..5bb2521533bb 100644
--- a/xmloff/source/text/XMLIndexMarkExport.hxx
+++ b/xmloff/source/text/XMLIndexMarkExport.hxx
@@ -92,7 +92,7 @@ protected:
 
     /// create a numerical ID for this index mark
     /// (represented by its properties)
-    void GetID(
+    static void GetID(
         OUStringBuffer& sBuffer,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet> & rPropSet);
diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx
index ae2732f98438..7bd89c31ed14 100644
--- a/xmloff/source/text/XMLLineNumberingExport.cxx
+++ b/xmloff/source/text/XMLLineNumberingExport.cxx
@@ -141,7 +141,7 @@ void XMLLineNumberingExport::Export()
             rExport.GetMM100UnitConverter().convertNumFormat( sNumPosBuf, nFormat );
             rExport.AddAttribute(XML_NAMESPACE_STYLE, XML_NUM_FORMAT,
                                  sNumPosBuf.makeStringAndClear());
-            rExport.GetMM100UnitConverter().convertNumLetterSync( sNumPosBuf, nFormat );
+            SvXMLUnitConverter::convertNumLetterSync( sNumPosBuf, nFormat );
             if( !sNumPosBuf.isEmpty() )
             {
                 rExport.AddAttribute(XML_NAMESPACE_STYLE,
diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx
index 26a0868a71fe..9163ef2927f8 100644
--- a/xmloff/source/text/XMLSectionExport.hxx
+++ b/xmloff/source/text/XMLSectionExport.hxx
@@ -280,7 +280,7 @@ protected:
             ::com::sun::star::text::XDocumentIndex > & rIndex) const;
 
     /// map service name to section type
-    enum SectionTypeEnum MapSectionType(const OUString& rSectionName);
+    static enum SectionTypeEnum MapSectionType(const OUString& rSectionName);
 
     /**
      * Export the index element start (for all index types).
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
index 18c4194a31a3..24611fee23e0 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
@@ -168,7 +168,7 @@ void XMLSectionFootnoteConfigExport::exportXML(
                                  sBuf.makeStringAndClear());
 
             // and letter sync, if applicable
-            rExport.GetMM100UnitConverter().convertNumLetterSync(
+            SvXMLUnitConverter::convertNumLetterSync(
                 sBuf, nNumberingType );
             if (!sBuf.isEmpty())
             {
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 52fc140639da..6389d8f27f0c 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1674,7 +1674,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
     else
     {
         // the child is a drawing shape
-        pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
+        pContext = XMLShapeImportHelper::CreateFrameChildContext(
                                     &m_xImplContext, p_nPrefix, rLocalName, xAttrList );
     }
 
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 0dd5312da225..0b453bd3c011 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -284,7 +284,7 @@ void XMLTextExportPropertySetMapper::ContextFontFilter(
 void XMLTextExportPropertySetMapper::ContextFontHeightFilter(
     XMLPropertyState* pCharHeightState,
     XMLPropertyState* pCharPropHeightState,
-    XMLPropertyState* pCharDiffHeightState ) const
+    XMLPropertyState* pCharDiffHeightState )
 {
     if( pCharPropHeightState )
     {
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index b0048429f2f7..63ac6d784868 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -42,10 +42,10 @@ class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper
                 XMLPropertyState *pFontFamilyState,
                 XMLPropertyState *pFontPitchState,
                 XMLPropertyState *pFontCharsetState ) const;
-    void ContextFontHeightFilter(
+    static void ContextFontHeightFilter(
                 XMLPropertyState* pCharHeightState,
                 XMLPropertyState* pCharPropHeightState,
-                XMLPropertyState* pCharDiffHeightState ) const;
+                XMLPropertyState* pCharDiffHeightState );
 
 protected:
 //  SvXMLUnitConverter& mrUnitConverter;
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 13e3f21f1e99..626adaab8cd9 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2596,8 +2596,7 @@ void XMLTextFieldExport::ProcessNumberingType(sal_Int16 nNumberingType)
         GetExport().AddAttribute(XML_NAMESPACE_STYLE, XML_NUM_FORMAT,
                                       sTmp.makeStringAndClear() );
         // and letter sync, if applicable
-        GetExport().GetMM100UnitConverter().convertNumLetterSync( sTmp,
-                                                              nNumberingType );
+        SvXMLUnitConverter::convertNumLetterSync( sTmp, nNumberingType );
 
         if (!sTmp.isEmpty())
         {
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index 4f8fcafc889e..57900bd8efef 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -295,7 +295,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
     GetExport().GetMM100UnitConverter().convertNumFormat( sBuffer, nNumbering);
     GetExport().AddAttribute(XML_NAMESPACE_STYLE, XML_NUM_FORMAT,
                              sBuffer.makeStringAndClear() );
-    GetExport().GetMM100UnitConverter().convertNumLetterSync( sBuffer, nNumbering);
+    SvXMLUnitConverter::convertNumLetterSync( sBuffer, nNumbering);
     if (!sBuffer.isEmpty() )
     {
         GetExport().AddAttribute(XML_NAMESPACE_STYLE, XML_NUM_LETTER_SYNC,
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index d5c6fe378d9e..3eeec35f4643 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2278,7 +2278,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
         break;
 
     case XML_TOK_TEXT_FORMS:
-        pContext = rImport.GetFormImport()->createOfficeFormsContext(rImport, nPrefix, rLocalName);
+        pContext = xmloff::OFormLayerXMLImport::createOfficeFormsContext(rImport, nPrefix, rLocalName);
         bContent = false;
         break;
 
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 08cb3957c386..ab11b94955aa 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -148,7 +148,7 @@ void XMLTextImportPropertyMapper::FontFinished(
     XMLPropertyState *pFontStyleNameState,
     XMLPropertyState *pFontFamilyState,
     XMLPropertyState *pFontPitchState,
-    XMLPropertyState *pFontCharsetState ) const
+    XMLPropertyState *pFontCharsetState )
 {
     if( pFontFamilyNameState && pFontFamilyNameState->mnIndex != -1 )
     {
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 34d51f374133..d39aa776c6e0 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -1222,14 +1222,14 @@ bool XMLNumber8OneBasedHdl::exportXML(
 class XMLTextPropertyHandlerFactory_Impl
 {
 public:
-    const XMLPropertyHandler *GetPropertyHandler( sal_Int32 nType ) const;
+    static const XMLPropertyHandler *GetPropertyHandler( sal_Int32 nType );
 
     XMLTextPropertyHandlerFactory_Impl();
     ~XMLTextPropertyHandlerFactory_Impl();
 };
 
 const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
-    ( sal_Int32 nType ) const
+    ( sal_Int32 nType )
 {
     const XMLPropertyHandler* pHdl = 0;
     switch( nType )
@@ -1459,7 +1459,7 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory::GetPropertyHandler(
 
     if( !pHdl )
     {
-        const XMLPropertyHandler *pNewHdl = pImpl->GetPropertyHandler( nType );
+        const XMLPropertyHandler *pNewHdl = XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler( nType );
 
         if( pNewHdl )
             PutHdlCache( nType, pNewHdl );
diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx
index 798be653f23f..b3cdd7d07a8e 100644
--- a/xmloff/source/transform/FormPropOASISTContext.hxx
+++ b/xmloff/source/transform/FormPropOASISTContext.hxx
@@ -28,7 +28,7 @@ class XMLFormPropOASISTransformerContext :
     bool m_bIsList;
     bool m_bIsListValue;
 
-    ::xmloff::token::XMLTokenEnum GetValueType( const OUString& rValue );
+    static ::xmloff::token::XMLTokenEnum GetValueType( const OUString& rValue );
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index a50fb223444c..893a3c064084 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -166,7 +166,7 @@ public:
         matching token in its lower 16 bits.  The value is converted to the
         token that is given in the upper 16 bits of the matching parameter.
      */
-    bool RenameAttributeValue( OUString& rOutAttributeValue,
+    static bool RenameAttributeValue( OUString& rOutAttributeValue,
                                    sal_Int32 nParam1,
                                    sal_Int32 nParam2,
                                    sal_Int32 nParam3 );