diff options
author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-06-12 15:25:32 +0100 |
---|---|---|
committer | Aron Budea <aron.budea@collabora.com> | 2023-06-18 03:04:09 +0200 |
commit | d208e9062e5d1bd6a382995e12437aa5ad39a14d (patch) | |
tree | 665fe99e39d279ac2246ec432db36ce088de2be5 | |
parent | cid#1532384 Out-of-bounds read (diff) | |
download | core-d208e9062e5d1bd6a382995e12437aa5ad39a14d.tar.gz core-d208e9062e5d1bd6a382995e12437aa5ad39a14d.zip |
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 366a9cdd1a0b03c1abe7ffc7515a34a8abd27754)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153149
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
-rw-r--r-- | filter/source/svg/svgexport.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 ); |