diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-07 09:24:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-07 21:34:33 +0200 |
| commit | 86abf3a682b424dc0fcbccf030f5a0b9bfb81d8c (patch) | |
| tree | ba40de884231f604bbd8eedb610834d92afb86ae /UnoControls/inc | |
| parent | 2cd1442f83d41af1f2b663ccb8bfab6a954009f1 (diff) | |
create comphelper::OMultiTypeInterfaceContainerHelper2 and use it
based on OInterfaceContainerHelper2 which is considerably
faster than the original OInterfaceContainerHelper
Change-Id: I9c8b6d0e5382018824bf7188a26343703abf2d51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120161
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'UnoControls/inc')
| -rw-r--r-- | UnoControls/inc/basecontainercontrol.hxx | 3 | ||||
| -rw-r--r-- | UnoControls/inc/multiplexer.hxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index fe0d87f2d8cb..507dd2be394a 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -24,6 +24,7 @@ #include "basecontrol.hxx" #include <com/sun/star/awt/XControlContainer.hpp> +#include <comphelper/multicontainer2.hxx> namespace unocontrols { @@ -144,7 +145,7 @@ private: // list of pointer of "struct IMPL_ControlInfo" to hold child-controls ::std::vector< IMPL_ControlInfo > maControlInfoList; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListeners; + comphelper::OMultiTypeInterfaceContainerHelper2 m_aListeners; }; diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx index 3fc19c126114..58bd1563fb0a 100644 --- a/UnoControls/inc/multiplexer.hxx +++ b/UnoControls/inc/multiplexer.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/awt/XFocusListener.hpp> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/multicontainer2.hxx> namespace com::sun::star::awt { class XWindow; } namespace com::sun::star::awt { struct KeyEvent; } @@ -223,7 +223,7 @@ private: ::osl::Mutex m_aMutex; css::uno::Reference< css::awt::XWindow > m_xPeer; /// The source of the events. Normally this is the peer object. css::uno::WeakReference< css::awt::XWindow > m_xControl; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerHolder; + comphelper::OMultiTypeInterfaceContainerHelper2 m_aListenerHolder; }; |