loplugin:checkunusedparams in xmloff

Change-Id: I59d2cb1f69882b62e6fe732e9d9214feec8a79a2
Reviewed-on: https://gerrit.libreoffice.org/37283
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

39 files changed, 158 insertions, 303 deletions

diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 02b1e754874c..484a6a15bb52 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -1234,26 +1234,10 @@ void ODBExport::ExportAutoStyles_()
     if ( getExportFlags() & SvXMLExportFlags::CONTENT )
     {
         collectComponentStyles();
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_TABLE
-                                        ,GetDocHandler()
-                                        ,GetMM100UnitConverter()
-                                        ,GetNamespaceMap()
-        );
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_COLUMN
-                                        ,GetDocHandler()
-                                        ,GetMM100UnitConverter()
-                                        ,GetNamespaceMap()
-        );
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL
-                                        ,GetDocHandler()
-                                        ,GetMM100UnitConverter()
-                                        ,GetNamespaceMap()
-        );
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_ROW
-                                        ,GetDocHandler()
-                                        ,GetMM100UnitConverter()
-                                        ,GetNamespaceMap()
-        );
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_TABLE);
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_COLUMN);
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL);
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_ROW);
         exportDataStyles();
     }
 }
diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx
index 66a8ec7e297b..8822dce490fd 100644
--- a/include/xmloff/animexp.hxx
+++ b/include/xmloff/animexp.hxx
@@ -36,7 +36,7 @@ public:
     XMLAnimationsExporter( XMLShapeExport* pShapeExp );
     virtual ~XMLAnimationsExporter() override;
 
-    void prepare( const css::uno::Reference< css::drawing::XShape >& xShape, SvXMLExport& rExport );
+    void prepare( const css::uno::Reference< css::drawing::XShape >& xShape );
     void collect( const css::uno::Reference< css::drawing::XShape >& xShape, SvXMLExport& rExport );
     void exportAnimations( SvXMLExport& rExport );
 };
diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx
index 2befda493270..71360832c512 100644
--- a/include/xmloff/nmspmap.hxx
+++ b/include/xmloff/nmspmap.hxx
@@ -126,7 +126,7 @@ public:
     static bool NormalizeW3URI( OUString& rName );
     static bool NormalizeURI( OUString& rName );
 
-/* deprecated */ void AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix,
+/* deprecated */ void AddAtIndex( const OUString& rPrefix,
                      const OUString& rName, sal_uInt16 nKey );
 /* deprecated */ static sal_uInt16 GetIndexByKey( sal_uInt16 nKey );
 /* deprecated */ sal_uInt16 GetIndexByPrefix( const OUString& rPrefix ) const;
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index 56588fa63ab1..ae86e12cc231 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -219,26 +219,26 @@ private:
     SAL_DLLPRIVATE void ImpExportGluePoints( const css::uno::Reference< css::drawing::XShape >& xShape );
 
     // single shape exporters
-    SAL_DLLPRIVATE void ImpExportGroupShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
-    SAL_DLLPRIVATE void ImpExport3DSceneShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
-    SAL_DLLPRIVATE void ImpExportRectangleShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
-    SAL_DLLPRIVATE void ImpExportLineShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
-    SAL_DLLPRIVATE void ImpExportEllipseShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportGroupShape( const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExport3DSceneShape( const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportRectangleShape( const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportLineShape(const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportEllipseShape(const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
     SAL_DLLPRIVATE void ImpExportPolygonShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
     SAL_DLLPRIVATE void ImpExportTextBoxShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
     SAL_DLLPRIVATE void ImpExportGraphicObjectShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
     SAL_DLLPRIVATE void ImpExportChartShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr, SvXMLAttributeList* pAttrList = nullptr );
-    SAL_DLLPRIVATE void ImpExportControlShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT,  css::awt::Point* pRefPoint = nullptr );
-    SAL_DLLPRIVATE void ImpExportConnectorShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
-    SAL_DLLPRIVATE void ImpExportMeasureShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT,  css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportControlShape(const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT,  css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportConnectorShape(const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportMeasureShape(const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT,  css::awt::Point* pRefPoint = nullptr );
     SAL_DLLPRIVATE void ImpExportOLE2Shape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr, SvXMLAttributeList* pAttrList = nullptr );
     SAL_DLLPRIVATE void ImpExportPageShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
-    SAL_DLLPRIVATE void ImpExportCaptionShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportCaptionShape(const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
     SAL_DLLPRIVATE void ImpExport3DShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType );
-    SAL_DLLPRIVATE void ImpExportFrameShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
-    SAL_DLLPRIVATE void ImpExportPluginShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
-    SAL_DLLPRIVATE void ImpExportAppletShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
-    SAL_DLLPRIVATE void ImpExportCustomShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportFrameShape( const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportPluginShape( const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportAppletShape( const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
+    SAL_DLLPRIVATE void ImpExportCustomShape( const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
     SAL_DLLPRIVATE void ImpExportMediaShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
     SAL_DLLPRIVATE void ImpExportTableShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT,    css::awt::Point* pRefPoint = nullptr );
 public:
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 172131a45650..3702d2103d07 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -273,7 +273,7 @@ protected:
     void exportText(
         const css::uno::Reference< css::text::XText > & rText,
         const css::uno::Reference< css::text::XTextSection > & rBaseSection,
-        bool bAutoStyles, bool bProgress, bool bExportParagraph, TextPNS eExtensionNS = TextPNS::ODF );
+        bool bAutoStyles, bool bProgress, bool bExportParagraph );
 
     void exportTextContentEnumeration(
         const css::uno::Reference< css::container::XEnumeration > & rContentEnum,
@@ -370,9 +370,7 @@ protected:
         const enum ::xmloff::token::XMLTokenEnum pElements[],
         bool bAutoStyles);
 
-    void exportSoftPageBreak(
-        const css::uno::Reference< css::beans::XPropertySet> & rPropSet,
-        bool bAutoStyles);
+    void exportSoftPageBreak();
 
     void exportTextRange(
         const css::uno::Reference< css::text::XTextRange > & rTextRange,
@@ -537,10 +535,9 @@ public:
     void exportText(
         const css::uno::Reference< css::text::XText > & rText,
         const css::uno::Reference< css::text::XTextSection > & rBaseSection,
-        bool bIsProgress,
-        TextPNS eExtensionNS = TextPNS::ODF)
+        bool bIsProgress)
     {
-        exportText( rText, rBaseSection, false, bIsProgress, true/*bExportParagraph*/, eExtensionNS );
+        exportText( rText, rBaseSection, false, bIsProgress, true/*bExportParagraph*/ );
     }
 
     void exportFramesBoundToPage( bool bIsProgress )
diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx
index f99f1ea5bccc..a9cf607d0268 100644
--- a/include/xmloff/xmlaustp.hxx
+++ b/include/xmloff/xmlaustp.hxx
@@ -113,11 +113,7 @@ public:
     OUString Find( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const;
 
     /** Export all item sets ofs a certain class in the order in that they have been added. */
-    void exportXML( sal_Int32 nFamily,
-        const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap
-        ) const;
+    void exportXML( sal_Int32 nFamily ) const;
 
     void ClearEntries();
 };
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index d80d7c8e9ae8..b2f564e186ec 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -79,7 +79,6 @@ protected:
                      const ::std::vector< XMLPropertyState >& rProperties,
                      const SvXMLUnitConverter& rUnitConverter,
                      const SvXMLNamespaceMap& rNamespaceMap,
-                     SvXmlExportFlags nFlags,
                      std::vector<sal_uInt16>* pIndexArray,
                        sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx ) const;
 
@@ -87,7 +86,6 @@ protected:
                      const XMLPropertyState& rProperty,
                      const SvXMLUnitConverter& rUnitConverter,
                      const SvXMLNamespaceMap& rNamespaceMap,
-                     SvXmlExportFlags nFlags,
                      const ::std::vector< XMLPropertyState > *pProperties,
                      sal_uInt32 nIdx ) const;
 
diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx
index 3aab9d1b9bdf..e84eb3b8b5a4 100644
--- a/include/xmloff/xmlmetai.hxx
+++ b/include/xmloff/xmlmetai.hxx
@@ -44,7 +44,7 @@ public:
         const OUString& rLName,
         const css::uno::Reference< css::document::XDocumentProperties>& xDocProps);
 
-    SvXMLMetaDocumentContext(SvXMLImport& rImport, sal_Int32 nElement,
+    SvXMLMetaDocumentContext(SvXMLImport& rImport,
         const css::uno::Reference< css::document::XDocumentProperties>& xDocProps);
 
     virtual ~SvXMLMetaDocumentContext() override;
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 0f4940df4269..08a80288d186 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1325,28 +1325,10 @@ void ORptExport::ExportAutoStyles_()
     if ( getExportFlags() & SvXMLExportFlags::CONTENT )
     {
         collectComponentStyles();
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_TABLE
-                                        ,GetDocHandler()
-                                        ,GetMM100UnitConverter()
-                                        ,GetNamespaceMap()
-        );
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_COLUMN
-                                        ,GetDocHandler()
-                                        ,GetMM100UnitConverter()
-                                        ,GetNamespaceMap()
-        );
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_ROW
-                                        ,GetDocHandler()
-                                        ,GetMM100UnitConverter()
-                                        ,GetNamespaceMap()
-        );
-
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL
-                                        ,GetDocHandler()
-                                        ,GetMM100UnitConverter()
-                                        ,GetNamespaceMap()
-        );
-
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_TABLE);
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_COLUMN);
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_ROW);
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL);
         exportDataStyles();
         GetShapeExport()->exportAutoStyles();
     }
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index d311a6730305..c858096c42f9 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2660,15 +2660,11 @@ void ScXMLExport::ExportAutoStyles_()
 
         pChangeTrackingExportHelper->CollectAutoStyles();
 
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_COLUMN,
-            GetDocHandler(), GetMM100UnitConverter(), GetNamespaceMap());
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_ROW,
-            GetDocHandler(), GetMM100UnitConverter(), GetNamespaceMap());
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_TABLE,
-            GetDocHandler(), GetMM100UnitConverter(), GetNamespaceMap());
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_COLUMN);
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_ROW);
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_TABLE);
         exportAutoDataStyles();
