ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

fix ZipPackageHelper::addFile

Browse Source 
after
    commit a04bf69bcc
    Author: Noel Grandin <noel.grandin@collabora.co.uk>
    Date:   Mon Jan 16 10:36:59 2023 +0200
    XUnoTunnel->dynamic_cast in ZipPackageEntry
it no longer implements XUnoTunnel.

And add an assert, the createInstance call should never fail.

Change-Id: I9a0698862ba783057a299b9c52ebc2b828cc2ac1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145929
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2023-01-21 18:06:50 +00:00
parent 3c08e71af3
commit 4fd3fd3630
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unotools/source/misc/ZipPackageHelper.cxx
+3 -4
View File
@@ -23,7 +23,6 @@
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -155,12 +154,12 @@ void ZipPackageHelper::addFile( css::uno::Reference< css::uno::XInterface > cons
SvFileStream* pStream = new SvFileStream(rSourceFileURL, StreamMode::READ );
Reference< XInputStream > xInput( new utl::OSeekableInputStreamWrapper( pStream, true ) );
Reference< XActiveDataSink > xSink( mxFactory->createInstance(), UNO_QUERY );
Reference< XUnoTunnel > xTunnel( xSink, UNO_QUERY );
if( !xSink.is() || !xTunnel.is())
assert(xSink); // this should never fail
if( !xSink.is() )
return;
Reference< XNameContainer > xNameContainer(xRootFolder, UNO_QUERY );
xNameContainer->insertByName(encodeZipUri( aName ), Any(xTunnel));
xNameContainer->insertByName(encodeZipUri( aName ), Any(xSink));
xSink->setInputStream( xInput );
}