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 /xmloff/source/draw/eventimp.hxx | |
| 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 'xmloff/source/draw/eventimp.hxx')
| -rw-r--r-- | xmloff/source/draw/eventimp.hxx | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx index 5f7937a529b3..7388407058d0 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -22,6 +22,9 @@ #include <xmloff/xmlictxt.hxx> #include <com/sun/star/drawing/XShape.hpp> +#include <com/sun/star/presentation/ClickAction.hpp> +#include <com/sun/star/presentation/AnimationSpeed.hpp> +#include <anim.hxx> // office:events inside a shape @@ -43,6 +46,28 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; +struct SdXMLEventContextData +{ + SdXMLEventContextData(const css::uno::Reference<css::drawing::XShape>& rxShape); + void ApplyProperties(); + + css::uno::Reference<css::drawing::XShape> mxShape; + + bool mbValid; + bool mbScript; + css::presentation::ClickAction meClickAction; + XMLEffect meEffect; + XMLEffectDirection meDirection; + sal_Int16 mnStartScale; + css::presentation::AnimationSpeed meSpeed; + sal_Int32 mnVerb; + OUString msSoundURL; + bool mbPlayFull; + OUString msMacroName; + OUString msBookmark; + OUString msLanguage; +}; + #endif // INCLUDED_XMLOFF_SOURCE_DRAW_EVENTIMP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |