-Werror,-Wunused-private-field (Clang towards 3.2)

Change-Id: I4b877ab97259f7e031e34daf7ce93e1b59417a08

28 files changed, 42 insertions, 110 deletions

diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index 8a7039a2e3fe..2e39d1752448 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -34,8 +34,6 @@ class SdXMLNumberFormatImportContext : public SvXMLNumFormatContext
 private:
     friend class SdXMLNumberFormatMemberImportContext;
 
-    SdXMLImport& mrImport;
-
     sal_Bool    mbTimeStyle;
     sal_Bool    mbAutomatic;
     sal_uInt8   mnElements[16];
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index b2483de0fd6f..a78f77d69f58 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1077,7 +1077,6 @@ class XMLMacroFieldImportContext : public XMLTextFieldImportContext
 
     ::rtl::OUString sMacro; // macro for old documents (pre 638i)
 
-    sal_Bool bMacroOK;
     sal_Bool bDescriptionOK;
 
 public:
@@ -1122,11 +1121,9 @@ class XMLReferenceFieldImportContext : public XMLTextFieldImportContext
     sal_uInt16 nElementToken;
     sal_Int16 nSource;
     sal_Int16 nType;
-    sal_Int16 nSequenceNumber;
 
     sal_Bool bNameOK;
     sal_Bool bTypeOK;
-    sal_Bool bSeqNumberOK;
 
 public:
 
@@ -1402,7 +1399,6 @@ class XMLScriptImportContext : public XMLTextFieldImportContext
 
     sal_Bool bContentOK;
     sal_Bool bScriptTypeOK;
-    sal_Bool bUrlContent;
 
 public:
 
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 357284ffc3d0..9fb15011a4e5 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -160,7 +160,6 @@ private:
     sal_Bool bHintOK;                   /// sHint was set
     sal_Bool bDisplayOK;                /// sDisplayFormula/-None were set
 
-    sal_Bool bSetName;                  /// set sName with ???-property
     sal_Bool bSetFormula;               /// set Formula property
     sal_Bool bSetFormulaDefault;        /// use content as default for formula
     sal_Bool bSetDescription;           /// set sDescription with Hint-property
@@ -182,7 +181,6 @@ public:
         sal_uInt16 nPrfx,               /// namespace prefix
         const ::rtl::OUString& rLocalName,  /// element name w/o prefix
         // config variables for PrepareField behavior:
-        sal_Bool bName,                 /// set sName with ???-property
         sal_Bool bFormula,              /// set Formula property
         sal_Bool bFormulaDefault,       /// use content as default for formula
         sal_Bool bDescription,          /// set sDescription with Hint-property
@@ -310,7 +308,6 @@ public:
         // for finding appropriate field master (see EndElement())
         VarType eVarType,               /// variable type
         // config variables:
-        sal_Bool bName,                 /// see XMLTextFieldImportContext
         sal_Bool bFormula,              /// see XMLTextFieldImportContext
         sal_Bool bFormulaDefault,       /// see XMLTextFieldImportContext
         sal_Bool bDescription,          /// see XMLTextFieldImportContext
@@ -542,7 +539,6 @@ class XMLTableFormulaImportContext : public XMLTextFieldImportContext
     XMLValueImportHelper aValueHelper;
 
     ::rtl::OUString sFormula;
-    sal_Bool bFormulaOK;
 
     sal_Bool bIsShowFormula;
 
diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/xmloff/inc/xmloff/ProgressBarHelper.hxx
index 6bd2fda14cf9..e558b0f6b29d 100644
--- a/xmloff/inc/xmloff/ProgressBarHelper.hxx
+++ b/xmloff/inc/xmloff/ProgressBarHelper.hxx
@@ -36,7 +36,6 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper
             sal_Int32                                                                       nRange;
             sal_Int32                                                                       nReference;
             sal_Int32                                                                       nValue;
-            double                                                                          fOldPercent;
             sal_Bool                                                                        bStrict;
             // #96469#; if the value goes over the Range the progressbar starts again
             sal_Bool                                                                        bRepeat;
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 6a217d67aa29..0b260a09d5d0 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -56,13 +56,11 @@ protected:
     virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )  throw (RuntimeException);
 
 private:
-    bool m_bIsFillColor;
     OUString m_aColorPropName;
     Property m_aColorProp;
 };
 
 lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo( bool bFillColor ) :
