diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-12 13:25:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-12 20:51:21 +0100 |
| commit | 03edebda393ea684803b7a0da72f33655bdc24d1 (patch) | |
| tree | 361ad0de28b6423ca8a1b5003ba8631dad23bd2c /include | |
| parent | 63c5a1e2aa9e39633c3e644df0d8d9f8cedfc10e (diff) | |
tdf#127791 defer import of group shape events until the group is popped
otherwise the group shape import applies the events over the children it has when
it reads the events which is 0. We already push and pop groups for sorting
so reuse that to store and apply the events to groups
Change-Id: I3f31796f9e8d3d11df6f3ba12a32be920a228155
Reviewed-on: https://gerrit.libreoffice.org/82516
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/shapeimport.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index 4412d26e07d6..a20154a70387 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -215,6 +215,7 @@ public: struct XMLShapeImportHelperImpl; struct XMLShapeImportPageContextImpl; +struct SdXMLEventContextData; class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public salhelper::SimpleReferenceObject { @@ -307,6 +308,9 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes); + // tdf#127791 help function for group shape events + void addShapeEvents(SdXMLEventContextData& rData); + // helper functions for z-order sorting void pushGroupForSorting( css::uno::Reference< css::drawing::XShapes >& rShapes ); void popGroupAndSort(); |