core.git: Branch 'libreoffice-24-2' - filter/source

[Noel Grandin (via logerrit)]

 filter/source/xsltdialog/xmlfilterjar.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit f6fae8f9a3f380a9e1c5908984092af7b3ef7567
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jun 19 15:11:11 2024 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Jun 25 09:55:40 2024 +0200

    tdf#161219 Exporting XML filter as package results in empty jar
    
    regression from
        commit a04bf69bccfbc266643b418ef57030a42bbb5c05
        Author: Noel Grandin <noel.gran...@collabora.co.uk>
        Date:   Mon Jan 16 10:36:59 2023 +0200
        XUnoTunnel->dynamic_cast in ZipPackageEntry
    
    Change-Id: I12915bb093ea050f4290c02cc5a6e1dc2c7b903a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169204
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit 51dfbb1fce61dfb2e1d4c91350d2299e6dc3e04d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169489
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx 
b/filter/source/xsltdialog/xmlfilterjar.cxx
index 01ec7af8ccd8..2a22b9b07b52 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
@@ -105,11 +104,10 @@ static Reference< XInterface > addFolder( Reference< 
XInterface > const & xRootF
 static void addFile_( Reference< XInterface > const & xRootFolder, Reference< 
XSingleServiceFactory > const & xFactory, Reference< XInputStream > const & 
xInput, const OUString& aName )
 {
     Reference< XActiveDataSink > xSink( xFactory->createInstance(), UNO_QUERY 
);
-    Reference< XUnoTunnel > xTunnel( xSink, UNO_QUERY );
-    if( xSink.is() && xTunnel.is())
+    if( xSink.is() )
     {
         Reference< XNameContainer > xNameContainer(xRootFolder, UNO_QUERY );
-        xNameContainer->insertByName(encodeZipUri( aName ), Any(xTunnel));
+        xNameContainer->insertByName(encodeZipUri( aName ), Any(Reference< 
XInterface >( xSink, UNO_QUERY )));
         xSink->setInputStream( xInput );
     }
 }