[Libreoffice-commits] core.git: xmloff/source

Samuel Mehrbrodt Samuel.Mehrbrodt at cib.de
Fri Dec 1 07:24:41 UTC 2017


 xmloff/source/draw/shapeexport.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit f20ba8466b0df5c80f7663eb1d639f31973dbece
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Nov 30 14:36:14 2017 +0100

    tdf#113696 Add mimetype also to fallback graphic
    
    Change-Id: I6eb7bb66aa688b5668d0eacd2ec7131bec2b6955
    Reviewed-on: https://gerrit.libreoffice.org/45585
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 3a60df4f3b68..887f5ecfd372 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2393,6 +2393,14 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
                     mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
                     mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
                 }
+
+                uno::Reference<io::XInputStream> xInputStream(
+                    mrExport.GetEmbeddedGraphicObjectStream(aReplacementUrl));
+                OUString aMimeType(
+                    comphelper::GraphicMimeTypeHelper::GetMimeTypeForImageStream(xInputStream));
+                if (!aMimeType.isEmpty())
+                    GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, "mime-type", aMimeType);
+
                 SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, true, true);
 
                 // optional office:binary-data


More information about the Libreoffice-commits mailing list