diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-30 23:21:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-31 09:04:16 +0200 |
| commit | 65f2d5c9f7aab607e83a4876bca70c330850d345 (patch) | |
| tree | 3969d46a8bc736e3d5b2fe394f83c1718743c7f3 /oox/source/dump/dumperbase.cxx | |
| parent | 0a7000e032a43e56e75c8e8066117683866fdc36 (diff) | |
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: Idea1fd2769c2431906d4898c0ec935f20bddc391
Diffstat (limited to 'oox/source/dump/dumperbase.cxx')
| -rw-r--r-- | oox/source/dump/dumperbase.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
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 |