-        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL,
-            GetDocHandler(), GetMM100UnitConverter(), GetNamespaceMap());
+        GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL);
 
         GetShapeExport()->exportAutoStyles();
         GetFormExport()->exportAutoStyles( );
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 3e72945121b3..758d27951432 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -313,7 +313,7 @@ ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, sal_
                                                    const uno::Reference<document::XDocumentProperties>& i_xDocProps) :
 SvXMLImportContext(i_rImport),
 ScXMLDocContext_Impl(i_rImport, nElement, i_xAttrList),
-SvXMLMetaDocumentContext(i_rImport, nElement, i_xDocProps)
+SvXMLMetaDocumentContext(i_rImport, i_xDocProps)
 {
 }
 
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index cea9782d64d8..a6e3821b89ac 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -54,7 +54,7 @@ public:
     virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
 
-    static void postProcessRootNode( SvXMLImport& rImport, const css::uno::Reference< css::animations::XAnimationNode >& xNode, css::uno::Reference< css::beans::XPropertySet >& xPageProps );
+    static void postProcessRootNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, css::uno::Reference< css::beans::XPropertySet >& xPageProps );
 };
 
 }
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 8e264843e2dd..80512e58b0a3 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -319,9 +319,6 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
     if( xVisualObject.is() )
         maChartSize = xVisualObject->getVisualAreaSize( embed::Aspects::MSOLE_CONTENT ); //#i103460# take the size given from the parent frame as default
 
-    // this flag is necessary for pie charts in the core
-    bool bSetSwitchData = false;
-
     OUString sAutoStyleName;
     OUString aOldChartTypeName;
     bool bHasAddin = false;
@@ -356,9 +353,6 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
                             maChartTypeServiceName = SchXMLTools::GetChartTypeByClassName( sClassName, false /* bUseOldNames */ );
                             switch( eChartTypeEnum )
                             {
-                            case XML_CHART_CLASS_CIRCLE:
-                                bSetSwitchData = true;
-                                break;
                             case XML_CHART_CLASS_STOCK:
                                 mbIsStockChart = true;
                                 break;
@@ -419,7 +413,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
     if( xVisualObject.is() )
         xVisualObject->setVisualAreaSize( embed::Aspects::MSOLE_CONTENT, maChartSize );
 
-    InitChart( aOldChartTypeName, bSetSwitchData);
+    InitChart( aOldChartTypeName);
 
     if( bHasAddin )
     {
@@ -1164,8 +1158,8 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
         4.  Set the chart type.
 */
 void SchXMLChartContext::InitChart(
-    const OUString & rChartTypeServiceName, // currently the old service name
-    bool /* bSetSwitchData */ )
+    const OUString & rChartTypeServiceName // currently the old service name
+    )
 {
     uno::Reference< chart::XChartDocument > xDoc = mrImportHelper.GetChartDocument();
     SAL_WARN_IF( !xDoc.is(), "xmloff.chart", "No valid document!" );
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index 11b69987ac93..da5514c246e4 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -119,11 +119,8 @@ private:
     /** @descr  This method bundles some settings to the chart model and executes them with
             a locked controller.  This includes setting the chart type.
         @param  aServiceName The name of the service the diagram is initialized with.
-        @param  bSetSwitchData   Indicates whether the data set takes it's data series from
-            rows or from columns.
     */
-    void    InitChart   (const OUString & rChartTypeServiceName,
-                        bool bSetSwitchData);
+    void    InitChart   (const OUString & rChartTypeServiceName);
 
     void MergeSeriesForStockChart();
 };
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 35f4a3ffd0be..085f949eac80 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1006,12 +1006,7 @@ void SchXMLExportHelper_Impl::exportAutoStyles()
         mrExport.exportAutoDataStyles();
 
         // export chart auto styles
-        mrAutoStylePool.exportXML(
-            XML_STYLE_FAMILY_SCH_CHART_ID
-            , mrExport.GetDocHandler(),
-            mrExport.GetMM100UnitConverter(),
-            mrExport.GetNamespaceMap()
-            );
+        mrAutoStylePool.exportXML( XML_STYLE_FAMILY_SCH_CHART_ID );
 
         // export auto styles for additional shapes
         mrExport.GetShapeExport()->exportAutoStyles();
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 3acc39b2a9d5..3edd65c43090 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -383,7 +383,7 @@ sal_uInt16 SvXMLNamespaceMap::GetNextIndex( sal_uInt16 nOldIdx ) const
     return (++aIter == aNameMap.end()) ? USHRT_MAX : (*aIter).second->nKey;
 }
 
