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

Change-Id: Idea1fd2769c2431906d4898c0ec935f20bddc391

7 files changed, 14 insertions, 37 deletions

diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index ec64dd7d154e..8949fc52c107 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -30,7 +30,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/util/DateTime.hpp>
-#include <comphelper/mediadescriptor.hxx>
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/helper.hxx"
 #include "oox/helper/storagebase.hxx"
@@ -829,8 +828,7 @@ public:
                             const ::rtl::OUString& rFileName,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
-                            const ::rtl::OUString& rSysFileName,
-                            ::comphelper::MediaDescriptor& rMediaDesc );
+                            const ::rtl::OUString& rSysFileName );
 
     virtual             ~SharedConfigData();
 
@@ -871,7 +869,6 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
     StorageRef          mxRootStrg;
     ::rtl::OUString     maSysFileName;
-    ::comphelper::MediaDescriptor& mrMediaDesc;
     ConfigFileSet       maConfigFiles;
     ConfigDataMap       maConfigData;
     NameListMap         maNameLists;
@@ -915,8 +912,7 @@ public:
                             const sal_Char* pcEnvVar,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
-                            const ::rtl::OUString& rSysFileName,
-                            ::comphelper::MediaDescriptor& rMediaDesc );
+                            const ::rtl::OUString& rSysFileName );
 
     virtual             ~Config();
 
@@ -956,8 +952,7 @@ protected:
                             const sal_Char* pcEnvVar,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
-                            const ::rtl::OUString& rSysFileName,
-                            ::comphelper::MediaDescriptor& rMediaDesc );
+                            const ::rtl::OUString& rSysFileName );
 
     virtual bool        implIsValid() const;
     virtual const ::rtl::OUString* implGetOption( const ::rtl::OUString& rKey ) const;
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 0e4861575315..31b1a2ffd720 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1303,11 +1303,10 @@ NameListRef NameListWrapper::getNameList( const Config& rCfg ) const
 
 SharedConfigData::SharedConfigData( const OUString& rFileName,
         const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg,
-        const OUString& rSysFileName, MediaDescriptor& rMediaDesc ) :
+        const OUString& rSysFileName ) :
     mxContext( rxContext ),
     mxRootStrg( rxRootStrg ),
     maSysFileName( rSysFileName ),
-    mrMediaDesc( rMediaDesc ),
     mbLoaded( false ),
     mbPwCancelled( false )
 {
@@ -1454,9 +1453,9 @@ Config::Config( const sal_Char* pcEnvVar, const FilterBase& rFilter )
     construct( pcEnvVar, rFilter );
 }
 
-Config::Config( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName, MediaDescriptor& rMediaDesc )
+Config::Config( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName )
 {
-    construct( pcEnvVar, rxContext, rxRootStrg, rSysFileName, rMediaDesc );
+    construct( pcEnvVar, rxContext, rxRootStrg, rSysFileName );
 }
 
 Config::~Config()
@@ -1471,14 +1470,14 @@ void Config::construct( const Config& rParent )
 void Config::construct( const sal_Char* pcEnvVar, const FilterBase& rFilter )
 {
     if( !rFilter.getFileUrl().isEmpty() )
-        construct( pcEnvVar, rFilter.getComponentContext(), rFilter.getStorage(), rFilter.getFileUrl(), rFilter.getMediaDescriptor() );
+        construct( pcEnvVar, rFilter.getComponentContext(), rFilter.getStorage(), rFilter.getFileUrl() );
 }
 
-void Config::construct( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName, MediaDescriptor& rMediaDesc )
+void Config::construct( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName )
 {
     if( pcEnvVar && rxRootStrg.get() && !rSysFileName.isEmpty() )
         if( const sal_Char* pcFileName = ::getenv( pcEnvVar ) )
-            mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxContext, rxRootStrg, rSysFileName, rMediaDesc ) );
+            mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxContext, rxRootStrg, rSysFileName ) );
 }
 
 const OUString& Config::getStringOption( const String& rKey, const OUString& rDefault ) const
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index b87ba614727f..2a51ba41f4af 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::io;
 //using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-using ::comphelper::MediaDescriptor;
 using ::oox::core::FilterBase;
 using ::rtl::OUString;
 
