diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-05-03 08:14:16 +0500 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-05-03 11:19:04 +0200 |
| commit | 2aa310cfe0bc10e7bf079147d379f6eb7d061b74 (patch) | |
| tree | 3d2d7fe05e9c2f690e5db185d48ecefa5c715c98 /xmloff | |
| parent | 9490972c04b79065f247b3076a7c53c9ec4fad67 (diff) | |
tdf#160915: make own OLE objects obey AddReplacementImages setting
Change-Id: I25ce3c920dc8ba25d0ac14310ff9cba8a4c23c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167026
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index a701fff5dd12..0f150c847cd2 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2526,8 +2526,8 @@ void XMLShapeExport::ImpExportGraphicObjectShape( //Resolves: fdo#62461 put preferred image first above, followed by //fallback here - const bool bAddReplacementImages = officecfg::Office::Common::Save::Graphic::AddReplacementImages::get(); - if( !bIsEmptyPresObj && bAddReplacementImages) + if (!bIsEmptyPresObj + && officecfg::Office::Common::Save::Graphic::AddReplacementImages::get()) { uno::Reference<graphic::XGraphic> xReplacementGraphic; xPropSet->getPropertyValue("ReplacementGraphic") >>= xReplacementGraphic; @@ -3574,13 +3574,16 @@ void XMLShapeExport::ImpExportMediaShape( pPluginOBJ.reset(); - uno::Reference<graphic::XGraphic> xGraphic; - xPropSet->getPropertyValue("Graphic") >>= xGraphic; - Graphic aGraphic(xGraphic); - if (!aGraphic.IsNone()) + if (officecfg::Office::Common::Save::Graphic::AddReplacementImages::get()) { - // The media has a preview, export it. - ExportGraphicPreview(xGraphic, mrExport, u"MediaPreview", u".png", "image/png"); + uno::Reference<graphic::XGraphic> xGraphic; + xPropSet->getPropertyValue("Graphic") >>= xGraphic; + Graphic aGraphic(xGraphic); + if (!aGraphic.IsNone()) + { + // The media has a preview, export it. + ExportGraphicPreview(xGraphic, mrExport, u"MediaPreview", u".png", "image/png"); + } } ImpExportDescription(xShape); @@ -5170,7 +5173,8 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape } } - if( !bIsEmptyPresObj ) + if (!bIsEmptyPresObj + && officecfg::Office::Common::Save::Graphic::AddReplacementImages::get()) { uno::Reference< graphic::XGraphic > xGraphic( xPropSet->getPropertyValue("ReplacementGraphic"), uno::UNO_QUERY ); ExportGraphicPreview(xGraphic, mrExport, u"TablePreview", u".svm", "image/x-vclgraphic"); |