loplugin:staticfunction

Change-Id: I10c30ef28e7321882a720d1e7869a75a89febfc5

27 files changed, 106 insertions, 103 deletions

diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 293b0be4f4be..b86e9de5a190 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -135,7 +135,7 @@ public:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > getOutputStream();
 
-    FastAttributeList *createAttrList();
+    static FastAttributeList *createAttrList();
 
     void mark( const ::com::sun::star::uno::Sequence< sal_Int32 >& aOrder =
             ::com::sun::star::uno::Sequence< sal_Int32 >() );
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index 1262651b3202..de65fac0091e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -112,7 +112,7 @@ protected:
        "ea" is passed then Rel_EA is returned. If the string is no pre release
        then Rel_NONE is returned.
     */
-    PreRelease getPreRelease(const char *szRel);
+    static PreRelease getPreRelease(const char *szRel);
 };
 
 }
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 8b4ab9e4c903..4604c073f0c8 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -658,7 +658,7 @@ void NodeJava::addJRELocation(rtl_uString * sLocation)
         m_JRELocations->push_back(OUString(sLocation));
 }
 
-jfw::FileStatus NodeJava::checkSettingsFileStatus(OUString const & sURL) const
+jfw::FileStatus NodeJava::checkSettingsFileStatus(OUString const & sURL)
 {
     jfw::FileStatus ret = FILE_DOES_NOT_EXIST;
 
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index d04827b550df..2fc9a3f3066e 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -145,7 +145,7 @@ private:
 
     /** Verifies if the respective settings file exist.
      */
-    jfw::FileStatus checkSettingsFileStatus(OUString const & sURL) const;
+    static jfw::FileStatus checkSettingsFileStatus(OUString const & sURL);
 
     /** Determines the layer for which the instance the loads and writes the
         data.
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 868b01dd0983..c61ff03ed261 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -112,7 +112,7 @@ protected:
 
     virtual void Output(const OString & rOutput)=0;
 
-    void Error(const OString &rError);
+    static void Error(const OString &rError);
 
 private:
     int ExecuteAnalyzedToken( int nToken, char *pToken );
@@ -121,7 +121,7 @@ private:
         const OString &rIsoLang,
         const OString &rResTyp );
 
-    bool IsTokenClosed(const OString &rToken);
+    static bool IsTokenClosed(const OString &rToken);
 
 public:
     CfgParser();
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index c7ceb9b4af1a..b868c7a546ad 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -152,23 +152,23 @@ private:
 
     OString FullId();                    ///< creates cur. GID
 
-    OString GetPairedListID(const OString & rText);
-    OString GetPairedListString(const OString& rText);
-    OString StripList(const OString& rText);
+    static OString GetPairedListID(const OString & rText);
+    static OString GetPairedListString(const OString& rText);
+    static OString StripList(const OString& rText);
 
     void InsertListEntry(const OString &rLine);
-    void CleanValue( OString &rValue );
-    OString GetText(const OString &rSource, int nToken);
+    static void CleanValue( OString &rValue );
+    static OString GetText(const OString &rSource, int nToken);
 
     void ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OString& rTextType );
     void MergeRest( ResData *pResData );
-    void ConvertMergeContent( OString &rText );
-    void ConvertExportContent( OString &rText );
+    static void ConvertMergeContent( OString &rText );
+    static void ConvertExportContent( OString &rText );
 
     void WriteToMerged(const OString &rText , bool bSDFContent);
     void SetChildWithText();
 
-    void CutComment( OString &rText );
+    static void CutComment( OString &rText );
 
     void WriteUTF8ByteOrderMarkToOutput() { *aOutput.mSimple << '\xEF' << '\xBB' << '\xBF'; }
 
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 9787d18bf84a..89c85433d84f 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -56,7 +56,7 @@ public:
 private:
     bool MergeSingleFile( XMLFile* file , MergeDataFile* pMergeDataFile , const OString& sLanguage , OString const & sPath );
 
-    void ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResData *pResData , MergeDataFile* pMergeDataFile );
+    static void ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResData *pResData , MergeDataFile* pMergeDataFile );
 };
 
 #endif // INCLUDED_L10NTOOLS_INC_HELPMERGE_HXX
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 278910c3a539..beab0c937360 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -48,10 +48,10 @@ private:
     OString sSource;
     std::vector<OString> aLanguages;
 
-    bool isNextGroup(OString &sGroup_out, const OString &sLine_in);
-    void ReadLine(const OString &rLine_in,
+    static bool isNextGroup(OString &sGroup_out, const OString &sLine_in);
+    static void ReadLine(const OString &rLine_in,
         OStringHashMap &rText_inout);
-    void WritePO(PoOfstream &aPOStream, OStringHashMap &rText_inout,
+    static void WritePO(PoOfstream &aPOStream, OStringHashMap &rText_inout,
         const OString &rActFileName, const OString &rID);
 public:
     LngParser(const OString &rLngFile);
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 96997f0cab35..13fb191e3a00 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -39,8 +39,8 @@ private:
     OString sCurrentCloseTag;
     OString sCurrentText;
 protected:
-    OString GetAttribute( const OString &rToken, const OString &rAttribute );
-    void Error( const OString &rError );
+    static OString GetAttribute( const OString &rToken, const OString &rAttribute );
+    static void Error( const OString &rError );
 
     virtual void Output( const OString& rOutput )=0;
     virtual void WorkOnDesc(
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0c732fdaefdd..05a95e672ad3 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -93,6 +93,7 @@ using namespace ::css::text;
 using ::css::geometry::IntegerRectangle2D;
 using ::css::io::XOutputStream;
 using ::sax_fastparser::FSHelperPtr;
+using ::sax_fastparser::FastSerializerHelper;
 
 namespace oox {
 namespace drawingml {
@@ -2341,7 +2342,7 @@ void DrawingML::WriteShapeEffect( const OUString& sName, const Sequence< Propert
     sal_uInt32 nRgbClr = 0;
     sal_Int32 nAlpha = MAX_PERCENT;
     Sequence< PropertyValue > aTransformations;
-    sax_fastparser::FastAttributeList *aOuterShdwAttrList = mpFS->createAttrList();
+    sax_fastparser::FastAttributeList *aOuterShdwAttrList = FastSerializerHelper::createAttrList();
     sax_fastparser::XFastAttributeListRef xOuterShdwAttrList( aOuterShdwAttrList );
     for( sal_Int32 i=0; i < aEffectProps.getLength(); ++i )
     {
@@ -2577,9 +2578,9 @@ void DrawingML::WriteShape3DEffects( Reference< XPropertySet > xPropSet )
         return;
 
     bool bCameraRotationPresent = false;
-    sax_fastparser::FastAttributeList *aCameraAttrList = mpFS->createAttrList();
+    sax_fastparser::FastAttributeList *aCameraAttrList = FastSerializerHelper::createAttrList();
     sax_fastparser::XFastAttributeListRef xCameraAttrList( aCameraAttrList );
-    sax_fastparser::FastAttributeList *aCameraRotationAttrList = mpFS->createAttrList();
+    sax_fastparser::FastAttributeList *aCameraRotationAttrList = FastSerializerHelper::createAttrList();
     sax_fastparser::XFastAttributeListRef xRotAttrList( aCameraRotationAttrList );
     for( sal_Int32 i=0; i < aEffectProps.getLength(); ++i )
     {
@@ -2619,9 +2620,9 @@ void DrawingML::WriteShape3DEffects( Reference< XPropertySet > xPropSet )
     }
 
     bool bLightRigRotationPresent = false;
-    sax_fastparser::FastAttributeList *aLightRigAttrList = mpFS->createAttrList();
+    sax_fastparser::FastAttributeList *aLightRigAttrList = FastSerializerHelper::createAttrList();
     sax_fastparser::XFastAttributeListRef xLightAttrList( aLightRigAttrList );
-    sax_fastparser::FastAttributeList *aLightRigRotationAttrList = mpFS->createAttrList();
+    sax_fastparser::FastAttributeList *aLightRigRotationAttrList = FastSerializerHelper::createAttrList();
     sax_fastparser::XFastAttributeListRef xLightRotAttrList( aLightRigRotationAttrList );
     for( sal_Int32 i=0; i < aLightRigProps.getLength(); ++i )
     {
@@ -2692,11 +2693,11 @@ void DrawingML::WriteShape3DEffects( Reference< XPropertySet > xPropSet )
 
     bool bBevelTPresent = false, bBevelBPresent = false;
     Sequence< PropertyValue > aExtrusionColorProps, aContourColorProps;
-    sax_fastparser::FastAttributeList *aBevelTAttrList = mpFS->createAttrList();
+    sax_fastparser::FastAttributeList *aBevelTAttrList = FastSerializerHelper::createAttrList();
     sax_fastparser::XFastAttributeListRef xBevelTAttrList( aBevelTAttrList );
-    sax_fastparser::FastAttributeList *aBevelBAttrList = mpFS->createAttrList();
+    sax_fastparser::FastAttributeList *aBevelBAttrList = FastSerializerHelper::createAttrList();
     sax_fastparser::XFastAttributeListRef xBevelBAttrList( aBevelBAttrList );
-    sax_fastparser::FastAttributeList *aShape3DAttrList = mpFS->createAttrList();
+    sax_fastparser::FastAttributeList *aShape3DAttrList = FastSerializerHelper::createAttrList();
     for( sal_Int32 i=0; i < aShape3DProps.getLength(); ++i )
     {
         if( aShape3DProps[i].Name == "extrusionH" || aShape3DProps[i].Name == "contourW" || aShape3DProps[i].Name == "z" )
@@ -2853,7 +2854,7 @@ void DrawingML::WriteArtisticEffect( Reference< XPropertySet > rXPropSet )
 
     Sequence< PropertyValue > aAttrs;
     aEffect.Value >>= aAttrs;
-    sax_fastparser::FastAttributeList *aAttrList = mpFS->createAttrList();
+    sax_fastparser::FastAttributeList *aAttrList = FastSerializerHelper::createAttrList();
     OString sRelId;
     for( sal_Int32 i=0; i < aAttrs.getLength(); ++i )
     {
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 067697e66f94..d3e8291766e3 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -89,7 +89,7 @@ void VMLExport::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance )
             fprintf( stderr, "Warning!  VMLExport::OpenContainer(): opening shape inside a shape.\n" );
 #endif
         m_nShapeType = ESCHER_ShpInst_Nil;
-        m_pShapeAttrList = m_pSerializer->createAttrList();
+        m_pShapeAttrList = FastSerializerHelper::createAttrList();
 
         if ( !m_pShapeStyle->isEmpty() )
             m_pShapeStyle->makeStringAndClear();
@@ -126,7 +126,7 @@ sal_uInt32 VMLExport::EnterGroup( const OUString& rShapeName, const Rectangle* p
     sal_uInt32 nShapeId = GenerateShapeId();
 
     OStringBuffer aStyle( 200 );
-    FastAttributeList *pAttrList = m_pSerializer->createAttrList();
+    FastAttributeList *pAttrList = FastSerializerHelper::createAttrList();
 
     pAttrList->add( XML_id, ShapeIdString( nShapeId ) );
 
@@ -560,7 +560,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
             case ESCHER_Prop_fillOpacity: // 386
                 {
                     sal_uInt32 nValue;
-                    sax_fastparser::FastAttributeList *pAttrList = m_pSerializer->createAttrList();
+                    sax_fastparser::FastAttributeList *pAttrList = FastSerializerHelper::createAttrList();
 
                     if ( rProps.GetOpt( ESCHER_Prop_fillType, nValue ) )
                     {
@@ -643,7 +643,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
             case ESCHER_Prop_lineEndCapStyle: // 471
                 {
                     sal_uInt32 nValue;
-                    sax_fastparser::FastAttributeList *pAttrList = m_pSerializer->createAttrList();
+                    sax_fastparser::FastAttributeList *pAttrList = FastSerializerHelper::createAttrList();
 
                     if ( rProps.GetOpt( ESCHER_Prop_lineColor, nValue ) )
                         impl_AddColor( pAttrList, XML_color, nValue );
@@ -748,7 +748,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
                     }
                     if ( bShadow )
                     {
-                        sax_fastparser::FastAttributeList *pAttrList = m_pSerializer->createAttrList();
+                        sax_fastparser::FastAttributeList *pAttrList = FastSerializerHelper::createAttrList();
                         impl_AddBool( pAttrList, XML_on, bShadow );
                         impl_AddBool( pAttrList, XML_obscured, bObscured );
 
@@ -777,7 +777,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
                                 XML_textpathok, "t",
                                 FSEND );
 
-                        sax_fastparser::FastAttributeList* pAttrList = m_pSerializer->createAttrList();
+                        sax_fastparser::FastAttributeList* pAttrList = FastSerializerHelper::createAttrList();
                         pAttrList->add(XML_on, "t");
                         pAttrList->add(XML_fitshape, "t");
                         pAttrList->add(XML_string, OUStringToOString(aTextPathString, RTL_TEXTENCODING_UTF8));
@@ -1168,7 +1168,7 @@ void VMLExport::EndShape( sal_Int32 nShapeElement )
         {
             uno::Reference<beans::XPropertySet> xPropertySet(const_cast<SdrObject*>(m_pSdrObject)->getUnoShape(), uno::UNO_QUERY);
             comphelper::SequenceAsHashMap aCustomShapeProperties(xPropertySet->getPropertyValue("CustomShapeGeometry"));
-            sax_fastparser::FastAttributeList* pTextboxAttrList = m_pSerializer->createAttrList();
+            sax_fastparser::FastAttributeList* pTextboxAttrList = FastSerializerHelper::createAttrList();
             if (aCustomShapeProperties.find("TextPreRotateAngle") != aCustomShapeProperties.end())
             {
                 sal_Int32 nTextRotateAngle = aCustomShapeProperties["TextPreRotateAngle"].get<sal_Int32>();
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index f05dd1e9f5ea..3dc88987a29a 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -131,13 +131,13 @@ private:
                                  bool bWarnings=false,
                                  bool bReport=false);
 
-    RegError    checkBlop(store::OStoreStream& rValue,
+    static RegError checkBlop(store::OStoreStream& rValue,
                           const OUString& sTargetPath,
                           sal_uInt32 srcValueSize,
                           sal_uInt8* pSrcBuffer,
                           bool bReport=false);
 
-    RegError    mergeModuleValue(store::OStoreStream& rTargetValue,
+    static RegError mergeModuleValue(store::OStoreStream& rTargetValue,
                                  RegistryTypeReader& reader,
                                  RegistryTypeReader& reader2);
 
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 2cc19880d599..a2530b37280f 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -46,7 +46,7 @@ protected:
     sal_uInt32      nSize;      // Groesse der Instanzdaten dieser Klasse
                                 // mit Superklassen
     sal_uInt32      nOffInstData;// Offset auf eigen Instanzdaten
-    void            DestroyElements( RscBaseContInst * pClassData );
+    static void     DestroyElements( RscBaseContInst * pClassData );
     RSCINST         SearchElePos( const RSCINST & rInst, const RscId & rEleName,
                                   RscTop * pClass, sal_uInt32 nPos );
 protected:
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 6ddfe7d36fab..4cd9b41cd7bc 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -168,8 +168,8 @@ class RscTypCont
     RscArray *  InitLangStringList( RscCont * pStrLst );
     RscTupel *  InitStringTupel();
     RscTupel *  InitStringLongTupel();
-    RscCont  *  InitStringTupelList( RscTupel * pStringTupel );
-    RscCont  *  InitStringLongTupelList( RscTupel * pStringLongTupel );
+    static RscCont  *  InitStringTupelList( RscTupel * pStringTupel );
+    static RscCont  *  InitStringLongTupelList( RscTupel * pStringLongTupel );
     RscArray *  InitLangStringTupelList( RscCont * pStrTupelLst );
     RscArray *  InitLangStringLongTupelList( RscCont * pStrLongTupelLst );
 
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index a3e00137c3b7..2f6a6a71bf03 100644
--- a/rsc/inc/rscerror.h
+++ b/rsc/inc/rscerror.h
@@ -135,7 +135,7 @@ public:
     FILE *          GetListFile(){ return fListing; }
     RscVerbosity    GetVerbosity() const { return m_verbosity; }
     void            StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal );
-    void            StdErr( const char * );
+    static void     StdErr( const char * );
     void            LstOut( const char * );
     void            Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId,
                            const char * pMessage = NULL );
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index 738b0f80f9a8..0efe0d94d02e 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.hxx
@@ -157,7 +157,7 @@ public:
                     RscBool( Atom nId, sal_uInt32 nTypId );
     virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
                     // Der zulaessige Bereich wird gesetzt
-    ERRTYPE         SetRange( sal_Int32, sal_Int32 ){ return ERR_UNKNOWN_METHOD; }
+    static ERRTYPE  SetRange( sal_Int32, sal_Int32 ){ return ERR_UNKNOWN_METHOD; }
     ERRTYPE         SetBool( const RSCINST & rInst, bool b ) SAL_OVERRIDE
                         {
                             return SetNumber( rInst, (sal_Int32)b );
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index f0cc6e025353..5d982d2ff77a 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -69,7 +69,7 @@ class RscCompiler
 private:
     void            CreateResFile( const char * pRc );
 
-    bool            GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
+    static bool     GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
                                       const WriteRcContext& rContext,
                                       const OString& rBaseFileName,
                                       OString& rImagePath,
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 2e791f240d7a..ffad4d402b70 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -141,7 +141,7 @@ public:
     }
 
 private:
-    void printFailureLocation( const CppUnit::SourceLine &sourceLine )
+    static void printFailureLocation( const CppUnit::SourceLine &sourceLine )
     {
         if ( !sourceLine.isValid() )
             std::cerr << "unknown:0:";
@@ -149,12 +149,12 @@ private:
             std::cerr << sourceLine.fileName() << ":" << sourceLine.lineNumber() << ":";
     }
 
-    void printFailedTestName( const CppUnit::TestFailure &failure )
+    static void printFailedTestName( const CppUnit::TestFailure &failure )
     {
         std::cerr << failure.failedTestName() << std::endl;
     }
 
-    void printFailureMessage( const CppUnit::TestFailure &failure )
+    static void printFailureMessage( const CppUnit::TestFailure &failure )
     {
         std::cerr << failure.thrownException()->message().shortDescription() << std::endl;
         std::cerr << failure.thrownException()->message().details() << std::endl;
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index d3c3f95b5cd9..5b3f830ff76e 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -139,7 +139,7 @@ struct FileHandle_Impl
         sal_Sequence ** ppSequence,
         sal_uInt64 *    pBytesRead);
 
-    oslFileError writeSequence_Impl (
+    static oslFileError writeSequence_Impl (
         sal_Sequence ** ppSequence,
         size_t *        pnOffset,
         const void *    pBuffer,
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index a1e5a20fdbbe..b053f9fdb135 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -122,7 +122,7 @@ private:
 
     // extract the name from an environment variable
     // that is given in the form "NAME=VALUE"
-    OString env_var_name(const OString& env_var) const
+    static OString env_var_name(const OString& env_var)
     {
         sal_Int32 pos_equal_sign =
             env_var.indexOf('=');
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 526dd13fc7a0..b9ffee34ee5f 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -116,10 +116,10 @@ private:
     // if enough data is available to scan encoding
     // @return TRUE, when encoding is retrievable
     // @return FALSE, when more data is needed
-    bool isEncodingRecognizable( const ::com::sun::star::uno::Sequence< sal_Int8 > & seq );
+    static bool isEncodingRecognizable( const ::com::sun::star::uno::Sequence< sal_Int8 > & seq );
 
     // When encoding attribute is within the text (in the first line), it is removed.
-    void removeEncoding( ::com::sun::star::uno::Sequence<sal_Int8> &seq );
+    static void removeEncoding( ::com::sun::star::uno::Sequence<sal_Int8> &seq );
 
     // Initializes decoding depending on m_sEncoding setting
     void initializeDecoding();
diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx
index 69e9b1107e42..d3520254ab1c 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -84,7 +84,7 @@ XclExpSetup::XclExpSetup( const XclPageData& rPageData ) :
 
 void XclExpSetup::SaveXml( XclExpXmlStream& rStrm )
 {
-    sax_fastparser::FastAttributeList* pAttrList=rStrm.GetCurrentStream()->createAttrList();
+    sax_fastparser::FastAttributeList* pAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
     if( rStrm.getVersion() != oox::core::ISOIEC_29500_2008 ||
         mrData.mnStrictPaperSize != EXC_PAPERSIZE_USER )
     {
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 66d1da9fe02a..ae0915145dd6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -339,7 +339,7 @@ static void lcl_deleteAndResetTheLists( std::unique_ptr<sax_fastparser::FastAttr
 void DocxAttributeOutput::PopulateFrameProperties(const SwFrmFmt* pFrmFmt, const Size& rSize)
 {
 
-    sax_fastparser::FastAttributeList* attrList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* attrList = FastSerializerHelper::createAttrList();
 
     awt::Point aPos(pFrmFmt->GetHoriOrient().GetPos(), pFrmFmt->GetVertOrient().GetPos());
 
@@ -1809,7 +1809,7 @@ boost::optional<sal_Int32> lclGetElementIdForName(const OUString& rName)
 void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const css::uno::Sequence<css::beans::PropertyValue>& rElements, sax_fastparser::FSHelperPtr pSerializer)
 {
     css::uno::Sequence<css::beans::PropertyValue> aAttributes;
-    FastAttributeList* pAttributes = pSerializer->createAttrList();
+    FastAttributeList* pAttributes = FastSerializerHelper::createAttrList();
 
     for (sal_Int32 j=0; j < rElements.getLength(); ++j)
     {
@@ -2206,7 +2206,7 @@ bool DocxAttributeOutput::StartURL( const OUString& rUrl, const OUString& rTarge
     else
     {
         // Output a hyperlink XML element
-        m_pHyperlinkAttrList.reset(m_pSerializer->createAttrList());
+        m_pHyperlinkAttrList.reset(FastSerializerHelper::createAttrList());
 
         if ( !bBookmarkOnly )
         {
@@ -2557,7 +2557,7 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co
             pBorderLine->GetWidth() == convertMm100ToTwip( rStyleProps->LineWidth ) )
         return;
 
-    FastAttributeList* pAttr = pSerializer->createAttrList();
+    FastAttributeList* pAttr = FastSerializerHelper::createAttrList();
     pAttr->add( FSNS( XML_w, XML_val ), OString( pVal ) );
 
     if ( pBorderLine && !pBorderLine->isEmpty() )
@@ -3157,7 +3157,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
             m_aTableStyleConf[ BOX_LINE_RIGHT ] = aGrabBagElement->second.get<table::BorderLine2>();
         else if (aGrabBagElement->first == "TableStyleLook")
         {
-            FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+            FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
             uno::Sequence<beans::PropertyValue> aAttributeList = aGrabBagElement->second.get< uno::Sequence<beans::PropertyValue> >();
 
             for (sal_Int32 i = 0; i < aAttributeList.getLength(); ++i)
@@ -3187,7 +3187,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
         }
         else if (aGrabBagElement->first == "TablePosition" )
         {
-            FastAttributeList *attrListTablePos = m_pSerializer->createAttrList( );
+            FastAttributeList *attrListTablePos = FastSerializerHelper::createAttrList( );
             uno::Sequence<beans::PropertyValue> aTablePosition = aGrabBagElement->second.get<uno::Sequence<beans::PropertyValue> >();
             for (sal_Int32 i = 0; i < aTablePosition.getLength(); ++i)
             {
@@ -3699,7 +3699,7 @@ void DocxAttributeOutput::LatentStyles()
         return;
 
     // Extract default attributes first.
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     uno::Sequence<beans::PropertyValue> aLsdExceptions;
     for (sal_Int32 i = 0; i < aLatentStyles.getLength(); ++i)
     {
@@ -3716,7 +3716,7 @@ void DocxAttributeOutput::LatentStyles()
     // Then handle the exceptions.
     for (sal_Int32 i = 0; i < aLsdExceptions.getLength(); ++i)
     {
-        pAttributeList = m_pSerializer->createAttrList();
+        pAttributeList = FastSerializerHelper::createAttrList();
 
         uno::Sequence<beans::PropertyValue> aAttributes;
         aLsdExceptions[i].Value >>= aAttributes;
@@ -4087,7 +4087,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
     m_rExport.SdrExporter().startDMLAnchorInline(pFrmFmt, rSize);
 
     // picture description (used for pic:cNvPr later too)
-    ::sax_fastparser::FastAttributeList* docPrattrList = m_pSerializer->createAttrList();
+    ::sax_fastparser::FastAttributeList* docPrattrList = FastSerializerHelper::createAttrList();
     docPrattrList->add( XML_id, OString::number( m_anchorId++).getStr());
     docPrattrList->add( XML_name, OUStringToOString( pFrmFmt->GetName(), RTL_TEXTENCODING_UTF8 ) );
     docPrattrList->add( XML_descr, OUStringToOString( pGrfNode ? pGrfNode->GetDescription() : pOLEFrmFmt->GetObjDescription(), RTL_TEXTENCODING_UTF8 ).getStr());
@@ -5112,7 +5112,7 @@ void DocxAttributeOutput::StartStyle( const OUString& rName, StyleType eType,
 {
     bool bQFormat = false, bUnhideWhenUsed = false, bSemiHidden = false, bLocked = false, bDefault = false, bCustomStyle = false;
     OUString aLink, aRsid, aUiPriority;
-    FastAttributeList* pStyleAttributeList = m_pSerializer->createAttrList();
+    FastAttributeList* pStyleAttributeList = FastSerializerHelper::createAttrList();
     uno::Any aAny;
     if (eType == STYLE_TYPE_PARA || eType == STYLE_TYPE_CHAR)
     {
@@ -5409,7 +5409,7 @@ void DocxAttributeOutput::SectionFormProtection( bool bProtected )
 
 void DocxAttributeOutput::SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo )
 {
-    FastAttributeList* pAttr = m_pSerializer->createAttrList();
+    FastAttributeList* pAttr = FastSerializerHelper::createAttrList();
     pAttr->add( FSNS( XML_w, XML_countBy ), OString::number(rLnNumInfo.GetCountBy()).getStr());
     pAttr->add( FSNS( XML_w, XML_restart ), rLnNumInfo.IsRestartEachPage() ? "newPage" : "continuous" );
     if( rLnNumInfo.GetPosFromLeft())
@@ -5569,7 +5569,7 @@ void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::boo
 {
     // FIXME Not called properly with page styles like "First Page"
 
-    FastAttributeList* pAttr = m_pSerializer->createAttrList();
+    FastAttributeList* pAttr = FastSerializerHelper::createAttrList();
 
     // boost::none means no restart: then don't output that attribute if it is negative
     if ( oPageRestartNumber )
@@ -5629,7 +5629,7 @@ void DocxAttributeOutput::FontAlternateName( const OUString& rName ) const
 
 void DocxAttributeOutput::FontCharset( sal_uInt8 nCharSet, rtl_TextEncoding nEncoding ) const
 {
-    FastAttributeList* pAttr = m_pSerializer->createAttrList();
+    FastAttributeList* pAttr = FastSerializerHelper::createAttrList();
 
     OString aCharSet( OString::number( nCharSet, 16 ) );
     if ( aCharSet.getLength() == 1 )
@@ -6686,7 +6686,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes )
     sal_Int32 nBody = bFootnotes? XML_footnotes: XML_endnotes;
     sal_Int32 nItem = bFootnotes? XML_footnote:  XML_endnote;
 
-    m_pSerializer->startElementNS( XML_w, nBody, m_rExport.MainXmlNamespaces(m_pSerializer) );
+    m_pSerializer->startElementNS( XML_w, nBody, m_rExport.MainXmlNamespaces() );
 
     sal_Int32 nIndex = 0;
 
@@ -6905,7 +6905,7 @@ void DocxAttributeOutput::ParaWidows( const SvxWidowsItem& rWidows )
 static void impl_WriteTabElement( FSHelperPtr pSerializer,
                                   const SvxTabStop& rTab, long /* nCurrentLeft */ )
 {
-    FastAttributeList *pTabElementAttrList = pSerializer->createAttrList();
+    FastAttributeList *pTabElementAttrList = FastSerializerHelper::createAttrList();
 
     switch (rTab.GetAdjustment())
     {
@@ -7076,7 +7076,7 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
     }
     else if ( m_rExport.bOutPageDescs )
     {
-        FastAttributeList *attrList = m_pSerializer->createAttrList( );
+        FastAttributeList *attrList = FastSerializerHelper::createAttrList( );
         if ( m_rExport.pAktPageDesc->GetLandscape( ) )
             attrList->add( FSNS( XML_w, XML_orient ), "landscape" );
 
@@ -7136,7 +7136,7 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
     }
     else
     {
-        FastAttributeList *pLRSpaceAttrList = m_pSerializer->createAttrList();
+        FastAttributeList *pLRSpaceAttrList = FastSerializerHelper::createAttrList();
         if((0 != rLRSpace.GetTxtLeft()) || ((0 == rLRSpace.GetTxtLeft()) && rLRSpace.IsExplicitZeroMarginValLeft()))
         {
             pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_left : XML_start ) ), OString::number(  rLRSpace.GetTxtLeft() ) );
