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

6 files changed, 6 insertions, 4 deletions

diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk
index 7e269f260251..5ea6cd8c0355 100644
--- a/lingucomponent/Library_hyphen.mk
+++ b/lingucomponent/Library_hyphen.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,hyphen,\
 $(eval $(call gb_Library_use_sdk_api,hyphen))
 
 $(eval $(call gb_Library_use_libraries,hyphen,\
+	comphelper \
 	cppu \
 	cppuhelper \
 	i18nlangtag \
diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk
index 1afb78853b6a..408eb72afc9c 100644
--- a/lingucomponent/Library_spell.mk
+++ b/lingucomponent/Library_spell.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,spell,\
 $(eval $(call gb_Library_use_sdk_api,spell))
 
 $(eval $(call gb_Library_use_libraries,spell,\
+	comphelper \
 	cppu \
 	cppuhelper \
 	i18nlangtag \
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
index e59ab94497af..1f23dbbeef33 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
@@ -69,7 +69,7 @@ class Hyphenator :
     HDInfo * aDicts;
     sal_Int32 numdict;
 
-    ::cppu::OInterfaceContainerHelper       aEvtListeners;
+    ::comphelper::OInterfaceContainerHelper2       aEvtListeners;
     linguistic::PropertyHelper_Hyphenation* pPropHelper;
     bool                                    bDisposing;
 
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index ddb43ca9e1fc..b51a8040011b 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -67,7 +67,7 @@ class MacSpellChecker :
     NSSpellChecker *        macSpell;
     int                     macTag;   // unique tag for this doc
 
-    ::cppu::OInterfaceContainerHelper       aEvtListeners;
+    ::comphelper::OInterfaceContainerHelper2       aEvtListeners;
     Reference< XPropertyChangeListener >    xPropHelper;
     linguistic::PropertyHelper_Spell *      pPropHelper;
     bool                                    bDisposing;
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 0f42a8b42ca1..5abf0efe25d7 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -61,7 +61,7 @@ class SpellChecker :
     OUString *                         aDNames;
     sal_Int32                          numdict;
 
-    ::cppu::OInterfaceContainerHelper       aEvtListeners;
+    ::comphelper::OInterfaceContainerHelper2       aEvtListeners;
     linguistic::PropertyHelper_Spelling*    pPropHelper;
     bool                                    bDisposing;
 
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index f7063996cd05..b39db99f7476 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -66,7 +66,7 @@ class Thesaurus :
 {
     Sequence< Locale >                      aSuppLocales;
 
-    ::cppu::OInterfaceContainerHelper       aEvtListeners;
+    ::comphelper::OInterfaceContainerHelper2       aEvtListeners;
     linguistic::PropertyHelper_Thesaurus*       pPropHelper;
     bool                                    bDisposing;
     CharClass **                            aCharSetInfo;