diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-21 12:38:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-21 13:23:02 +0200 |
| commit | f3fab399da4035e910ae701bd1a3e9a6898f13a9 (patch) | |
| tree | 08f1fc2f9ba4235211955c656c3f296735e156c5 /oox | |
| parent | 1f7c5d2a55486bcbcd066111cea9b91ec348baf1 (diff) | |
loplugin:expandablemethodds in include/oox
Change-Id: I06b82e8b927d24204e5a952474a2dfd780b3cae6
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/dump/dumperbase.cxx | 16 | ||||
| -rw-r--r-- | oox/source/helper/propertyset.cxx | 2 |
2 files changed, 4 insertions, 14 deletions
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 |