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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 1b2146431a583be27518536bed19ef01861b42a0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 6 16:31:00 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 6 20:50:39 2019 +0100

    tdf#127791 write events at the end of groups instead of the start
    
    because the group shape import applies the events over the children it has when
    it reads the events, so putting it before exportShapes means it get applied
    over 0 children
    
    Change-Id: If7d09865a7a34d8d13440eb559ec97580792bd4e
    Reviewed-on: https://gerrit.libreoffice.org/82160
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index ddd128d1d8b0..c7640016786c 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1883,7 +1883,6 @@ void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape
         SvXMLElementExport aPGR(mrExport, XML_NAMESPACE_DRAW, XML_G, bCreateNewline, true);
 
         ImpExportDescription( xShape ); // #i68101#
-        ImpExportEvents( xShape );
         ImpExportGluePoints( xShape );
 
         // #89764# if export of position is suppressed for group shape,
@@ -1900,6 +1899,13 @@ void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape
 
         // write members
         exportShapes( xShapes, nFeatures, pRefPoint );
+
+        /* tdf#127791 write events after shapes are exported because
+           the group shape import applies the events over the
+           children it has when it reads the events, so putting
+           it before exportShapes means it get applied over 0 children
+        */
+        ImpExportEvents( xShape );
     }
 }