loplugin:expandablemethodds in include/oox

Change-Id: I06b82e8b927d24204e5a952474a2dfd780b3cae6

4 files changed, 4 insertions, 22 deletions

diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 3b86e9b03b78..917835fd04f4 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -585,8 +585,6 @@ class ConstList : public NameListBase
 public:
     explicit            ConstList( const SharedConfigData& rCfgData );
 
-    /** Sets a default name for unknown keys. */
-    void                setDefaultName( const String& rDefName ) { maDefName = rDefName; }
     /** Enables or disables automatic quotation of returned names. */
     void                setQuoteNames( bool bQuoteNames ) { mbQuoteNames = bQuoteNames; }
 
@@ -770,7 +768,6 @@ public:
     const StorageRef& getRootStorage() const { return mxRootStrg; }
     const OUString& getSysFileName() const { return maSysFileName; }
 
-    void                setOption( const OUString& rKey, const OUString& rData );
     const OUString*      getOption( const OUString& rKey ) const;
 
     template< typename ListType >
@@ -871,7 +868,6 @@ public:
 
 protected:
                         Config() {}
-    void                construct( const Config& rParent );
     void                construct(
                             const sal_Char* pcEnvVar,
                             const ::oox::core::FilterBase& rFilter );
diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx
index 750e5f75a679..39dbf8583e6a 100644
--- a/include/oox/helper/propertyset.hxx
+++ b/include/oox/helper/propertyset.hxx
@@ -78,10 +78,6 @@ public:
     /** Returns true, if the contained XPropertySet interface is valid. */
     bool         is() const { return mxPropSet.is(); }
 
-    /** Returns the contained XPropertySet interface. */
-    const css::uno::Reference< css::beans::XPropertySet >&
-                        getXPropertySet() const { return mxPropSet; }
-
     /** Returns true, if the specified property is supported by the property set. */
     bool                hasProperty( sal_Int32 nPropId ) const;
 
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 8f8474c10e84..a63fe323300c 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -950,7 +950,7 @@ void ConstList::implProcessConfigItemStr(
         TextInputStream& rStrm, const OUString& rKey, const OUString& rData )
 {
     if ( rKey == "default" )
-        setDefaultName( rData );
+        maDefName = rData; // Sets a default name for unknown keys.
     else if ( rKey == "quote-names" )
         setQuoteNames( StringHelper::convertStringToBool( rData ) );
     else
@@ -1275,11 +1275,6 @@ SharedConfigData::~SharedConfigData()
 {
 }
 
-void SharedConfigData::setOption( const OUString& rKey, const OUString& rData )
-{
-    maConfigData[ rKey ] = rData;
-}
-
 const OUString* SharedConfigData::getOption( const OUString& rKey ) const
 {
     ConfigDataMap::const_iterator aIt = maConfigData.find( rKey );
@@ -1329,7 +1324,7 @@ void SharedConfigData::implProcessConfigItemStr(
     else if ( rKey == "unitconverter" )
         createUnitConverter( rData );
     else
-        setOption( rKey, rData );
+        maConfigData[ rKey ] = rData;
 }
 
 bool SharedConfigData::readConfigFile( const OUString& rFileUrl )
@@ -1395,7 +1390,7 @@ void SharedConfigData::createUnitConverter( const OUString& rData )
 Config::Config( const Config& rParent ) :
     Base()  // c'tor needs to be called explicitly to avoid compiler warning
 {
-    construct( rParent );
+    *this = rParent;
 }
 
 Config::Config( const sal_Char* pcEnvVar, const FilterBase& rFilter )
@@ -1412,11 +1407,6 @@ Config::~Config()
 {
 }
 
-void Config::construct( const Config& rParent )
-{
-    *this = rParent;
-}
-
 void Config::construct( const sal_Char* pcEnvVar, const FilterBase& rFilter )
 {
     if( !rFilter.getFileUrl().isEmpty() )
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index b66de7ac8fed..52b44d79cbcd 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -142,7 +142,7 @@ bool PropertySet::implSetPropertyValue( const OUString& rPropName, const Any& rV
 #ifdef DBG_UTIL
 void PropertySet::dump()
 {
-    PropertyMap::dump( Reference< XPropertySet >( getXPropertySet(), UNO_QUERY ) );
+    PropertyMap::dump( mxPropSet );
 }
 #endif