-void SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix,
+void SvXMLNamespaceMap::AddAtIndex( const OUString& rPrefix,
                                     const OUString& rName, sal_uInt16 nKey )
 {
     if( XML_NAMESPACE_UNKNOWN == nKey )
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 108ab89f5299..cf678bdfca79 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1334,7 +1334,7 @@ Reference< XAnimationNode > SAL_CALL AnimationsImport::getAnimationNode()
     return mxRootNode;
 }
 
-void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const Reference< XAnimationNode >& xRootNode, Reference< XPropertySet >& xPageProps )
+void AnimationNodeContext::postProcessRootNode( const Reference< XAnimationNode >& xRootNode, Reference< XPropertySet >& xPageProps )
 {
     if( xRootNode.is() && xPageProps.is() ) try
     {
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index a5d8f0ba8e58..fededf9f6fcf 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -266,7 +266,7 @@ XMLAnimationsExporter::~XMLAnimationsExporter()
 {
 }
 
-void XMLAnimationsExporter::prepare( const Reference< XShape >& xShape, SvXMLExport& )
+void XMLAnimationsExporter::prepare( const Reference< XShape >& xShape )
 {
     try
     {
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 75f7608fa237..19328c6a6af7 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2156,12 +2156,7 @@ void SdXMLExport::ExportAutoStyles_()
     }
 
     // export draw-page styles
-    GetAutoStylePool()->exportXML(
-        XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID
-        , GetDocHandler(),
-        GetMM100UnitConverter(),
-        GetNamespaceMap()
-        );
+    GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID );
 
     if( getExportFlags() & SvXMLExportFlags::STYLES )
     {
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 1807d766a8d4..059dfa2d6567 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -515,7 +515,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
 
     // prepare animation information if needed
     if( mxAnimationsExporter.is() )
-        mxAnimationsExporter->prepare( xShape, mrExport );
+        mxAnimationsExporter->prepare( xShape );
 
     // check for special shapes
 
@@ -789,17 +789,17 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
     {
         case XmlShapeTypeDrawRectangleShape:
         {
-            ImpExportRectangleShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportRectangleShape(xShape, nFeatures, pRefPoint );
             break;
         }
         case XmlShapeTypeDrawEllipseShape:
         {
-            ImpExportEllipseShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportEllipseShape(xShape, nFeatures, pRefPoint );
             break;
         }
         case XmlShapeTypeDrawLineShape:
         {
-            ImpExportLineShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportLineShape(xShape, nFeatures, pRefPoint );
             break;
         }
         case XmlShapeTypeDrawPolyPolygonShape:  // closed PolyPolygon
@@ -841,19 +841,19 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
 
         case XmlShapeTypeDrawControlShape:
         {
-            ImpExportControlShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportControlShape(xShape, nFeatures, pRefPoint );
             break;
         }
 
         case XmlShapeTypeDrawConnectorShape:
         {
-            ImpExportConnectorShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportConnectorShape(xShape, nFeatures, pRefPoint );
             break;
         }
 
         case XmlShapeTypeDrawMeasureShape:
         {
-            ImpExportMeasureShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportMeasureShape(xShape, nFeatures, pRefPoint );
             break;
         }
 
@@ -883,7 +883,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
 
         case XmlShapeTypeDrawCaptionShape:
         {
-            ImpExportCaptionShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportCaptionShape(xShape, nFeatures, pRefPoint );
             break;
         }
 
@@ -898,41 +898,41 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
 
         case XmlShapeTypeDraw3DSceneObject:
         {
-            ImpExport3DSceneShape( xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExport3DSceneShape( xShape, nFeatures, pRefPoint );
             break;
         }
 
         case XmlShapeTypeDrawGroupShape:
         {
             // empty group
-            ImpExportGroupShape( xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportGroupShape( xShape, nFeatures, pRefPoint );
             break;
         }
 
         case XmlShapeTypeDrawFrameShape:
         {
-            ImpExportFrameShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportFrameShape(xShape, nFeatures, pRefPoint );
             break;
         }
 
         case XmlShapeTypeDrawAppletShape:
         {
-            ImpExportAppletShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportAppletShape(xShape, nFeatures, pRefPoint );
             break;
         }
 
         case XmlShapeTypeDrawPluginShape:
         {
-            ImpExportPluginShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+            ImpExportPluginShape(xShape, nFeatures, pRefPoint );
             break;
         }
 
         case XmlShapeTypeDrawCustomShape:
         {
             if ( aShapeInfo.xCustomShapeReplacement.is() )
-                ImpExportGroupShape( aShapeInfo.xCustomShapeReplacement, XmlShapeTypeDrawGroupShape, nFeatures, pRefPoint );
+                ImpExportGroupShape( aShapeInfo.xCustomShapeReplacement, nFeatures, pRefPoint );
             else
-                ImpExportCustomShape( xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
+                ImpExportCustomShape( xShape, nFeatures, pRefPoint );
             break;
         }
 
@@ -1039,22 +1039,12 @@ void XMLShapeExport::exportAutoStyles()
 
     // ...for graphic
     {
-        GetExport().GetAutoStylePool()->exportXML(
-            XML_STYLE_FAMILY_SD_GRAPHICS_ID
-            , GetExport().GetDocHandler(),
-            GetExport().GetMM100UnitConverter(),
-            GetExport().GetNamespaceMap()
-            );
+        GetExport().GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_SD_GRAPHICS_ID );
     }
 
     // ...for presentation
     {
-        GetExport().GetAutoStylePool()->exportXML(
-            XML_STYLE_FAMILY_SD_PRESENTATION_ID
-            , GetExport().GetDocHandler(),
-            GetExport().GetMM100UnitConverter(),
-            GetExport().GetNamespaceMap()
-            );
+        GetExport().GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_SD_PRESENTATION_ID );
     }
 
     if( mxShapeTableExport.is() )
@@ -1818,7 +1808,7 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape
     }
 }
 
-void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, XMLShapeExportFlags nFeatures, awt::Point* pRefPoint)
+void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape >& xShape, XMLShapeExportFlags nFeatures, awt::Point* pRefPoint)
 {
     uno::Reference< drawing::XShapes > xShapes(xShape, uno::UNO_QUERY);
     if(xShapes.is() && xShapes->getCount())
@@ -1952,7 +1942,7 @@ void XMLShapeExport::ImpExportTextBoxShape(
 
 void XMLShapeExport::ImpExportRectangleShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint)
+    XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint)
 {
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
@@ -1984,7 +1974,7 @@ void XMLShapeExport::ImpExportRectangleShape(
 
 void XMLShapeExport::ImpExportLineShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures, awt::Point* pRefPoint)
+    XMLShapeExportFlags nFeatures, awt::Point* pRefPoint)
 {
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
@@ -2095,7 +2085,7 @@ void XMLShapeExport::ImpExportLineShape(
 
 void XMLShapeExport::ImpExportEllipseShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures, awt::Point* pRefPoint)
+    XMLShapeExportFlags nFeatures, awt::Point* pRefPoint)
 {
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
@@ -2407,7 +2397,7 @@ void XMLShapeExport::ImpExportChartShape(
 
 void XMLShapeExport::ImpExportControlShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures, awt::Point* pRefPoint)
+    XMLShapeExportFlags nFeatures, awt::Point* pRefPoint)
 {
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
@@ -2436,7 +2426,7 @@ void XMLShapeExport::ImpExportControlShape(
 
 void XMLShapeExport::ImpExportConnectorShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
+    XMLShapeExportFlags nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
 {
     uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
 
@@ -2647,7 +2637,7 @@ void XMLShapeExport::ImpExportConnectorShape(
 
 void XMLShapeExport::ImpExportMeasureShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
+    XMLShapeExportFlags nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
 {
     uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
 
@@ -2932,7 +2922,7 @@ void XMLShapeExport::ImpExportPageShape(
 
 void XMLShapeExport::ImpExportCaptionShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
+    XMLShapeExportFlags nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
 {
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
@@ -2982,7 +2972,7 @@ void XMLShapeExport::ImpExportCaptionShape(
 
 void XMLShapeExport::ImpExportFrameShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint)
+    XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint)
 {
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
@@ -3016,7 +3006,7 @@ void XMLShapeExport::ImpExportFrameShape(
 
 void XMLShapeExport::ImpExportAppletShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint)
+    XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint)
 {
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
@@ -3071,7 +3061,7 @@ void XMLShapeExport::ImpExportAppletShape(
 
 void XMLShapeExport::ImpExportPluginShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint)
+    XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint)
 {
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
@@ -3416,7 +3406,7 @@ void XMLShapeExport::ImpExportMediaShape(
     }
 }
 
-void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, XMLShapeExportFlags nFeatures, awt::Point* pRefPoint)
+void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShape >& xShape, XMLShapeExportFlags nFeatures, awt::Point* pRefPoint)
 {
     uno::Reference< drawing::XShapes > xShapes(xShape, uno::UNO_QUERY);
     if(xShapes.is() && xShapes->getCount())
@@ -4844,7 +4834,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
 
 void XMLShapeExport::ImpExportCustomShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint )
+    XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint )
 {
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if ( xPropSet.is() )
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 7ed381517d48..b868abc8b933 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -277,7 +277,7 @@ void SdXMLDrawPageContext::EndElement()
         uno::Reference< animations::XAnimationNodeSupplier > xNodeSupplier(GetLocalShapesContext(), uno::UNO_QUERY);
         uno::Reference< beans::XPropertySet > xPageProps( GetLocalShapesContext(), uno::UNO_QUERY );
         if(xNodeSupplier.is())
-            xmloff::AnimationNodeContext::postProcessRootNode( GetSdImport(), xNodeSupplier->getAnimationNode(), xPageProps );
+            xmloff::AnimationNodeContext::postProcessRootNode( xNodeSupplier->getAnimationNode(), xPageProps );
     }
 }
 
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 0048db73e6c1..b8787f4cedac 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -827,7 +827,7 @@ namespace xmloff
         if (DAFlags::DataField & m_nIncludeDatabase)
         {
             exportStringPropertyAttribute(
-                OAttributeMetaData::getDatabaseAttributeNamespace(DAFlags::DataField),
+                OAttributeMetaData::getDatabaseAttributeNamespace(),
                 OAttributeMetaData::getDatabaseAttributeName(DAFlags::DataField),
                 PROPERTY_DATAFIELD);
             RESET_BIT( nIncludeDatabase, DAFlags::DataField );
@@ -837,7 +837,7 @@ namespace xmloff
         if ( DAFlags::InputRequired & m_nIncludeDatabase )
         {
             exportBooleanPropertyAttribute(
-                OAttributeMetaData::getDatabaseAttributeNamespace( DAFlags::InputRequired ),
+                OAttributeMetaData::getDatabaseAttributeNamespace(),
                 OAttributeMetaData::getDatabaseAttributeName( DAFlags::InputRequired ),
                 PROPERTY_INPUT_REQUIRED,
                 BoolAttrFlags::DefaultTrue
@@ -849,7 +849,7 @@ namespace xmloff
         if (DAFlags::BoundColumn & m_nIncludeDatabase)
         {
             exportInt16PropertyAttribute(
-                OAttributeMetaData::getDatabaseAttributeNamespace(DAFlags::BoundColumn),
+                OAttributeMetaData::getDatabaseAttributeNamespace(),
                 OAttributeMetaData::getDatabaseAttributeName(DAFlags::BoundColumn),
                 PROPERTY_BOUNDCOLUMN,
                 0,
@@ -861,7 +861,7 @@ namespace xmloff
         if (DAFlags::ConvertEmpty & m_nIncludeDatabase)
         {
             exportBooleanPropertyAttribute(
-                OAttributeMetaData::getDatabaseAttributeNamespace(DAFlags::ConvertEmpty),
+                OAttributeMetaData::getDatabaseAttributeNamespace(),
                 OAttributeMetaData::getDatabaseAttributeName(DAFlags::ConvertEmpty),
                 PROPERTY_EMPTY_IS_NULL,
                 BoolAttrFlags::DefaultFalse
@@ -873,7 +873,7 @@ namespace xmloff
         if (DAFlags::ListSource_TYPE & m_nIncludeDatabase)
         {
             exportEnumPropertyAttribute(
-                OAttributeMetaData::getDatabaseAttributeNamespace(DAFlags::ListSource_TYPE),
+                OAttributeMetaData::getDatabaseAttributeNamespace(),
                 OAttributeMetaData::getDatabaseAttributeName(DAFlags::ListSource_TYPE),
                 PROPERTY_LISTSOURCETYPE,
                 aListSourceTypeMap,
@@ -1254,7 +1254,7 @@ namespace xmloff
         if ( !sListSource.isEmpty() )
         {   // the ListSource property needs to be exported as attribute, and it is not empty
             AddAttribute(
-                OAttributeMetaData::getDatabaseAttributeNamespace(DAFlags::ListSource),
+                OAttributeMetaData::getDatabaseAttributeNamespace(),
                 OAttributeMetaData::getDatabaseAttributeName(DAFlags::ListSource),
                 sListSource);
         }
@@ -1772,7 +1772,7 @@ namespace xmloff
             if ( xBinding.is() )
             {
                 AddAttribute(
-                    OAttributeMetaData::getBindingAttributeNamespace( BAFlags::LinkedCell ),
+                    OAttributeMetaData::getBindingAttributeNamespace(),
                     OAttributeMetaData::getBindingAttributeName( BAFlags::LinkedCell ),
                     aHelper.getStringAddressFromCellBinding( xBinding )
                 );
@@ -1789,7 +1789,7 @@ namespace xmloff
                     );
 
                     AddAttribute(
-                        OAttributeMetaData::getBindingAttributeNamespace( BAFlags::ListLinkingType ),
+                        OAttributeMetaData::getBindingAttributeNamespace(),
                         OAttributeMetaData::getBindingAttributeName( BAFlags::ListLinkingType ),
                         sBuffer.makeStringAndClear()
                     );
@@ -1833,7 +1833,7 @@ namespace xmloff
                 FormCellBindingHelper aHelper( m_xProps, nullptr );
 
                 AddAttribute(
-                    OAttributeMetaData::getBindingAttributeNamespace( BAFlags::ListCellRange ),
+                    OAttributeMetaData::getBindingAttributeNamespace(),
                     OAttributeMetaData::getBindingAttributeName( BAFlags::ListCellRange ),
                     aHelper.getStringAddressFromCellListSource( xSource )
                 );
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index b530058cfbac..1bf17017d9c7 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1175,8 +1175,7 @@ namespace xmloff
     //= OReferredControlImport
     OReferredControlImport::OReferredControlImport(
             OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
-            const Reference< XNameContainer >& _rxParentContainer,
-            OControlElement::ElementType )
+            const Reference< XNameContainer >& _rxParentContainer )
         :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer)
     {
     }
@@ -2094,7 +2093,7 @@ namespace xmloff
 
             case OControlElement::FRAME:
             case OControlElement::FIXED_TEXT:
-                return new OReferredControlImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer, _eType);
+                return new OReferredControlImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer);
 
             case OControlElement::GRID:
                 return new OGridImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer, _eType);
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index 9c4f0a06ec99..d14bce91d659 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -308,8 +308,7 @@ namespace xmloff
     public:
         OReferredControlImport(
             OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
-            const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer,
-            OControlElement::ElementType _eType
+            const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer
         );
 
         // SvXMLImportContext overridables
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index e69f984806de..8ac87d169a94 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -216,54 +216,44 @@ namespace xmloff
     }
 
     void OAttribute2Property::addStringProperty(
-        const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-        const sal_Char* _pAttributeDefault)
+        const sal_Char* _pAttributeName, const OUString& _rPropertyName)
     {
-        implAdd(_pAttributeName, _rPropertyName, ::cppu::UnoType<OUString>::get(),
-            _pAttributeDefault ? OUString::createFromAscii(_pAttributeDefault) : OUString());
+        implAdd(_pAttributeName, _rPropertyName, ::cppu::UnoType<OUString>::get());
     }
 
     void OAttribute2Property::addBooleanProperty(
         const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-        const bool _bAttributeDefault, const bool _bInverseSemantics)
+        const bool /*_bAttributeDefault*/, const bool _bInverseSemantics)
     {
-        OUStringBuffer aDefault;
-        ::sax::Converter::convertBool(aDefault, _bAttributeDefault);
-        AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, cppu::UnoType<bool>::get(), aDefault.makeStringAndClear());
+        AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, cppu::UnoType<bool>::get());
         aAssignment.bInverseSemantics = _bInverseSemantics;
     }
 
     void OAttribute2Property::addInt16Property(
-        const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-        const sal_Int16 _nAttributeDefault)
+        const sal_Char* _pAttributeName, const OUString& _rPropertyName)
     {
-        implAdd(_pAttributeName, _rPropertyName, ::cppu::UnoType<sal_Int16>::get(), OUString::number(_nAttributeDefault));
+        implAdd(_pAttributeName, _rPropertyName, ::cppu::UnoType<sal_Int16>::get());
     }
 
     void OAttribute2Property::addInt32Property(
-        const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-        const sal_Int32 _nAttributeDefault)
+        const sal_Char* _pAttributeName, const OUString& _rPropertyName)
     {
-        implAdd( _pAttributeName, _rPropertyName, ::cppu::UnoType<sal_Int32>::get(), OUString::number( _nAttributeDefault ) );
+        implAdd( _pAttributeName, _rPropertyName, ::cppu::UnoType<sal_Int32>::get() );
     }
 
     void OAttribute2Property::addEnumPropertyImpl(
             const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-            const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry<sal_uInt16>* _pValueMap,
+            const SvXMLEnumMapEntry<sal_uInt16>* _pValueMap,
             const css::uno::Type* _pType)
     {
-        OUStringBuffer aDefault;
-        SvXMLUnitConverter::convertEnum(aDefault, _nAttributeDefault, _pValueMap);
         AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName,
-            _pType ? *_pType : ::cppu::UnoType<sal_Int32>::get(),
-                // this assumes that the setPropertyValue for enums can handle int32's ....
-            aDefault.makeStringAndClear());
+            _pType ? *_pType : ::cppu::UnoType<sal_Int32>::get());
         aAssignment.pEnumMap = _pValueMap;
     }
 
     OAttribute2Property::AttributeAssignment& OAttribute2Property::implAdd(
             const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-            const css::uno::Type& _rType, const OUString& /*_rDefaultString*/)
