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

Samuel Mehrbrodt Samuel.Mehrbrodt at cib.de
Fri May 11 06:24:59 UTC 2018


 xmloff/source/draw/shapeexport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 29deb6657769bab7fc13e04e45d5dbd00bc59a6a
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu May 10 12:13:06 2018 +0200

    Only write mime-type attribute if ODF version > 1.2
    
    Change-Id: I88ae821e969a2c45161f59eb2e667f645f1afdac
    Reviewed-on: https://gerrit.libreoffice.org/54075
    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 1295a66163de..733df9b1ba98 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2459,7 +2459,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
                     mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
                 }
 
-                if (!aMimeType.isEmpty())
+                if (!aMimeType.isEmpty() && GetExport().getDefaultVersion() > SvtSaveOptions::ODFVER_012)
                     mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, "mime-type", aMimeType);
 
                 SvXMLElementExport aElement(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, true, true);


More information about the Libreoffice-commits mailing list