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

[Samuel Mehrbrodt]

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

New commits:
commit 5bb7894a490be0823197d602899d0438e57bfb31
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Mar 19 10:47:07 2018 +0100

    Write signatureline element after images
    
    The importer expects an image to exist when parsing
    the signatureline element
    
    Change-Id: I30c0ffad294229e0d2b09b5d7c31a692e714a3d5
    Reviewed-on: https://gerrit.libreoffice.org/51534
    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 6a6613e486d4..3a685ac3697a 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2425,8 +2425,6 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
                 }
             }
 
-            ImpExportSignatureLine(xShape);
-
             SvXMLElementExport aElement(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, true, true);
 
             // optional office:binary-data
@@ -2480,6 +2478,8 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
     GetExport().GetImageMapExport().Export( xPropSet );
     ImpExportDescription( xShape ); // #i68101#
 
+    // Signature Line - needs to be after the images!
+    ImpExportSignatureLine(xShape);
 }
 
 void XMLShapeExport::ImpExportChartShape(