diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-03-03 19:22:59 +0100 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-03-03 19:22:59 +0100 |
| commit | 486048c8e9cdee3730e087c537398816ea0343b1 (patch) | |
| tree | 5d1d893450ba094bfa4097fb620d7f49867451a7 /oox/source/core/filterbase.cxx | |
| parent | d1e7561aa828518dcbbbf78226877b4d564af2dd (diff) | |
tl78: #i109779# password2modify: preparations in oox, import from xlsx
Diffstat (limited to 'oox/source/core/filterbase.cxx')
| -rw-r--r-- | oox/source/core/filterbase.cxx | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index f2f9ef09b9e5..5d6921c87bd5 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -39,11 +39,11 @@ #include <rtl/instance.hxx> #include <rtl/uri.hxx> #include <comphelper/docpasswordhelper.hxx> -#include <comphelper/mediadescriptor.hxx> #include "tokens.hxx" #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/binaryoutputstream.hxx" #include "oox/helper/graphichelper.hxx" +#include "oox/helper/mediadescriptor.hxx" #include "oox/helper/modelobjecthelper.hxx" #include "oox/ole/oleobjecthelper.hxx" @@ -71,7 +71,6 @@ using ::com::sun::star::io::XStream; using ::com::sun::star::task::XStatusIndicator; using ::com::sun::star::task::XInteractionHandler; using ::com::sun::star::graphic::XGraphic; -using ::comphelper::MediaDescriptor; using ::comphelper::SequenceAsHashMap; using ::oox::ole::OleObjectHelper; @@ -257,11 +256,7 @@ void FilterBaseImpl::finalizeFilter() { try { - // clear the 'ComponentData' property in the descriptor - MediaDescriptor::iterator aIt = maMediaDesc.find( MediaDescriptor::PROP_COMPONENTDATA() ); - if( aIt != maMediaDesc.end() ) - aIt->second.clear(); - // write the descriptor back to the document model (adds the password) + // write the descriptor back to the document model (adds the passwords) mxModel->attachResource( maFileUrl, maMediaDesc.getAsConstPropertyValueList() ); // unlock the model controllers mxModel->unlockControllers(); @@ -305,11 +300,6 @@ const Reference< XMultiServiceFactory >& FilterBase::getGlobalFactory() const return mxImpl->mxGlobalFactory; } -MediaDescriptor& FilterBase::getMediaDescriptor() const -{ - return mxImpl->maMediaDesc; -} - const Reference< XModel >& FilterBase::getModel() const { return mxImpl->mxModel; @@ -330,6 +320,11 @@ const Reference< XInteractionHandler >& FilterBase::getInteractionHandler() cons return mxImpl->mxInteractionHandler; } +MediaDescriptor& FilterBase::getMediaDescriptor() const +{ + return mxImpl->maMediaDesc; +} + const OUString& FilterBase::getFileUrl() const { return mxImpl->maFileUrl; @@ -648,7 +643,7 @@ Reference< XStream > FilterBase::implGetOutputStream( MediaDescriptor& rMediaDes void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDescSeq ) { - mxImpl->maMediaDesc = rMediaDescSeq; + mxImpl->maMediaDesc << rMediaDescSeq; switch( mxImpl->meDirection ) { |