summaryrefslogtreecommitdiff
path: root/include/toolkit/controls
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2016-01-19 19:45:45 +0200
committerNoel Grandin <noel@peralex.com>2016-01-25 08:52:03 +0200
commit752cd07d085ac0aadc99bd512d49072843139032 (patch)
tree21ff2f55761b34bfdd721b5e1ed43333e8874e46 /include/toolkit/controls
parent0e7cd653ea90da388820220bf6a3eb140b57bbd6 (diff)
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 'include/toolkit/controls')
-rw-r--r--include/toolkit/controls/controlmodelcontainerbase.hxx2
-rw-r--r--include/toolkit/controls/unocontrol.hxx2
-rw-r--r--include/toolkit/controls/unocontrols.hxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 87918266d03f..cf2e214721e0 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -79,7 +79,7 @@ public:
protected:
ContainerListenerMultiplexer maContainerListeners;
- ::cppu::OInterfaceContainerHelper maChangeListeners;
+ ::comphelper::OInterfaceContainerHelper2 maChangeListeners;
UnoControlModelHolderList maModels;
AllGroups maGroups;
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index d31f49bcddce..a410c722add8 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -92,7 +92,7 @@ protected:
MouseListenerMultiplexer maMouseListeners;
MouseMotionListenerMultiplexer maMouseMotionListeners;
PaintListenerMultiplexer maPaintListeners;
- ::cppu::OInterfaceContainerHelper maModeChangeListeners;
+ ::comphelper::OInterfaceContainerHelper2 maModeChangeListeners;
css::uno::Reference< css::uno::XInterface > mxContext;
css::uno::Reference< css::awt::XControlModel > mxModel;
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 31b92959b7c5..220c32aa933d 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -877,7 +877,7 @@ private:
protected:
std::unique_ptr<UnoControlListBoxModel_Data> m_xData;
- ::cppu::OInterfaceContainerHelper m_aItemListListeners;
+ ::comphelper::OInterfaceContainerHelper2 m_aItemListListeners;
};