summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-11-30 12:42:10 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-12-01 02:20:51 +0100
commit6b3cc69fd2b2de5ace68f2739eb383267d66f76f (patch)
treeba4a55c5e44d4e25025cfa3b21cfdcf4b2f3d615
parentf7c841f56f7c1e9b7757ba3a5c22ab499ac1a48e (diff)
Related tdf#72966 Provide replacement graphic also for metafiles
With this, SVM files are still written to ODF, but accompanied by a replacement png graphic. Change-Id: I2c949f100dd5197a10c741baa42ea740f3a1415a Reviewed-on: https://gerrit.libreoffice.org/45567 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--svx/source/svdraw/svdograf.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index b0ce78c47607..bcc7473b6330 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -447,9 +447,10 @@ const GraphicObject* SdrGrafObj::GetReplacementGraphicObject() const
{
const_cast< SdrGrafObj* >(this)->mpReplacementGraphic = new GraphicObject(rVectorGraphicDataPtr->getReplacement());
}
- else if (pGraphic->GetGraphic().getPdfData().hasElements())
+ else if (pGraphic->GetGraphic().getPdfData().hasElements()
+ || pGraphic->GetGraphic().GetType() == GraphicType::GdiMetafile)
{
- // Replacement graphic for bitmap + PDF is just the bitmap.
+ // Replacement graphic for PDF and metafiles is just the bitmap.
const_cast<SdrGrafObj*>(this)->mpReplacementGraphic = new GraphicObject(pGraphic->GetGraphic().GetBitmapEx());
}
if (mpReplacementGraphic)