-        m_bIsFillColor( bFillColor ),
         // note: length of FillColor and LineColor is 9
         m_aColorPropName( (bFillColor ? "FillColor" : "LineColor"), 9, RTL_TEXTENCODING_ASCII_US ),
         m_aColorProp( m_aColorPropName, -1,
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index fa94162508e6..ac778fa1fb91 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -87,12 +87,10 @@ static SvXMLEnumMapEntry aXMLAxisTypeMap[] =
 class SchXMLCategoriesContext : public SvXMLImportContext
 {
 private:
-    SchXMLImportHelper& m_rImportHelper;
     OUString& mrAddress;
 
 public:
-    SchXMLCategoriesContext( SchXMLImportHelper& rImpHelper,
-                                   SvXMLImport& rImport,
+    SchXMLCategoriesContext( SvXMLImport& rImport,
                                    sal_uInt16 nPrefix,
                                    const OUString& rLocalName,
                                    OUString& rAddress );
@@ -107,7 +105,7 @@ public:
 class DateScaleContext : public SvXMLImportContext
 {
 public:
-    DateScaleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport,
+    DateScaleContext( SvXMLImport& rImport,
                         sal_uInt16 nPrefix, const OUString& rLocalName,
                         const Reference< beans::XPropertySet > xAxisProps );
 
@@ -115,7 +113,6 @@ public:
     virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
 private:
-    SchXMLImportHelper& m_rImportHelper;
     Reference< beans::XPropertySet > m_xAxisProps;
 };
 
@@ -673,7 +670,7 @@ SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
         break;
 
         case XML_TOK_AXIS_CATEGORIES:
-            pContext = new SchXMLCategoriesContext( m_rImportHelper, GetImport(),
+            pContext = new SchXMLCategoriesContext( GetImport(),
                                                           p_nPrefix, rLocalName,
                                                           m_rCategoriesAddress );
             m_aCurrentAxis.bHasCategories = true;
@@ -681,7 +678,7 @@ SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
 
         case XML_TOK_AXIS_DATE_SCALE:
         case XML_TOK_AXIS_DATE_SCALE_EXT:
-            pContext = new DateScaleContext( m_rImportHelper, GetImport(),
+            pContext = new DateScaleContext( GetImport(),
                             p_nPrefix, rLocalName, m_xAxisProps );
             m_bDateScaleImported = true;
             break;
@@ -883,13 +880,11 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc
 // ========================================
 
 SchXMLCategoriesContext::SchXMLCategoriesContext(
-    SchXMLImportHelper& rImpHelper,
     SvXMLImport& rImport,
     sal_uInt16 nPrefix,
     const OUString& rLocalName,
     OUString& rAddress ) :
         SvXMLImportContext( rImport, nPrefix, rLocalName ),
-        m_rImportHelper( rImpHelper ),
         mrAddress( rAddress )
 {
 }
@@ -920,13 +915,11 @@ void SchXMLCategoriesContext::StartElement( const Reference< xml::sax::XAttribut
 // ========================================
 
 DateScaleContext::DateScaleContext(
-    SchXMLImportHelper& rImpHelper,
     SvXMLImport& rImport,
     sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference< beans::XPropertySet > xAxisProps ) :
         SvXMLImportContext( rImport, nPrefix, rLocalName ),
-        m_rImportHelper( rImpHelper ),
         m_xAxisProps( xAxisProps )
 {
 }
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index cdadaf4c2d61..7e842d7f9fe9 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -54,6 +54,7 @@
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
+#include <com/sun/star/chart/ChartSeriesAddress.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
@@ -1013,7 +1014,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
         case XML_TOK_CHART_PLOT_AREA:
             pContext = new SchXMLPlotAreaContext( mrImportHelper, GetImport(), rLocalName,
                                                   m_aXLinkHRefAttributeToIndicateDataProvider,
-                                                  maSeriesAddresses, msCategoriesAddress,
+                                                  msCategoriesAddress,
                                                   msChartAddress, m_bHasRangeAtPlotArea, mbAllRangeAddressesAvailable,
                                                   mbColHasLabels, mbRowHasLabels,
                                                   meDataRowSource,
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 535e6d268550..2d9ff9a117d3 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -147,7 +147,6 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
     SchXMLImportHelper& rImpHelper,
     SvXMLImport& rImport, const rtl::OUString& rLocalName,
     const rtl::OUString& rXLinkHRefAttributeToIndicateDataProvider,
-    uno::Sequence< chart::ChartSeriesAddress >& rSeriesAddresses,
     ::rtl::OUString& rCategoriesAddress,
     ::rtl::OUString& rChartAddress,
     bool& rbHasRangeAtPlotArea,
@@ -161,7 +160,6 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
     const awt::Size & rChartSize ) :
         SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
         mrImportHelper( rImpHelper ),
-        mrSeriesAddresses( rSeriesAddresses ),
         mrCategoriesAddress( rCategoriesAddress ),
         mrSeriesDefaultsAndStyles( rSeriesDefaultsAndStyles ),
         mnNumOfLinesProp( 0 ),
@@ -654,15 +652,13 @@ void SchXMLPlotAreaContext::EndElement()
 
 // ========================================
 
-SchXMLDataPointContext::SchXMLDataPointContext(  SchXMLImportHelper& rImpHelper,
-                                                 SvXMLImport& rImport, const rtl::OUString& rLocalName,
+SchXMLDataPointContext::SchXMLDataPointContext(  SvXMLImport& rImport, const rtl::OUString& rLocalName,
                                                  ::std::list< DataRowPointStyle >& rStyleList,
                                                  const ::com::sun::star::uno::Reference<
                                                     ::com::sun::star::chart2::XDataSeries >& xSeries,
                                                  sal_Int32& rIndex,
                                                  bool bSymbolSizeForSeriesIsMissingInFile ) :
         SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
-        mrImportHelper( rImpHelper ),
         mrStyleList( rStyleList ),
         m_xSeries( xSeries ),
         mrIndex( rIndex ),
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 7308e69b57e1..cce003c17880 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -32,8 +32,6 @@
 #include "SchXMLChartContext.hxx"
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/shapeimport.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/chart/ChartSeriesAddress.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 
 #include "transporttypes.hxx"
@@ -108,8 +106,6 @@ public:
     SchXMLPlotAreaContext( SchXMLImportHelper& rImpHelper,
                            SvXMLImport& rImport, const rtl::OUString& rLocalName,
                            const rtl::OUString& rXLinkHRefAttributeToIndicateDataProvider,
-                           ::com::sun::star::uno::Sequence<
-                               ::com::sun::star::chart::ChartSeriesAddress >& rSeriesAddresses,
                            ::rtl::OUString& rCategoriesAddress,
                            ::rtl::OUString& rChartAddress,
                            bool& bHasRangeAtPlotArea,
@@ -135,7 +131,6 @@ private:
     ::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram;
     ::com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxNewDoc;
     ::std::vector< SchXMLAxis > maAxes;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::chart::ChartSeriesAddress >& mrSeriesAddresses;
     rtl::OUString& mrCategoriesAddress;
     SeriesDefaultsAndStyles& mrSeriesDefaultsAndStyles;
     sal_Int32 mnNumOfLinesProp;
@@ -168,7 +163,6 @@ private:
 class SchXMLDataPointContext : public SvXMLImportContext
 {
 private:
-    SchXMLImportHelper& mrImportHelper;
     ::std::list< DataRowPointStyle >& mrStyleList;
     ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::XDataSeries > m_xSeries;
@@ -176,8 +170,7 @@ private:
     bool mbSymbolSizeForSeriesIsMissingInFile;
 
 public:
-    SchXMLDataPointContext(  SchXMLImportHelper& rImpHelper,
-                             SvXMLImport& rImport, const rtl::OUString& rLocalName,
+    SchXMLDataPointContext(  SvXMLImport& rImport, const rtl::OUString& rLocalName,
                              ::std::list< DataRowPointStyle >& rStyleList,
                              const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32& rIndex,
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 26f10f09c9f3..be6181c1cbd4 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -77,12 +77,10 @@ namespace
 class SchXMLDomain2Context : public SvXMLImportContext
 {
 private:
-    SchXMLImportHelper& mrImportHelper;
     ::std::vector< OUString > & mrAddresses;
 
 public:
-    SchXMLDomain2Context( SchXMLImportHelper& rImpHelper,
-                          SvXMLImport& rImport,
+    SchXMLDomain2Context( SvXMLImport& rImport,
                           sal_uInt16 nPrefix,
                           const rtl::OUString& rLocalName,
                           ::std::vector< OUString > & rAddresses );
@@ -91,13 +89,11 @@ public:
 };
 
 SchXMLDomain2Context::SchXMLDomain2Context(
-    SchXMLImportHelper& rImpHelper,
     SvXMLImport& rImport,
     sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     ::std::vector< ::rtl::OUString > & rAddresses ) :
         SvXMLImportContext( rImport, nPrefix, rLocalName ),
-        mrImportHelper( rImpHelper ),
         mrAddresses( rAddresses )
 {
 }
@@ -649,7 +645,7 @@ SvXMLImportContext* SchXMLSeries2Context::CreateChildContext(
             {
                 m_bHasDomainContext = true;
                 pContext = new SchXMLDomain2Context(
-                    mrImportHelper, GetImport(),
+                    GetImport(),
                     nPrefix, rLocalName,
                     maDomainAddresses );
             }
@@ -681,7 +677,7 @@ SvXMLImportContext* SchXMLSeries2Context::CreateChildContext(
             break;
 
         case XML_TOK_SERIES_DATA_POINT:
-            pContext = new SchXMLDataPointContext( mrImportHelper, GetImport(), rLocalName,
+            pContext = new SchXMLDataPointContext( GetImport(), rLocalName,
                                                    mrStyleList, m_xSeries, mnDataPointIndex, mbSymbolSizeIsMissingInFile );
             break;
 
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 935ea69e2ca5..bf7e95ab120b 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -261,11 +261,11 @@ SvXMLImportContext *SchXMLTableContext::CreateChildContext(
             mrTable.bHasHeaderColumn = true;
             // fall through intended
         case XML_TOK_TABLE_COLUMNS:
-            pContext = new SchXMLTableColumnsContext( mrImportHelper, GetImport(), rLocalName, mrTable );
+            pContext = new SchXMLTableColumnsContext( GetImport(), rLocalName, mrTable );
             break;
 
         case XML_TOK_TABLE_COLUMN:
-            pContext = new SchXMLTableColumnContext( mrImportHelper, GetImport(), rLocalName, mrTable );
+            pContext = new SchXMLTableColumnContext( GetImport(), rLocalName, mrTable );
             break;
 
         case XML_TOK_TABLE_HEADER_ROWS:
@@ -430,12 +430,10 @@ void SchXMLTableContext::setColumnPermutation( const uno::Sequence< sal_Int32 >
 // ----------------------------------------
 
 SchXMLTableColumnsContext::SchXMLTableColumnsContext(
-    SchXMLImportHelper& rImpHelper,
     SvXMLImport& rImport,
     const rtl::OUString& rLocalName,
     SchXMLTable& aTable ) :
         SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ),
-        mrImportHelper( rImpHelper ),
         mrTable( aTable )
 {
 }
@@ -454,7 +452,7 @@ SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext(
     if( nPrefix == XML_NAMESPACE_TABLE &&
         IsXMLToken( rLocalName, XML_TABLE_COLUMN ) )
     {
-        pContext = new SchXMLTableColumnContext( mrImportHelper, GetImport(), rLocalName, mrTable );
+        pContext = new SchXMLTableColumnContext( GetImport(), rLocalName, mrTable );
     }
     else
         pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
@@ -467,12 +465,10 @@ SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext(
 // ----------------------------------------
 
 SchXMLTableColumnContext::SchXMLTableColumnContext(
-    SchXMLImportHelper& rImpHelper,
     SvXMLImport& rImport,
     const rtl::OUString& rLocalName,
     SchXMLTable& aTable ) :
         SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ),
-        mrImportHelper( rImpHelper ),
         mrTable( aTable )
 {
 }
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index 32858490e679..d983fc03a4e0 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -108,12 +108,10 @@ public:
 class SchXMLTableColumnsContext : public SvXMLImportContext
 {
 private:
-    SchXMLImportHelper& mrImportHelper;
     SchXMLTable& mrTable;
 
 public:
-    SchXMLTableColumnsContext( SchXMLImportHelper& rImpHelper,
-                               SvXMLImport& rImport,
+    SchXMLTableColumnsContext( SvXMLImport& rImport,
                                const rtl::OUString& rLocalName,
                                SchXMLTable& aTable );
     virtual ~SchXMLTableColumnsContext();
@@ -129,12 +127,10 @@ public:
 class SchXMLTableColumnContext : public SvXMLImportContext
 {
 private:
-    SchXMLImportHelper& mrImportHelper;
     SchXMLTable& mrTable;
 
 public:
-    SchXMLTableColumnContext( SchXMLImportHelper& rImpHelper,
-                              SvXMLImport& rImport,
+    SchXMLTableColumnContext( SvXMLImport& rImport,
                               const rtl::OUString& rLocalName,
                               SchXMLTable& aTable );
     virtual ~SchXMLTableColumnContext();
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
index 4eb28fae3236..2f46b6cb2060 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
@@ -32,7 +32,6 @@ public:
 
 private:
     bool m_bIsNamedSymbol;
-    sal_Int32 nSymbolType;
 };
 
 #endif  // _XMLSYMBOLTYPEPROPERTYHDL_HXX_
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index 56e3a6740231..0ba585784d29 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -41,7 +41,6 @@
 using namespace ::com::sun::star;
 
 const sal_Int32 nDefaultProgressBarRange = 1000000;
-const float fProgressStep = 0.5;
 
 ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xTempStatusIndicator,
                                     const sal_Bool bTempStrict)
@@ -49,7 +48,6 @@ ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::
 , nRange(nDefaultProgressBarRange)
 , nReference(100)
 , nValue(0)
-, fOldPercent(0.0)
 , bStrict(bTempStrict)
 , bRepeat(sal_True)
 #ifdef DBG_UTIL
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 6ef4815fb6d1..83576abb2673 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -600,7 +600,6 @@ TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext );
 
 SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles)
 :   SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles),
-    mrImport( rImport ),
     mbAutomatic( sal_False ),
     mnIndex(0),
     mnKey( -1 )
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 82f5476f09e5..37bd435a9241 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1186,10 +1186,8 @@ XMLShapePropertySetMapper::~XMLShapePropertySetMapper()
 
 // ----------------------------------------
 
-XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, XMLTextListAutoStylePool *pListAutoPool, SvXMLExport& rExport )
+XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport )
 : SvXMLExportPropertyMapper( rMapper )
-, mpListAutoPool( pListAutoPool )
-, mrExport( rExport )
 , maNumRuleExp( rExport )
 , mbIsInAutoStyles( sal_True )
 , msCDATA( GetXMLToken(XML_CDATA))
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index e85115695181..5980a49822c6 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -36,7 +36,6 @@
 #include <xmloff/xmlement.hxx>
 #include <xmloff/prhdlfac.hxx>
 #include <xmloff/xmlprmap.hxx>
-#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlexppr.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -260,8 +259,6 @@ public:
 class XMLShapeExportPropertyMapper : public SvXMLExportPropertyMapper
 {
 private:
-    XMLTextListAutoStylePool *mpListAutoPool;
-    SvXMLExport& mrExport;
     SvxXMLNumRuleExport maNumRuleExp;
     sal_Bool mbIsInAutoStyles;
 
@@ -275,7 +272,7 @@ protected:
         ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > rPropSet ) const;
 public:
-    XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, XMLTextListAutoStylePool *pListAutoPool, SvXMLExport& rExport );
+    XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport );
     virtual ~XMLShapeExportPropertyMapper();
 
     virtual void        handleElementItem(
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 950978771a78..eed9efd5442d 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -456,7 +456,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
         // construct PropertySetMapper
         UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( aFactoryRef);
 
-        mpPropertySetMapper = new XMLShapeExportPropertyMapper( xMapper, (XMLTextListAutoStylePool*)&GetTextParagraphExport()->GetListAutoStylePool(), *this );
+        mpPropertySetMapper = new XMLShapeExportPropertyMapper( xMapper, *this );
         // set lock to avoid deletion
         mpPropertySetMapper->acquire();
 
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index f13524a4d3d8..6a9250117cae 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -201,13 +201,10 @@ class SdXMLImport: public SvXMLImport
     SvXMLTokenMap*              mpDocElemTokenMap;
     SvXMLTokenMap*              mpBodyElemTokenMap;
     SvXMLTokenMap*              mpStylesElemTokenMap;
-    SvXMLTokenMap*              mpAutoStylesElemTokenMap;
     SvXMLTokenMap*              mpMasterPageElemTokenMap;
     SvXMLTokenMap*              mpMasterPageAttrTokenMap;
     SvXMLTokenMap*              mpPageMasterAttrTokenMap;
     SvXMLTokenMap*              mpPageMasterStyleAttrTokenMap;
-    SvXMLTokenMap*              mpDocStyleAttrTokenMap;
-    SvXMLTokenMap*              mpDocStyleElemTokenMap;
     SvXMLTokenMap*              mpDrawPageAttrTokenMap;
     SvXMLTokenMap*              mpDrawPageElemTokenMap;
     SvXMLTokenMap*              mpPresentationPlaceholderAttrTokenMap;
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index bec909b5f1ba..606164b621e2 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1025,9 +1025,7 @@ SvXMLExportPropertyMapper* XMLShapeExport::CreateShapePropMapper(
     UniReference< XMLPropertyHandlerFactory > xFactory = new XMLSdPropHdlFactory( rExport.GetModel(), rExport );
     UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( xFactory );
     SvXMLExportPropertyMapper* pResult =
-        new XMLShapeExportPropertyMapper( xMapper,
-                                          (XMLTextListAutoStylePool*)&rExport.GetTextParagraphExport()->GetListAutoStylePool(),
-                                          rExport );
+        new XMLShapeExportPropertyMapper( xMapper, rExport );
     // chain text attributes
     return pResult;
 }
@@ -1275,7 +1273,7 @@ const rtl::Reference< XMLTableExport >& XMLShapeExport::GetShapeTableExport()
     {
         rtl::Reference< XMLPropertyHandlerFactory > xFactory( new XMLSdPropHdlFactory( mrExport.GetModel(), mrExport ) );
         UniReference < XMLPropertySetMapper > xMapper( new XMLShapePropertySetMapper( xFactory.get() ) );
-        rtl::Reference< SvXMLExportPropertyMapper > xPropertySetMapper( new XMLShapeExportPropertyMapper( xMapper, (XMLTextListAutoStylePool*)&mrExport.GetTextParagraphExport()->GetListAutoStylePool(), mrExport ) );
+        rtl::Reference< SvXMLExportPropertyMapper > xPropertySetMapper( new XMLShapeExportPropertyMapper( xMapper, mrExport ) );
         mxShapeTableExport = new XMLTableExport( mrExport, xPropertySetMapper, xFactory );
     }
 
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 8623a17a8ee5..a7434c088033 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1368,8 +1368,7 @@ SdXMLPathShapeContext::SdXMLPathShapeContext(
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes,
     sal_Bool bTemporaryShape)
-:   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
-    mbClosed( sal_True )
+:   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
 {
 }
 
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index c86ed7915950..e9d1e324c76a 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -229,7 +229,6 @@ class SdXMLPathShapeContext : public SdXMLShapeContext
 {
     rtl::OUString               maD;
     rtl::OUString               maViewBox;
-    sal_Bool                    mbClosed;
 
 public:
     TYPEINFO();
diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx
index d7bc9321fbf7..3c24b4e47e8e 100644
--- a/xmloff/source/text/XMLIndexMarkExport.cxx
+++ b/xmloff/source/text/XMLIndexMarkExport.cxx
@@ -50,8 +50,7 @@ using ::com::sun::star::uno::Any;
 
 
 XMLIndexMarkExport::XMLIndexMarkExport(
-    SvXMLExport& rExp,
-    XMLTextParagraphExport& rParaExp)
+    SvXMLExport& rExp)
 :   sLevel(RTL_CONSTASCII_USTRINGPARAM("Level"))
 ,   sUserIndexName(RTL_CONSTASCII_USTRINGPARAM("UserIndexName"))
 ,   sPrimaryKey(RTL_CONSTASCII_USTRINGPARAM("PrimaryKey"))
@@ -65,7 +64,6 @@ XMLIndexMarkExport::XMLIndexMarkExport(
 ,   sSecondaryKeyReading(RTL_CONSTASCII_USTRINGPARAM("SecondaryKeyReading"))
 ,   sMainEntry(RTL_CONSTASCII_USTRINGPARAM("IsMainEntry"))
 ,   rExport(rExp)
-,   rParaExport(rParaExp)
 {
 }
 
diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx
index c106b1de0fbd..e5b3cc492308 100644
--- a/xmloff/source/text/XMLIndexMarkExport.hxx
+++ b/xmloff/source/text/XMLIndexMarkExport.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/uno/Sequence.h>
 
 class SvXMLExport;
-class XMLTextParagraphExport;
 namespace com { namespace sun { namespace star {
     namespace beans { class XPropertySet; }
  } } }
@@ -59,11 +58,9 @@ class XMLIndexMarkExport
 
 
     SvXMLExport& rExport;
-    XMLTextParagraphExport& rParaExport;
 
 public:
-    XMLIndexMarkExport(SvXMLExport& rExp,
-                       XMLTextParagraphExport& rParaExp);
+    XMLIndexMarkExport(SvXMLExport& rExp);
 
     ~XMLIndexMarkExport();
 
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 2c201c54b519..d03de03ca6a4 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star {
     namespace text { class XTextCursor; class XTextContent; }
 } } }
 
-class SvXMLAttributeList;
 class XMLTextFrameContextHyperlink_Impl;
 
 class XMLTextFrameContext : public SvXMLImportContext
@@ -46,7 +45,6 @@ class XMLTextFrameContext : public SvXMLImportContext
 
     SvXMLImportContextRef m_xImplContext;
     SvXMLImportContextRef m_xReplImplContext;
-    SvXMLAttributeList *m_pAttrList;
 
     XMLTextFrameContextHyperlink_Impl   *m_pHyperlink;
     // Implement Title/Description Elements UI (#i73249#)
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 0e8057b24fe7..bf55333e2c3d 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2870,7 +2870,6 @@ XMLReferenceFieldImportContext::XMLReferenceFieldImportContext(
 ,   nType(ReferenceFieldPart::PAGE_DESC)
 ,   bNameOK(sal_False)
 ,   bTypeOK(sal_False)
-,   bSeqNumberOK(sal_False)
 {
 }
 
@@ -3869,7 +3868,6 @@ XMLScriptImportContext::XMLScriptImportContext(
 ,   sPropertyContent(sAPI_content)
 ,   bContentOK(sal_False)
 ,   bScriptTypeOK(sal_False)
-,   bUrlContent(sal_False)
 {
 }
 
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e5d8876b48ae..6eba38b1c332 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1303,7 +1303,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
                                                               GetExport() );
 
     pSectionExport = new XMLSectionExport( rExp, *this );
-    pIndexMarkExport = new XMLIndexMarkExport( rExp, *this );
+    pIndexMarkExport = new XMLIndexMarkExport( rExp );
 
     if( ! IsBlockMode() &&
         Reference<XRedlinesSupplier>( GetExport().GetModel(), UNO_QUERY ).is())
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index c9c8219d214f..e605685bd658 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -115,7 +115,7 @@ XMLVarFieldImportContext::XMLVarFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
     const sal_Char* pServiceName, sal_uInt16 nPrfx,
     const OUString& rLocalName,
-    sal_Bool bName, sal_Bool bFormula, sal_Bool bFormulaDefault,
+    sal_Bool bFormula, sal_Bool bFormulaDefault,
     sal_Bool bDescription, sal_Bool bHelp, sal_Bool bHint, sal_Bool bVisible,
     sal_Bool bIsDisplayFormula,
     sal_Bool bType, sal_Bool bStyle, sal_Bool bValue,
@@ -137,7 +137,6 @@ XMLVarFieldImportContext::XMLVarFieldImportContext(
         bHelpOK(sal_False),
         bHintOK(sal_False),
         bDisplayOK(sal_False),
-        bSetName(bName),
         bSetFormula(bFormula),
         bSetFormulaDefault(bFormulaDefault),
         bSetDescription(bDescription),
@@ -310,12 +309,12 @@ XMLSetVarFieldImportContext::XMLSetVarFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
     const sal_Char* pServiceName, sal_uInt16 nPrfx,
     const OUString& rLocalName, VarType eVarType,
-    sal_Bool bName, sal_Bool bFormula, sal_Bool bFormulaDefault,
+    sal_Bool bFormula, sal_Bool bFormulaDefault,
     sal_Bool bDescription, sal_Bool bHelp, sal_Bool bHint, sal_Bool bVisible, sal_Bool bIsDisplayFormula,
     sal_Bool bType, sal_Bool bStyle, sal_Bool bValue, sal_Bool bPresentation) :
         XMLVarFieldImportContext(rImport, rHlp, pServiceName,
                                  nPrfx, rLocalName,
-                                 bName, bFormula, bFormulaDefault,
+                                 bFormula, bFormulaDefault,
                                  bDescription, bHelp, bHint, bVisible, bIsDisplayFormula,
                                  bType, bStyle, bValue, bPresentation),
         eFieldType(eVarType)
@@ -399,8 +398,8 @@ XMLSequenceFieldImportContext::XMLSequenceFieldImportContext(
     sal_uInt16 nPrfx, const OUString& rLocalName) :
         XMLSetVarFieldImportContext(rImport, rHlp, sAPI_set_expression,
                                     nPrfx, rLocalName, VarTypeSequence,
-                                    // name, formula
-                                    sal_True, sal_True, sal_True,
+                                    // formula
+                                    sal_True, sal_True,
                                     sal_False, sal_False, sal_False, sal_False,
                                     sal_False,
                                     sal_False, sal_False, sal_False, sal_True),
@@ -472,9 +471,9 @@ XMLVariableSetFieldImportContext::XMLVariableSetFieldImportContext(
     sal_uInt16 nPrfx, const OUString& rLocalName) :
         XMLSetVarFieldImportContext(rImport, rHlp, sAPI_set_expression,
                                     nPrfx, rLocalName, VarTypeSimple,
-                                    // name, formula, value&type, style,
+                                    // formula, value&type, style,
                                     // display none
-                                    sal_True, sal_True, sal_True,
+                                    sal_True, sal_True,
                                     sal_False, sal_False, sal_False,
                                     sal_True, sal_False,
                                     sal_True, sal_True, sal_True,
@@ -508,9 +507,9 @@ XMLVariableInputFieldImportContext::XMLVariableInputFieldImportContext(
     const OUString& rLocalName) :
         XMLSetVarFieldImportContext(rImport, rHlp, sAPI_set_expression,
                                     nPrfx, rLocalName, VarTypeSimple,
-                                    // name, description, display none/formula,
+                                    // description, display none/formula,
                                     // value&type, style, formula
-                                    sal_True, sal_True, sal_True,
+                                    sal_True, sal_True,
                                     sal_True, sal_True, sal_True,
                                     sal_True, sal_False,
                                     sal_True, sal_True, sal_True,
@@ -550,8 +549,8 @@ XMLUserFieldImportContext::XMLUserFieldImportContext(
     sal_uInt16 nPrfx, const OUString& rLocalName) :
         XMLSetVarFieldImportContext(rImport, rHlp, sAPI_user, nPrfx,
                                     rLocalName, VarTypeUserField,
-                                    // name, display none/formula, style
-                                    sal_True, sal_False, sal_False,
+                                    // display none/formula, style
+                                    sal_False, sal_False,
                                     sal_False, sal_False, sal_False, sal_True,
                                     sal_True,
                                     sal_False, sal_True, sal_False,
@@ -573,8 +572,8 @@ XMLUserFieldInputImportContext::XMLUserFieldInputImportContext(
     const OUString& rLocalName) :
         XMLVarFieldImportContext(rImport, rHlp, sAPI_input_user,
                                  nPrfx, rLocalName,
-                                 // name, description, style
-                                 sal_True, sal_False, sal_False,
+                                 // description, style
+                                 sal_False, sal_False,
                                  sal_True, sal_False, sal_False,
                                  sal_False, sal_False,
                                  sal_False /*???*/, sal_True, sal_False,
@@ -605,8 +604,8 @@ XMLVariableGetFieldImportContext::XMLVariableGetFieldImportContext(
     sal_uInt16 nPrfx, const OUString& rLocalName) :
         XMLVarFieldImportContext(rImport, rHlp, sAPI_get_expression,
                                  nPrfx, rLocalName,
-                                 // name, style, display formula
-                                 sal_True, sal_False, sal_False,
+                                 // style, display formula
+                                 sal_False, sal_False,
                                  sal_False, sal_False, sal_False,
                                  sal_False, sal_True,
                                  sal_True, sal_True, sal_False,
@@ -641,7 +640,7 @@ XMLExpressionFieldImportContext::XMLExpressionFieldImportContext(
         XMLVarFieldImportContext(rImport, rHlp, sAPI_get_expression,
                                  nPrfx, rLocalName,
                                  // formula, type, style, display formula
-                                 sal_False, sal_True, sal_True,
+                                 sal_True, sal_True,
                                  sal_False, sal_False, sal_False,
                                  sal_False, sal_True,
                                  sal_True, sal_True, sal_False,
@@ -678,7 +677,7 @@ XMLTextInputFieldImportContext::XMLTextInputFieldImportContext(
         XMLVarFieldImportContext(rImport, rHlp, sAPI_input,
                                  nPrfx, sLocalName,
                                  // description
-                                 sal_False, sal_False, sal_False,
+                                 sal_False, sal_False,
                                  sal_True, sal_True, sal_True,
                                  sal_False, sal_False,
                                  sal_False, sal_False, sal_False,