summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-11-30 12:45:26 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-12-01 08:20:28 +0100
commit38602abc2d2b59bc3644e37797b9b1bc779fd993 (patch)
tree8928d33e8316c242f0cbba93c0de26f2f77baf05
parente7f6fdd5c3805469e1905b11d11d9b01bef477a9 (diff)
tdf#113696 Write replacement graphic also to flat odf
Not only to zipped ODF Change-Id: Ic86656aea31c9fc20862628cdd31698b9904e999 Reviewed-on: https://gerrit.libreoffice.org/45568 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
-rw-r--r--xmloff/source/draw/shapeexport.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 29d3c74a84af..78146f1a392a 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2392,13 +2392,12 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
+ }
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, true, true);
- // xlink:href for replacement, only written for Svg content
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, true, true);
+ // optional office:binary-data
+ mrExport.AddEmbeddedGraphicObjectAsBase64(aReplacementUrl);
- // optional office:binary-data
- mrExport.AddEmbeddedGraphicObjectAsBase64(aReplacementUrl);
- }
}
}
}