+            const css::uno::Type& _rType)
     {
         OSL_ENSURE(m_aKnownProperties.end() == m_aKnownProperties.find(OUString::createFromAscii(_pAttributeName)),
             "OAttribute2Property::implAdd: already have this attribute!");
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index 04575930942b..4c0fd167904a 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -212,7 +212,7 @@ namespace xmloff
             @param _nId
                 the id of the attribute. Has to be one of the DA_* constants.
         */
-        static sal_uInt16 getDatabaseAttributeNamespace(DAFlags )
+        static sal_uInt16 getDatabaseAttributeNamespace()
         {
             // nothing special here
             return XML_NAMESPACE_FORM;
@@ -234,7 +234,7 @@ namespace xmloff
             @param _nId
                 the id of the attribute. Has to be one of the BA_* constants.
         */
-        static sal_uInt16 getBindingAttributeNamespace(BAFlags )
+        static sal_uInt16 getBindingAttributeNamespace()
         {
             // nothing special here
             return XML_NAMESPACE_FORM;
@@ -256,7 +256,7 @@ namespace xmloff
             @param _nId
                 the id of the attribute
         */
-        static sal_uInt16 getOfficeFormsAttributeNamespace(OfficeFormsAttributes )
+        static sal_uInt16 getOfficeFormsAttributeNamespace()
         { // nothing special here
           return XML_NAMESPACE_FORM;
         }
@@ -312,13 +312,9 @@ namespace xmloff
                 the name of the attrribute
             @param _rPropertyName
                 the name of the property assigned to the attribute
-            @param _pAttributeDefault
-                the default value for the attribute, if any. May be NULL, in this case the default is assumed to be
-                an empty string.
         */
         void    addStringProperty(
-            const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-            const sal_Char* _pAttributeDefault = nullptr);
+            const sal_Char* _pAttributeName, const OUString& _rPropertyName);
 
         /** add a attribute assignment referring to a boolean property to the map
 
@@ -342,12 +338,9 @@ namespace xmloff
                 the name of the attrribute
             @param _rPropertyName
                 the name of the property assigned to the attribute
-            @param _nAttributeDefault
-                the default value for the attribute.
         */
         void    addInt16Property(
-            const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-            const sal_Int16 _nAttributeDefault);
+            const sal_Char* _pAttributeName, const OUString& _rPropertyName);
 
         /** add a attribute assignment referring to an int32 property to the map
 
@@ -355,12 +348,9 @@ namespace xmloff
                 the name of the attrribute
             @param _rPropertyName
                 the name of the property assigned to the attribute
-            @param _nAttributeDefault
-                the default value for the attribute.
         */
         void    addInt32Property(
-            const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-            const sal_Int32 _nAttributeDefault );
+            const sal_Char* _pAttributeName, const OUString& _rPropertyName );
 
         /** add a attribute assignment referring to an enum property to the map
 
@@ -368,8 +358,6 @@ namespace xmloff
                 the name of the attrribute
             @param _rPropertyName
                 the name of the property assigned to the attribute
-            @param _nAttributeDefault
-                the default value for the attribute, as (32bit) integer
             @param _pValueMap
                 the map to translate strings into enum values
             @param _pType
@@ -378,22 +366,22 @@ namespace xmloff
         template<typename EnumT>
         void    addEnumProperty(
             const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-            const EnumT _nAttributeDefault, const SvXMLEnumMapEntry<EnumT>* _pValueMap,
+            const SvXMLEnumMapEntry<EnumT>* _pValueMap,
             const css::uno::Type* _pType = nullptr)
         {
-            addEnumPropertyImpl(_pAttributeName, _rPropertyName, static_cast<sal_uInt16>(_nAttributeDefault),
+            addEnumPropertyImpl(_pAttributeName, _rPropertyName,
                                 reinterpret_cast<const SvXMLEnumMapEntry<sal_uInt16>*>(_pValueMap), _pType);
         }
 
     private:
         void addEnumPropertyImpl(
             const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-            const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry<sal_uInt16>* _pValueMap,
+            const SvXMLEnumMapEntry<sal_uInt16>* _pValueMap,
             const css::uno::Type* _pType = nullptr);
         /// some common code for the various add*Property methods
         AttributeAssignment& implAdd(
             const sal_Char* _pAttributeName, const OUString& _rPropertyName,
-            const css::uno::Type& _rType, const OUString& _rDefaultString);
+            const css::uno::Type& _rType);
     };
 }   // namespace xmloff
 
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index b2838447e2ca..41401fdb046c 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -257,12 +257,7 @@ namespace xmloff
 
     void OFormLayerXMLExport_Impl::exportAutoStyles()
     {
-        m_rContext.GetAutoStylePool()->exportXML(
-            XML_STYLE_FAMILY_CONTROL_ID,
-            m_rContext.GetDocHandler(),
-            m_rContext.GetMM100UnitConverter(),
-            m_rContext.GetNamespaceMap()
-        );
+        m_rContext.GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_CONTROL_ID );
     }
 
     void OFormLayerXMLExport_Impl::exportForms(const Reference< XDrawPage >& _rxDrawPage)
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 9ecee8e94be1..8b366a7fe931 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -87,7 +87,7 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter)
     m_aAttributeMetaData.addStringProperty(
         OAttributeMetaData::getCommonControlAttributeName(CCAFlags::Title), PROPERTY_TITLE);
     m_aAttributeMetaData.addStringProperty(
-        OAttributeMetaData::getCommonControlAttributeName(CCAFlags::TargetFrame), PROPERTY_TARGETFRAME, "_blank");
+        OAttributeMetaData::getCommonControlAttributeName(CCAFlags::TargetFrame), PROPERTY_TARGETFRAME);
     m_aAttributeMetaData.addStringProperty(
         OAttributeMetaData::getDatabaseAttributeName(DAFlags::DataField), PROPERTY_DATAFIELD);
     m_aAttributeMetaData.addStringProperty(
@@ -164,61 +164,61 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter)
 
     // the int16 attributes
     m_aAttributeMetaData.addInt16Property(
-        OAttributeMetaData::getCommonControlAttributeName(CCAFlags::MaxLength), PROPERTY_MAXTEXTLENGTH, 0);
+        OAttributeMetaData::getCommonControlAttributeName(CCAFlags::MaxLength), PROPERTY_MAXTEXTLENGTH);
     m_aAttributeMetaData.addInt16Property(
-        OAttributeMetaData::getCommonControlAttributeName(CCAFlags::Size), PROPERTY_LINECOUNT, 5);
+        OAttributeMetaData::getCommonControlAttributeName(CCAFlags::Size), PROPERTY_LINECOUNT);
     m_aAttributeMetaData.addInt16Property(
-        OAttributeMetaData::getCommonControlAttributeName(CCAFlags::TabIndex), PROPERTY_TABINDEX, 0);
+        OAttributeMetaData::getCommonControlAttributeName(CCAFlags::TabIndex), PROPERTY_TABINDEX);
     m_aAttributeMetaData.addInt16Property(
-        OAttributeMetaData::getDatabaseAttributeName(DAFlags::BoundColumn), PROPERTY_BOUNDCOLUMN, 0);
+        OAttributeMetaData::getDatabaseAttributeName(DAFlags::BoundColumn), PROPERTY_BOUNDCOLUMN);
 
     // the int32 attributes
     m_aAttributeMetaData.addInt32Property(
-        OAttributeMetaData::getSpecialAttributeName( SCAFlags::PageStepSize ), PROPERTY_BLOCK_INCREMENT, 10 );
+        OAttributeMetaData::getSpecialAttributeName( SCAFlags::PageStepSize ), PROPERTY_BLOCK_INCREMENT );
 
     // the enum attributes
     m_aAttributeMetaData.addEnumProperty(
         OAttributeMetaData::getCommonControlAttributeName( CCAFlags::VisualEffect ), PROPERTY_VISUAL_EFFECT,
-        VisualEffect::LOOK3D, aVisualEffectMap,
+        aVisualEffectMap,
         &::cppu::UnoType<sal_Int16>::get() );
     m_aAttributeMetaData.addEnumProperty(
         OAttributeMetaData::getCommonControlAttributeName( CCAFlags::Orientation ), PROPERTY_ORIENTATION,
-        ScrollBarOrientation::HORIZONTAL, aOrientationMap,
+        aOrientationMap,
         &::cppu::UnoType<sal_Int32>::get() );
     m_aAttributeMetaData.addEnumProperty(
         OAttributeMetaData::getCommonControlAttributeName(CCAFlags::ButtonType), PROPERTY_BUTTONTYPE,
-        FormButtonType_PUSH, aFormButtonTypeMap,
+        aFormButtonTypeMap,
         &::cppu::UnoType<FormButtonType>::get());
     m_aAttributeMetaData.addEnumProperty(
         OAttributeMetaData::getDatabaseAttributeName(DAFlags::ListSource_TYPE), PROPERTY_LISTSOURCETYPE,
-        ListSourceType_VALUELIST, aListSourceTypeMap,
+        aListSourceTypeMap,
         &::cppu::UnoType<ListSourceType>::get());
     m_aAttributeMetaData.addEnumProperty(
-        OAttributeMetaData::getSpecialAttributeName(SCAFlags::State), PROPERTY_DEFAULT_STATE, TRISTATE_FALSE,
+        OAttributeMetaData::getSpecialAttributeName(SCAFlags::State), PROPERTY_DEFAULT_STATE,
         aCheckStateMap,
         &::cppu::UnoType<sal_Int16>::get());
     m_aAttributeMetaData.addEnumProperty(
-        OAttributeMetaData::getSpecialAttributeName(SCAFlags::CurrentState), PROPERTY_STATE, TRISTATE_FALSE,
+        OAttributeMetaData::getSpecialAttributeName(SCAFlags::CurrentState), PROPERTY_STATE,
         aCheckStateMap,
         &::cppu::UnoType<sal_Int16>::get());
     m_aAttributeMetaData.addEnumProperty(
         OAttributeMetaData::getFormAttributeName(faEnctype), PROPERTY_SUBMIT_ENCODING,
-        FormSubmitEncoding_URL, aSubmitEncodingMap,
+        aSubmitEncodingMap,
         &::cppu::UnoType<FormSubmitEncoding>::get());
     m_aAttributeMetaData.addEnumProperty(
         OAttributeMetaData::getFormAttributeName(faMethod), PROPERTY_SUBMIT_METHOD,
-        FormSubmitMethod_GET, aSubmitMethodMap,
+        aSubmitMethodMap,
         &::cppu::UnoType<FormSubmitMethod>::get());
     m_aAttributeMetaData.addEnumProperty(
         OAttributeMetaData::getFormAttributeName(faCommandType), PROPERTY_COMMAND_TYPE,
-        CommandType::COMMAND, aCommandTypeMap);
+        aCommandTypeMap);
     m_aAttributeMetaData.addEnumProperty(
         OAttributeMetaData::getFormAttributeName(faNavigationMode), PROPERTY_NAVIGATION,
-        NavigationBarMode_NONE, aNavigationTypeMap,
+        aNavigationTypeMap,
         &::cppu::UnoType<NavigationBarMode>::get());
     m_aAttributeMetaData.addEnumProperty(
         OAttributeMetaData::getFormAttributeName(faTabbingCycle), PROPERTY_CYCLE,
-        TabulatorCycle_RECORDS, aTabulatorCycleMap,
+        aTabulatorCycleMap,
         &::cppu::UnoType<TabulatorCycle>::get());
 
     // 'initialize'
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index eb84c822d0da..8083a344bd21 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -69,7 +69,7 @@ namespace xmloff
     {
         // the complete attribute name to look for
         OUString sCompleteAttributeName = GetImport().GetNamespaceMap().GetQNameByIndex(
-            OAttributeMetaData::getOfficeFormsAttributeNamespace(_eAttribute),
+            OAttributeMetaData::getOfficeFormsAttributeNamespace(),
             OUString::createFromAscii(OAttributeMetaData::getOfficeFormsAttributeName(_eAttribute)));
 
         // get and convert the value
@@ -143,7 +143,7 @@ namespace xmloff
 
         // add the attribute
         _rExp.AddAttribute(
-            OAttributeMetaData::getOfficeFormsAttributeNamespace(_eAttribute),
+            OAttributeMetaData::getOfficeFormsAttributeNamespace(),
             OAttributeMetaData::getOfficeFormsAttributeName(_eAttribute),
             aValue.makeStringAndClear());
     }
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 18b1560ead8c..ca5f21e7349c 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -163,7 +163,6 @@ SvXMLMetaDocumentContext::SvXMLMetaDocumentContext(SvXMLImport& rImport,
 }
 
 SvXMLMetaDocumentContext::SvXMLMetaDocumentContext(SvXMLImport& rImport,
-            sal_Int32 /*nElement*/,
             const uno::Reference<document::XDocumentProperties>& xDocProps) :
     SvXMLImportContext( rImport ),
     mxDocProps(xDocProps),
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 338d568c08c7..0f20f1722ebc 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -48,9 +48,9 @@ XMLVersionListExport::XMLVersionListExport(
 :   SvXMLExport( rContext, "", rFileName, util::MeasureUnit::CM, rHandler ),
     maVersions( rVersions )
 {
-    GetNamespaceMap_().AddAtIndex( XML_NAMESPACE_DC_IDX, xmloff::token::GetXMLToken(xmloff::token::XML_NP_DC),
+    GetNamespaceMap_().AddAtIndex( xmloff::token::GetXMLToken(xmloff::token::XML_NP_DC),
                                    xmloff::token::GetXMLToken(xmloff::token::XML_N_DC), XML_NAMESPACE_DC );
-    GetNamespaceMap_().AddAtIndex( XML_NAMESPACE_FRAMEWORK_IDX, xmloff::token::GetXMLToken(xmloff::token::XML_NP_VERSIONS_LIST),
+    GetNamespaceMap_().AddAtIndex( xmloff::token::GetXMLToken(xmloff::token::XML_NP_VERSIONS_LIST),
                                    xmloff::token::GetXMLToken(xmloff::token::XML_N_VERSIONS_LIST), XML_NAMESPACE_FRAMEWORK );
 }
 
@@ -105,7 +105,7 @@ XMLVersionListImport::XMLVersionListImport(
 :   SvXMLImport(rContext, ""),
     maVersions( rVersions )
 {
-    GetNamespaceMap().AddAtIndex( XML_NAMESPACE_FRAMEWORK_IDX, xmloff::token::GetXMLToken(xmloff::token::XML_NP_VERSIONS_LIST),
+    GetNamespaceMap().AddAtIndex( xmloff::token::GetXMLToken(xmloff::token::XML_NP_VERSIONS_LIST),
                                   xmloff::token::GetXMLToken(xmloff::token::XML_N_VERSIONS_LIST), XML_NAMESPACE_FRAMEWORK );
 }
 
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 1328735cc296..40c1f6f52133 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -212,10 +212,7 @@ void XMLPageExport::exportStyles( bool bUsed, bool bAutoStyles )
 
 void XMLPageExport::exportAutoStyles()
 {
-    rExport.GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_PAGE_MASTER
-        , rExport.GetDocHandler(), rExport.GetMM100UnitConverter(),
-        rExport.GetNamespaceMap()
-        );
+    rExport.GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_PAGE_MASTER);
 }
 
 void XMLPageExport::exportDefaultStyle()
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index b18727373e4a..575d6e38a225 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -614,10 +614,7 @@ struct StyleComparator
 }
 
 void SvXMLAutoStylePoolP_Impl::exportXML(
-           sal_Int32 nFamily,
-        const uno::Reference< css::xml::sax::XDocumentHandler > &,
-        const SvXMLUnitConverter&,
-        const SvXMLNamespaceMap&,
+        sal_Int32 nFamily,
         const SvXMLAutoStylePoolP *pAntiImpl) const
 {
     // Get list of parents for current family (nFamily)
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 38222aea6093..85ada9be3621 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -171,9 +171,6 @@ public:
                           const ::std::vector< XMLPropertyState >& rProperties ) const;
 
     void exportXML( sal_Int32 nFamily,
-        const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap,
         const SvXMLAutoStylePoolP *pAntiImpl) const;
 
     void ClearEntries();
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index adb678d2d358..94eb689d2790 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -372,17 +372,9 @@ OUString SvXMLAutoStylePoolP::Find( sal_Int32 nFamily,
     return pImpl->Find( nFamily, rParent, rProperties );
 }
 
-void SvXMLAutoStylePoolP::exportXML( sal_Int32 nFamily,
-    const uno::Reference< css::xml::sax::XDocumentHandler > &,
-    const SvXMLUnitConverter&,
-    const SvXMLNamespaceMap&
-    ) const
+void SvXMLAutoStylePoolP::exportXML( sal_Int32 nFamily ) const
 {
-    pImpl->exportXML( nFamily,
-                      GetExport().GetDocHandler(),
-                      GetExport().GetMM100UnitConverter(),
-                      GetExport().GetNamespaceMap(),
-                      this);
+    pImpl->exportXML( nFamily, this );
 }
 
 void SvXMLAutoStylePoolP::ClearEntries()
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index b99e9c2b5fde..034eb3e64294 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -775,7 +775,7 @@ void SvXMLExportPropertyMapper::exportXML(
                         rExport.GetAttrList(), rProperties,
                         rExport.GetMM100UnitConverter(),
                         rExport.GetNamespaceMap(),
-                        nFlags, &aIndexArray,
+                        &aIndexArray,
                         nPropMapStartIdx, nPropMapEndIdx );
 
             if( rExport.GetAttrList().getLength() > 0 ||
@@ -832,7 +832,6 @@ void SvXMLExportPropertyMapper::_exportXML(
         const ::std::vector< XMLPropertyState >& rProperties,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
-        SvXmlExportFlags nFlags,
         std::vector<sal_uInt16>* pIndexArray,
         sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx ) const
 {
@@ -870,7 +869,7 @@ void SvXMLExportPropertyMapper::_exportXML(
                 else
                 {
                     _exportXML( rAttrList, rProperties[nIndex], rUnitConverter,
-                                rNamespaceMap, nFlags, &rProperties, nIndex );
+                                rNamespaceMap, &rProperties, nIndex );
                 }
             }
         }
@@ -884,7 +883,6 @@ void SvXMLExportPropertyMapper::_exportXML(
         const XMLPropertyState& rProperty,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
-        SvXmlExportFlags /*nFlags*/,
         const ::std::vector< XMLPropertyState > *pProperties,
         sal_uInt32 nIdx ) const
 {
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 6be73aa181e3..026ed54bfdc7 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -507,9 +507,9 @@ void XMLTableExport::exportAutoStyles()
      if( !mbExportTables )
          return;
 
-    mrExport.GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_TABLE_COLUMN, mrExport.GetDocHandler(), mrExport.GetMM100UnitConverter(), mrExport.GetNamespaceMap() );
-    mrExport.GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_TABLE_ROW, mrExport.GetDocHandler(), mrExport.GetMM100UnitConverter(), mrExport.GetNamespaceMap() );
-    mrExport.GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_TABLE_CELL, mrExport.GetDocHandler(), mrExport.GetMM100UnitConverter(), mrExport.GetNamespaceMap() );
+    mrExport.GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_TABLE_COLUMN );
+    mrExport.GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_TABLE_ROW );
+    mrExport.GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_TABLE_CELL );
 }
 
 const TableStyleElement* getTableStyleMap()
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 933ec3a94723..5da5902c93da 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -150,7 +150,6 @@ public:
     XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
             const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
