diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-05-06 14:11:00 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-05-07 08:41:43 +0200 |
| commit | 74459c7d62ebe93bdfdf65b665b9253ac8f09d79 (patch) | |
| tree | 1c24a412a7294ab13ae127ac41b44e0e653b8ad3 /toolkit/inc | |
| parent | 0ed93efdb8f571d873a2f5b9f96938ea796199fd (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/+/93564
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'toolkit/inc')
| -rw-r--r-- | toolkit/inc/controls/eventcontainer.hxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/toolkit/inc/controls/eventcontainer.hxx b/toolkit/inc/controls/eventcontainer.hxx index 4961c16344ee..396578432fd1 100644 --- a/toolkit/inc/controls/eventcontainer.hxx +++ b/toolkit/inc/controls/eventcontainer.hxx @@ -30,12 +30,23 @@ namespace toolkit { +// Hashtable to optimize +typedef std::unordered_map +< + OUString, + sal_Int32, + OUStringHash +> +NameContainerNameMap; + class ScriptEventContainer final : public ::cppu::WeakImplHelper< css::container::XNameContainer, css::container::XContainer > { - std::unordered_map< OUString, css::uno::Any> - mHashMap; + NameContainerNameMap mHashMap; + css::uno::Sequence< OUString > mNames; + std::vector< css::uno::Any > mValues; + sal_Int32 mnElementCount; css::uno::Type mType; ContainerListenerMultiplexer maContainerListeners; |