loplugin:staticmethods

Change-Id: Id3d6b50e07ea0850af18ab9bdadfffe0e4602aab

12 files changed, 15 insertions, 16 deletions

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 );