-            sal_uInt16 nType,
             ParamMap &rParamMap);
 };
 
@@ -158,7 +157,6 @@ XMLTextFrameParam_Impl::XMLTextFrameParam_Impl(
         SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
         const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
-        sal_uInt16 /*nType*/,
         ParamMap &rParamMap):
     SvXMLImportContext( rImport, nPrfx, rLName )
 {
@@ -372,7 +370,7 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext
     bool    bCreateFailed : 1;
     bool    bOwnBase64Stream : 1;
 
-    void Create( bool bHRefOrBase64 );
+    void Create();
 
 public:
 
@@ -414,7 +412,7 @@ public:
 };
 
 
-void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ )
+void XMLTextFrameContext_Impl::Create()
 {
     rtl::Reference < XMLTextImportHelper > xTextImportHelper =
         GetImport().GetTextImport();
@@ -778,7 +776,7 @@ bool XMLTextFrameContext_Impl::CreateIfNotThere()
     {
         if( bOwnBase64Stream )
             xBase64Stream->closeOutput();
-        Create( true );
+        Create();
     }
 
     return xPropSet.is();
@@ -1024,7 +1022,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
           sHRef.isEmpty() && sMimeType.isEmpty() ) )
         return; // no URL: no image or OLE object
 
-    Create( true );
+    Create();
 }
 
 void XMLTextFrameContext_Impl::EndElement()
