diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-03-29 12:29:44 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-29 12:44:23 +0100 |
commit | 21ca0847952be3eabc7c11200a2b70e0801a8fc6 (patch) | |
tree | aeab1f2d0b33c9b8a07114a6dca46661c5b7788e /oox | |
parent | remove static OUStrings from static_initialization_and_destruction chain (diff) | |
download | core-21ca0847952be3eabc7c11200a2b70e0801a8fc6.tar.gz core-21ca0847952be3eabc7c11200a2b70e0801a8fc6.zip |
callcatcher: update list
Diffstat (limited to 'oox')
-rw-r--r-- | oox/inc/oox/core/filterbase.hxx | 3 | ||||
-rw-r--r-- | oox/inc/oox/dump/dumperbase.hxx | 1 | ||||
-rw-r--r-- | oox/source/core/filterbase.cxx | 8 | ||||
-rw-r--r-- | oox/source/dump/dumperbase.cxx | 14 |
4 files changed, 0 insertions, 26 deletions
diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx index 7c09707f940b..41f49f7669ce 100644 --- a/oox/inc/oox/core/filterbase.hxx +++ b/oox/inc/oox/core/filterbase.hxx @@ -121,9 +121,6 @@ public: // ------------------------------------------------------------------------ - /** Returns the specified argument passed through the XInitialization interface. */ - ::com::sun::star::uno::Any getArgument( const ::rtl::OUString& rArgName ) const; - /** Returns the component context passed in the filter constructor (always existing). */ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getComponentContext() const; diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 77d2710224bb..a8b16b008bb7 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -875,7 +875,6 @@ public: void eraseNameList( const ::rtl::OUString& rListName ); NameListRef getNameList( const ::rtl::OUString& rListName ) const; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ); inline bool isPasswordCancelled() const { return mbPwCancelled; } protected: diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 40288ef1d640..2620272f6803 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -246,14 +246,6 @@ OoxmlVersion FilterBase::getVersion() const return mxImpl->meVersion; } -// ---------------------------------------------------------------------------- - -Any FilterBase::getArgument( const OUString& rArgName ) const -{ - SequenceAsHashMap::const_iterator aIt = mxImpl->maArguments.find( rArgName ); - return (aIt == mxImpl->maArguments.end()) ? Any() : aIt->second; -} - const Reference< XComponentContext >& FilterBase::getComponentContext() const { return mxImpl->mxComponentContext; diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index b2078edb760f..0a10907c27ae 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -1469,20 +1469,6 @@ NameListRef SharedConfigData::getNameList( const OUString& rListName ) const return xList; } -Sequence< NamedValue > SharedConfigData::requestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) -{ - Sequence< NamedValue > aEncryptionData; - if( !mbPwCancelled ) - { - ::std::vector< OUString > aDefaultPasswords; - aDefaultPasswords.push_back( CREATE_OUSTRING( "VelvetSweatshop" ) ); - aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword( - rVerifier, mrMediaDesc, ::comphelper::DocPasswordRequestType_MS, &aDefaultPasswords ); - mbPwCancelled = !aEncryptionData.hasElements(); - } - return aEncryptionData; -} - bool SharedConfigData::implIsValid() const { return mbLoaded && mxContext.is() && mxRootStrg.get() && !maSysFileName.isEmpty(); |