diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-01-19 19:45:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-01-25 08:52:03 +0200 |
| commit | 752cd07d085ac0aadc99bd512d49072843139032 (patch) | |
| tree | 21ff2f55761b34bfdd721b5e1ed43333e8874e46 /forms/source/inc | |
| parent | tdf#86567 Dropdown for conditional formatting (diff) | |
| download | core-752cd07d085ac0aadc99bd512d49072843139032.tar.gz core-752cd07d085ac0aadc99bd512d49072843139032.zip | |
InterfaceContainer2 with vector instead of Sequence
create an InterfaceContainer2 class to replace InterfaceContainer.
It uses a std::vector instead of a Sequence for the mutable listener
list, which provides far better performance.
Switch all our internal use-sites to the new class.
Change-Id: I6b56cfa511ded2395faa22e68fab3b2f16c3cb88
Diffstat (limited to 'forms/source/inc')
| -rw-r--r-- | forms/source/inc/FormComponent.hxx | 4 | ||||
| -rw-r--r-- | forms/source/inc/InterfaceContainer.hxx | 4 | ||||
| -rw-r--r-- | forms/source/inc/resettable.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index d15b1217eeac..eb5118e89f5f 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -587,8 +587,8 @@ private: bool m_bValuePropertyMayBeVoid; ResetHelper m_aResetHelper; - ::cppu::OInterfaceContainerHelper m_aUpdateListeners; - ::cppu::OInterfaceContainerHelper m_aFormComponentListeners; + ::comphelper::OInterfaceContainerHelper2 m_aUpdateListeners; + ::comphelper::OInterfaceContainerHelper2 m_aFormComponentListeners; css::uno::Reference< css::form::binding::XValueBinding > m_xExternalBinding; diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index e274ec5e3ea5..a5f319ebe5f7 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <osl/mutex.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/component.hxx> #include <cppuhelper/implbase8.hxx> #include <unordered_map> @@ -100,7 +100,7 @@ protected: OInterfaceArray m_aItems; OInterfaceMap m_aMap; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::comphelper::OInterfaceContainerHelper2 m_aContainerListeners; const css::uno::Type m_aElementType; diff --git a/forms/source/inc/resettable.hxx b/forms/source/inc/resettable.hxx index 2a5cb308ad1c..11a2db89777e 100644 --- a/forms/source/inc/resettable.hxx +++ b/forms/source/inc/resettable.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/form/XResetListener.hpp> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> namespace cppu { @@ -53,7 +53,7 @@ namespace frm private: ::cppu::OWeakObject& m_rParent; - ::cppu::OInterfaceContainerHelper m_aResetListeners; + ::comphelper::OInterfaceContainerHelper2 m_aResetListeners; }; |