[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - filter/source

[Caolán McNamara (via logerrit)]

 filter/source/svg/svgexport.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d208e9062e5d1bd6a382995e12437aa5ad39a14d
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Jun 12 15:25:32 2023 +0100
Commit:     Aron Budea <aron.bu...@collabora.com>
CommitDate: Sun Jun 18 03:04:09 2023 +0200

    Resolves: tdf#155791 export of default impress slide master to svg failed
    
    Change-Id: Ie4ec64fef6d8c2c2844a01d06109ad9022714c11
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152913
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    (cherry picked from commit 366a9cdd1a0b03c1abe7ffc7515a34a8abd27754)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153149
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index ae74a6e2fbc6..d6b154a67212 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -668,7 +668,7 @@ bool SVGFilter::implExportImpressOrDraw( const Reference< 
XOutputStream >& rxOSt
 
     if( rxOStm.is() )
     {
-        if( !mSelectedPages.empty() && !mMasterPageTargets.empty() )
+        if (!mSelectedPages.empty())
         {
             Reference< XDocumentHandler > xDocHandler = 
implCreateExportDocumentHandler( rxOStm );
 
@@ -985,7 +985,7 @@ bool SVGFilter::implExportDocument()
                 mpSVGWriter->SetPreviewMode();
 
             // #i124608# export a given object selection, so no MasterPage 
export at all
-            if (!mbExportShapeSelection)
+            if (!mbExportShapeSelection && !mMasterPageTargets.empty())
                 implExportMasterPages( mMasterPageTargets, 0, 
mMasterPageTargets.size() - 1 );
             implExportDrawPages( mSelectedPages, 0, nLastPage );