@@ -7282,7 +7282,7 @@ void DocxAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
         }
         if (!sType.isEmpty() || !sSide.isEmpty())
         {
-            m_rExport.SdrExporter().setFlyWrapAttrList(m_pSerializer->createAttrList());
+            m_rExport.SdrExporter().setFlyWrapAttrList(FastSerializerHelper::createAttrList());
             if (!sType.isEmpty())
                 m_rExport.SdrExporter().getFlyWrapAttrList()->add(XML_type, sType);
             if (!sSide.isEmpty())
@@ -7518,14 +7518,14 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
 
         if( !m_pBackgroundAttrList )
         {
-            m_pBackgroundAttrList.reset(m_pSerializer->createAttrList());
+            m_pBackgroundAttrList.reset(FastSerializerHelper::createAttrList());
             m_pBackgroundAttrList->add( FSNS( XML_w, XML_fill ), sColor.getStr() );
             m_pBackgroundAttrList->add( FSNS( XML_w, XML_val ), "clear" );
         }
         else if ( sOriginalFill != sColor )
         {
             // fill was modified during edition, theme fill attribute must be dropped
-            m_pBackgroundAttrList.reset(m_pSerializer->createAttrList());
+            m_pBackgroundAttrList.reset(FastSerializerHelper::createAttrList());
             m_pBackgroundAttrList->add( FSNS( XML_w, XML_fill ), sColor.getStr() );
             m_pBackgroundAttrList->add( FSNS( XML_w, XML_val ), "clear" );
         }
@@ -7747,7 +7747,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
 void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& rCol, bool bEven, SwTwips nPageSize )
 {
     // Get the columns attributes
-    FastAttributeList *pColsAttrList = m_pSerializer->createAttrList();
+    FastAttributeList *pColsAttrList = FastSerializerHelper::createAttrList();
 
     pColsAttrList->add( FSNS( XML_w, XML_num ),
             OString::number( nCols ). getStr( ) );
@@ -7777,7 +7777,7 @@ void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol&
     {
         for ( sal_uInt16 n = 0; n < nCols; ++n )
         {
-            FastAttributeList *pColAttrList = m_pSerializer->createAttrList();
+            FastAttributeList *pColAttrList = FastSerializerHelper::createAttrList();
             sal_uInt16 nWidth = rCol.CalcPrtColWidth( n, ( sal_uInt16 ) nPageSize );
             pColAttrList->add( FSNS( XML_w, XML_w ),
                     OString::number( nWidth ).getStr( ) );
@@ -7803,7 +7803,7 @@ void DocxAttributeOutput::FormatKeep( const SvxFmtKeepItem& )
 
 void DocxAttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
 {
-    FastAttributeList *pGridAttrList = m_pSerializer->createAttrList();
+    FastAttributeList *pGridAttrList = FastSerializerHelper::createAttrList();
 
     OString sGridType;
     switch ( rGrid.GetGridType( ) )
@@ -8389,7 +8389,7 @@ void DocxAttributeOutput::AddToAttrList( std::unique_ptr<sax_fastparser::FastAtt
 void DocxAttributeOutput::AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrs, ... )
 {
     if( !pAttrList )
-        pAttrList.reset(m_pSerializer->createAttrList());
+        pAttrList.reset(FastSerializerHelper::createAttrList());
 
     va_list args;
     va_start( args, nAttrs );
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index c800a8d4c26c..96c8c7ca3ca3 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -626,7 +626,7 @@ void DocxExport::WritePostitFields()
             m_pFilter->openFragmentStreamWithSerializer( "word/comments.xml",
                     "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml" );
 
-        pPostitFS->startElementNS( XML_w, XML_comments, MainXmlNamespaces( pPostitFS ));
+        pPostitFS->startElementNS( XML_w, XML_comments, MainXmlNamespaces());
         m_pAttrOutput->SetSerializer( pPostitFS );
         m_pAttrOutput->WritePostitFields();
         m_pAttrOutput->SetSerializer( m_pDocumentFS );
@@ -684,7 +684,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char*
         pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().append("word/").append( aName ).makeStringAndClear(),
                     "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml" );
 
-        pFS->startElementNS( XML_w, XML_hdr, MainXmlNamespaces( pFS ));
+        pFS->startElementNS( XML_w, XML_hdr, MainXmlNamespaces());
     }
     else
     {
@@ -697,7 +697,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char*
         pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().append("word/").append( aName ).makeStringAndClear(),
                     "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml" );
 
-        pFS->startElementNS( XML_w, XML_ftr, MainXmlNamespaces( pFS ));
+        pFS->startElementNS( XML_w, XML_ftr, MainXmlNamespaces());
     }
 
     // switch the serializer to redirect the output to word/styles.xml
@@ -1303,7 +1303,7 @@ boost::optional<SvxBrushItem> DocxExport::getBackground()
 void DocxExport::WriteMainText()
 {
     // setup the namespaces
-    m_pDocumentFS->startElementNS( XML_w, XML_document, MainXmlNamespaces( m_pDocumentFS ));
+    m_pDocumentFS->startElementNS( XML_w, XML_document, MainXmlNamespaces());
 
     // Write background page color
     if (boost::optional<SvxBrushItem> oBrush = getBackground())
@@ -1333,9 +1333,9 @@ void DocxExport::WriteMainText()
     m_pDocumentFS->endElementNS( XML_w, XML_document );
 }
 
-XFastAttributeListRef DocxExport::MainXmlNamespaces( FSHelperPtr serializer )
+XFastAttributeListRef DocxExport::MainXmlNamespaces()
 {
-    FastAttributeList* pAttr = serializer->createAttrList();
+    FastAttributeList* pAttr = FastSerializerHelper::createAttrList();
     pAttr->add( FSNS( XML_xmlns, XML_o ), "urn:schemas-microsoft-com:office:office" );
     pAttr->add( FSNS( XML_xmlns, XML_r ), "http://schemas.openxmlformats.org/officeDocument/2006/relationships" );
     pAttr->add( FSNS( XML_xmlns, XML_v ), "urn:schemas-microsoft-com:vml" );
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index df9251d1ba56..ac1bbb3b2963 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -253,7 +253,7 @@ private:
 
 public:
     /// All xml namespaces to be used at the top of any text .xml file (main doc, headers, footers,...)
-    sax_fastparser::XFastAttributeListRef MainXmlNamespaces( sax_fastparser::FSHelperPtr serializer );
+    sax_fastparser::XFastAttributeListRef MainXmlNamespaces();
 
     /// FIXME this is temporary, remotely reminding the method of the same
     /// name in WW8Export.
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index dbf20318d60e..5d5766af58e6 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -35,6 +35,7 @@
 
 using namespace com::sun::star;
 using namespace oox;
+using namespace sax_fastparser;
 
 namespace
 {
@@ -357,7 +358,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
 
     if (isAnchor)
     {
-        sax_fastparser::FastAttributeList* attrList = m_pImpl->m_pSerializer->createAttrList();
+        sax_fastparser::FastAttributeList* attrList = FastSerializerHelper::createAttrList();
         bool bOpaque = pFrmFmt->GetOpaque().GetValue();
         awt::Point aPos(pFrmFmt->GetHoriOrient().GetPos(), pFrmFmt->GetVertOrient().GetPos());
         const SdrObject* pObj = pFrmFmt->FindRealSdrObject();
@@ -546,7 +547,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
     }
     else
     {
-        sax_fastparser::FastAttributeList* aAttrList = m_pImpl->m_pSerializer->createAttrList();
+        sax_fastparser::FastAttributeList* aAttrList = FastSerializerHelper::createAttrList();
         aAttrList->add(XML_distT, OString::number(TwipsToEMU(pULSpaceItem.GetUpper())).getStr());
         aAttrList->add(XML_distB, OString::number(TwipsToEMU(pULSpaceItem.GetLower())).getStr());
         aAttrList->add(XML_distL, OString::number(TwipsToEMU(pLRSpaceItem.GetLeft())).getStr());
@@ -807,7 +808,7 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrmFmt*
     Size aSize(pSdrObject->GetLogicRect().GetWidth(), pSdrObject->GetLogicRect().GetHeight());
     startDMLAnchorInline(pFrmFmt, aSize);
 
-    sax_fastparser::FastAttributeList* pDocPrAttrList = pFS->createAttrList();
+    sax_fastparser::FastAttributeList* pDocPrAttrList = FastSerializerHelper::createAttrList();
     pDocPrAttrList->add(XML_id, OString::number(nAnchorId).getStr());
     pDocPrAttrList->add(XML_name, OUStringToOString(pSdrObject->GetName(), RTL_TEXTENCODING_UTF8).getStr());
     if (!pSdrObject->GetTitle().isEmpty())
@@ -1144,7 +1145,7 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFr
     startDMLAnchorInline(&rFrmFmt, aSize);
 
     // generate an unique id
-    sax_fastparser::FastAttributeList* pDocPrAttrList = pFS->createAttrList();
+    sax_fastparser::FastAttributeList* pDocPrAttrList = FastSerializerHelper::createAttrList();
     pDocPrAttrList->add(XML_id, OString::number(nAnchorId).getStr());
     OUString sName = "Diagram" + OUString::number(nAnchorId);
     pDocPrAttrList->add(XML_name, OUStringToOString(sName, RTL_TEXTENCODING_UTF8).getStr());
@@ -1295,7 +1296,7 @@ void DocxSdrExport::writeOnlyTextOfFrame(sw::Frame* pParentFrame)
     //Save data here and restore when out of scope
     ExportDataSaveRestore aDataGuard(m_pImpl->m_rExport, nStt, nEnd, pParentFrame);
 
-    m_pImpl->m_pBodyPrAttrList = pFS->createAttrList();
+    m_pImpl->m_pBodyPrAttrList = FastSerializerHelper::createAttrList();
     m_pImpl->m_bFrameBtLr = checkFrameBtlr(m_pImpl->m_rExport.pDoc->GetNodes()[nStt], 0);
     m_pImpl->m_bFlyFrameGraphic = true;
     m_pImpl->m_rExport.WriteText();
@@ -1354,7 +1355,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
     if (xPropertySet.is())
         xPropSetInfo = xPropertySet->getPropertySetInfo();
 
-    m_pImpl->m_pBodyPrAttrList = pFS->createAttrList();
+    m_pImpl->m_pBodyPrAttrList = FastSerializerHelper::createAttrList();
     {
         drawing::TextVerticalAdjust eAdjust = drawing::TextVerticalAdjust_TOP;
         if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("TextVerticalAdjust"))
@@ -1366,7 +1367,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
     {
         startDMLAnchorInline(&rFrmFmt, aSize);
 
-        sax_fastparser::FastAttributeList* pDocPrAttrList = pFS->createAttrList();
+        sax_fastparser::FastAttributeList* pDocPrAttrList = FastSerializerHelper::createAttrList();
         pDocPrAttrList->add(XML_id, OString::number(nAnchorId).getStr());
         pDocPrAttrList->add(XML_name, OUStringToOString(rFrmFmt.GetName(), RTL_TEXTENCODING_UTF8).getStr());
         sax_fastparser::XFastAttributeListRef xDocPrAttrListRef(pDocPrAttrList);
@@ -1583,8 +1584,8 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame* pParentFrame, bool bTextBoxOnly
     m_pImpl->m_pFlyFrameSize = &aSize;
 
     m_pImpl->m_bTextFrameSyntax = true;
-    m_pImpl->m_pFlyAttrList.reset(pFS->createAttrList());
-    m_pImpl->m_pTextboxAttrList = pFS->createAttrList();
+    m_pImpl->m_pFlyAttrList.reset(FastSerializerHelper::createAttrList());
+    m_pImpl->m_pTextboxAttrList = FastSerializerHelper::createAttrList();
     m_pImpl->m_aTextFrameStyle = "position:absolute";
     if (!bTextBoxOnly)
     {
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx
index f3113e94698f..9641a5e72c42 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -16,6 +16,7 @@
 
 using namespace com::sun::star;
 using namespace oox;
+using namespace sax_fastparser;
 
 /// Methods in this class handle values in a table style.
 struct DocxTableStyleExport::Impl
@@ -67,7 +68,7 @@ void DocxTableStyleExport::CharFormat(css::uno::Sequence<css::beans::PropertyVal
 
 void DocxTableStyleExport::CnfStyle(uno::Sequence<beans::PropertyValue>& rAttributeList)
 {
-    sax_fastparser::FastAttributeList* pAttributeList = m_pImpl->m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
 
     for (sal_Int32 j = 0; j < rAttributeList.getLength(); ++j)
     {
@@ -177,7 +178,7 @@ void DocxTableStyleExport::Impl::tableStyleTcBorder(sal_Int32 nToken, const uno:
     if (!rTcBorder.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rTcBorder.getLength(); ++i)
         if (sal_Int32 nAttrToken = DocxStringGetToken(aTcBorderTokens, rTcBorder[i].Name))
             pAttributeList->add(FSNS(XML_w, nAttrToken), rTcBorder[i].Value.get<OUString>().toUtf8());
@@ -218,7 +219,7 @@ void DocxTableStyleExport::Impl::tableStyleShd(uno::Sequence<beans::PropertyValu
     if (!rShd.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rShd.getLength(); ++i)
     {
         if (rShd[i].Name == "val")
@@ -243,7 +244,7 @@ void DocxTableStyleExport::Impl::tableStyleRColor(uno::Sequence<beans::PropertyV
     if (!rColor.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rColor.getLength(); ++i)
     {
         if (rColor[i].Name == "val")
@@ -264,7 +265,7 @@ void DocxTableStyleExport::Impl::tableStyleRLang(uno::Sequence<beans::PropertyVa
     if (!rLang.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rLang.getLength(); ++i)
     {
         if (rLang[i].Name == "eastAsia")
@@ -283,7 +284,7 @@ void DocxTableStyleExport::Impl::tableStyleRRFonts(uno::Sequence<beans::Property
     if (!rRFonts.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rRFonts.getLength(); ++i)
     {
         if (rRFonts[i].Name == "eastAsiaTheme")
@@ -304,7 +305,7 @@ void DocxTableStyleExport::Impl::tableStylePSpacing(uno::Sequence<beans::Propert
     if (!rSpacing.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rSpacing.getLength(); ++i)
     {
         if (rSpacing[i].Name == "after")
@@ -335,7 +336,7 @@ void DocxTableStyleExport::Impl::tableStylePInd(uno::Sequence<beans::PropertyVal
     if (!rInd.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rInd.getLength(); ++i)
     {
         if (rInd[i].Name == "rightChars")
@@ -352,7 +353,7 @@ void DocxTableStyleExport::Impl::tableStyleTblInd(uno::Sequence<beans::PropertyV
     if (!rTblInd.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rTblInd.getLength(); ++i)
     {
         if (rTblInd[i].Name == "w")
@@ -368,7 +369,7 @@ void DocxTableStyleExport::Impl::handleBoolean(const OUString& aValue, sal_Int32
 {
     if (aValue.isEmpty())
         return;
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     if (aValue != "1")
         pAttributeList->add(FSNS(XML_w, XML_val), aValue.toUtf8());
     sax_fastparser::XFastAttributeListRef xAttributeList(pAttributeList);
@@ -633,7 +634,7 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>&
             aTblStylePrs.push_back(rStyle[i].Value.get< uno::Sequence<beans::PropertyValue> >());
     }
 
-    sax_fastparser::FastAttributeList* pAttributeList = m_pSerializer->createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
     pAttributeList->add(FSNS(XML_w, XML_type), "table");
     if (bDefault)
         pAttributeList->add(FSNS(XML_w, XML_default), "1");