revert: tdf#127791 write events at the end of groups instead of the start

i.e.

commit 1b2146431a583be27518536bed19ef01861b42a0
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Wed Nov 6 16:31:00 2019 +0000

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

works in practice but not in theory

e with '#' will be ignored, and an empty message aborts the commit.

Change-Id: Iab4ac31297bbe4d6c4133766c79247d70c036f6d
Reviewed-on: https://gerrit.libreoffice.org/82514
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 1 insertions, 7 deletions

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index c7640016786c..ddd128d1d8b0 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1883,6 +1883,7 @@ 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,
@@ -1899,13 +1900,6 @@ 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 );
     }
 }