diff options
Diffstat (limited to 'oox/source/core/filterdetect.cxx')
| -rw-r--r-- | oox/source/core/filterdetect.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 12cafc48305a..00244c224778 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -41,6 +41,7 @@ #include "oox/ole/olestorage.hxx" using ::rtl::OUString; +using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; @@ -474,9 +475,7 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript return xInStrm; // check if a temporary file is passed in the 'ComponentData' property - Sequence< NamedValue > aCompData = rMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_COMPONENTDATA(), Sequence< NamedValue >() ); - SequenceAsHashMap aCompDataMap( aCompData ); - Reference< XStream > xDecrypted = aCompDataMap.getUnpackedValueOrDefault( CREATE_OUSTRING( "DecryptedPackage" ), Reference< XStream >() ); + Reference< XStream > xDecrypted( rMediaDesc.getComponentDataEntry( CREATE_OUSTRING( "DecryptedPackage" ) ), UNO_QUERY ); if( xDecrypted.is() ) { Reference< XInputStream > xDecrInStrm = xDecrypted->getInputStream(); @@ -559,10 +558,7 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript aDecryptedPackage.seekToStart(); // store temp file in media descriptor to keep it alive - Sequence< NamedValue > aPropSeq( 1 ); - aPropSeq[ 0 ].Name = CREATE_OUSTRING( "DecryptedPackage" ); - aPropSeq[ 0 ].Value <<= xTempFile; - rMediaDesc[ MediaDescriptor::PROP_COMPONENTDATA() ] <<= aPropSeq; + rMediaDesc.setComponentDataEntry( CREATE_OUSTRING( "DecryptedPackage" ), Any( xTempFile ) ); Reference< XInputStream > xDecrInStrm = xTempFile->getInputStream(); if( lclIsZipPackage( mxFactory, xDecrInStrm ) ) |