[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - xmloff/source

[Samuel Mehrbrodt]

 xmloff/source/draw/shapeexport.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 58822e6f1686eac7a8a7c028ea8f233493594437
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Nov 30 12:45:26 2017 +0100

    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 at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 38602abc2d2b59bc3644e37797b9b1bc779fd993)
    Reviewed-on: https://gerrit.libreoffice.org/45675

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 7f43937f0c7d..3a60df4f3b68 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);
-                }
             }
         }
     }