diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-04-30 14:24:06 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-13 10:56:03 +0200 |
| commit | 4761a0ba7e7f3ca9c4ed8c343c92f85038258600 (patch) | |
| tree | 3218a121bd91121a65b4138e63041b91d5ad8935 /include/toolkit | |
| parent | 09c15ac9c916b33f33a7b0f65ea93efc2015721f (diff) | |
Revert "remove some "optimisation" insanity in ScriptEventContainer"
This broke the event order in basic dialog xml,
which in turn broke macro signatures.
This reverts commit 85f08e3e34bea01456eaf8989ac4f77d3900d5c5.
Change-Id: I49ef2eb200571a0fd862770abc4331b6ea053e2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93209
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93607
Tested-by: Jenkins
Diffstat (limited to 'include/toolkit')
| -rw-r--r-- | include/toolkit/controls/eventcontainer.hxx | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx index 4804a2f2588b..3cb7406f58cd 100644 --- a/include/toolkit/controls/eventcontainer.hxx +++ b/include/toolkit/controls/eventcontainer.hxx @@ -31,13 +31,25 @@ namespace toolkit { -class ScriptEventContainer final : public ::cppu::WeakImplHelper< +// Hashtable to optimize +typedef std::unordered_map +< + OUString, + sal_Int32, + OUStringHash +> +NameContainerNameMap; + + +class ScriptEventContainer : public ::cppu::WeakImplHelper< css::container::XNameContainer, css::container::XContainer > { - std::unordered_map< OUString, css::uno::Any> - mHashMap; - css::uno::Type const mType; + NameContainerNameMap mHashMap; + css::uno::Sequence< OUString > mNames; + std::vector< css::uno::Any > mValues; + sal_Int32 mnElementCount; + css::uno::Type mType; ContainerListenerMultiplexer maContainerListeners; |