@@ -122,8 +121,7 @@ Dumper::Dumper( const Reference< XComponentContext >& rxContext, const Reference
     if( rxContext.is() && rxInStrm.is() )
     {
         StorageRef xStrg( new ZipStorage( rxContext, rxInStrm ) );
-        MediaDescriptor aMediaDesc;
-        ConfigRef xCfg( new Config( DUMP_PPTX_CONFIG_ENVVAR, rxContext, xStrg, rSysFileName, aMediaDesc ) );
+        ConfigRef xCfg( new Config( DUMP_PPTX_CONFIG_ENVVAR, rxContext, xStrg, rSysFileName ) );
         DumperBase::construct( xCfg );
     }
 }
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index d42b07b32568..8475cf0353ff 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -47,13 +47,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/oox/source/ppt/buildlistcontext.cxx b/oox/source/ppt/buildlistcontext.cxx
index aec83fe05374..fe8516259323 100644
--- a/oox/source/ppt/buildlistcontext.cxx
+++ b/oox/source/ppt/buildlistcontext.cxx
@@ -21,19 +21,10 @@
 #include <rtl/ustring.hxx>
 #include "oox/helper/attributelist.hxx"
 
-
-using namespace ::oox::core;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
-
 namespace oox { namespace ppt {
 
-    BuildListContext::BuildListContext( FragmentHandler2& rParent,
-                const Reference< XFastAttributeList >& /*xAttribs*/,
-                TimeNodePtrList & aTimeNodeList)
+    BuildListContext::BuildListContext( FragmentHandler2& rParent )
         : FragmentHandler2( rParent )
-        , maTimeNodeList( aTimeNodeList )
         , mbInBldGraphic( false )
         ,   mbBuildAsOne( false )
     {
diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx
index 1cf97b0de20c..8ad7156576ef 100644
--- a/oox/source/ppt/buildlistcontext.hxx
+++ b/oox/source/ppt/buildlistcontext.hxx
@@ -22,7 +22,6 @@
 #ifndef OOX_PPT_BUILDLISTCONTEXT
 #define OOX_PPT_BUILDLISTCONTEXT
 
-#include "oox/ppt/timenode.hxx"
 #include "oox/core/fragmenthandler2.hxx"
 
 namespace oox { namespace ppt {
@@ -33,9 +32,7 @@ namespace oox { namespace ppt {
         : public ::oox::core::FragmentHandler2
     {
     public:
-        BuildListContext( ::oox::core::FragmentHandler2& rParent,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
-                TimeNodePtrList & aTimeNodeList);
+        BuildListContext( ::oox::core::FragmentHandler2& rParent );
 
         ~BuildListContext( );
 
@@ -43,7 +40,6 @@ namespace oox { namespace ppt {
 
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs );
     private:
-        TimeNodePtrList & maTimeNodeList;
         bool              mbInBldGraphic;
         bool              mbBuildAsOne;
     };
diff --git a/oox/source/ppt/slidetimingcontext.cxx b/oox/source/ppt/slidetimingcontext.cxx
index ae709c47ce94..2bcdc75209ae 100644
--- a/oox/source/ppt/slidetimingcontext.cxx
+++ b/oox/source/ppt/slidetimingcontext.cxx
@@ -51,12 +51,12 @@ SlideTimingContext::~SlideTimingContext() throw()
 
 }
 
-::oox::core::ContextHandlerRef SlideTimingContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
+::oox::core::ContextHandlerRef SlideTimingContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& )
 {
     switch( aElementToken )
     {
     case PPT_TOKEN( bldLst ):
-        return new BuildListContext( *this, rAttribs.getFastAttributeList(), maTimeNodeList );
+        return new BuildListContext( *this );
     case PPT_TOKEN( extLst ):
         return this;
     case PPT_TOKEN( tnLst ):