@@ -1060,7 +1058,7 @@ SvXMLImportContext *XMLTextFrameContext_Impl::CreateChildContext(
         {
             pContext = new XMLTextFrameParam_Impl( GetImport(),
                                               nPrefix, rLocalName,
-                                               xAttrList, nType, aParamMap );
+                                               xAttrList, aParamMap );
         }
     }
     else if( (XML_NAMESPACE_OFFICE == nPrefix) )
@@ -1103,7 +1101,7 @@ SvXMLImportContext *XMLTextFrameContext_Impl::CreateChildContext(
             sFilterService = pEContext->GetFilterServiceName();
             if( !sFilterService.isEmpty() )
             {
-                Create( false );
+                Create();
                 if( xPropSet.is() )
                 {
                     Reference < XEmbeddedObjectSupplier > xEOS( xPropSet,
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 1f583813336a..6c16d7d44eff 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1699,8 +1699,7 @@ void XMLTextParagraphExport::exportText(
         const Reference < XTextSection > & rBaseSection,
         bool bAutoStyles,
         bool bIsProgress,
-        bool bExportParagraph,
-        TextPNS /*eExtensionNS*/)
+        bool bExportParagraph)
 {
     if( bAutoStyles )
         GetExport().GetShapeExport(); // make sure the graphics styles family
@@ -2399,7 +2398,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
             }
             else if (sType.equals(sSoftPageBreak))
             {
-                exportSoftPageBreak(xPropSet,   bAutoStyles);
+                exportSoftPageBreak();
             }
             else {
                 OSL_FAIL("unknown text portion type");
@@ -2469,9 +2468,7 @@ void XMLTextParagraphExport::exportTextField(
     }
 }
 
-void XMLTextParagraphExport::exportSoftPageBreak(
-    const Reference<XPropertySet> & ,
-    bool )
+void XMLTextParagraphExport::exportSoftPageBreak()
 {
     SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
                               XML_SOFT_PAGE_BREAK, false,
@@ -3586,30 +3583,15 @@ void XMLTextParagraphExport::recordTrackedChangesNoXText()
 
 void XMLTextParagraphExport::exportTextAutoStyles()
 {
-    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_PARAGRAPH,
-                                   GetExport().GetDocHandler(),
-                                   GetExport().GetMM100UnitConverter(),
-                                   GetExport().GetNamespaceMap() );
-
-    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_TEXT,
-                                   GetExport().GetDocHandler(),
-                                   GetExport().GetMM100UnitConverter(),
-                                   GetExport().GetNamespaceMap() );
-
-    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_FRAME,
-                                   GetExport().GetDocHandler(),
-                                   GetExport().GetMM100UnitConverter(),
-                                   GetExport().GetNamespaceMap() );
-
-    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_SECTION,
-                                  GetExport().GetDocHandler(),
-                                  GetExport().GetMM100UnitConverter(),
-                                  GetExport().GetNamespaceMap() );
-
-    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_RUBY,
-                                  GetExport().GetDocHandler(),
-                                  GetExport().GetMM100UnitConverter(),
-                                  GetExport().GetNamespaceMap() );
+    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_PARAGRAPH );
+
+    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_TEXT );
+
+    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_FRAME );
+
+    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_SECTION );
+
+    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_RUBY );
 
     maListAutoPool.exportXML();
 }