From 9104017e1bf76857d2b9686363013e1e7c49e355 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Sat, 7 Aug 2021 18:17:03 +0200
Subject: create comphelper:OMultiTypeInterfaceContainerHelperVar2 and use it

based on OInterfaceContainerHelper2 which is considerably
faster than the original OInterfaceContainerHelper

Change-Id: Ia8cdbc5ef877a7af3d9193e1bb2faf1595c15470
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120165
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 linguistic/source/lngopt.cxx | 4 ++--
 linguistic/source/lngopt.hxx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'linguistic')

diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 304675fd413c..8ddbac6ca9e2 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -192,11 +192,11 @@ LinguProps::LinguProps() :
 
 void LinguProps::launchEvent( const PropertyChangeEvent &rEvt ) const
 {
-    cppu::OInterfaceContainerHelper *pContainer =
+    comphelper::OInterfaceContainerHelper2 *pContainer =
             aPropListeners.getContainer( rEvt.PropertyHandle );
     if (pContainer)
     {
-        cppu::OInterfaceIteratorHelper aIt( *pContainer );
+        comphelper::OInterfaceIteratorHelper2 aIt( *pContainer );
         while (aIt.hasMoreElements())
         {
             static_cast< XPropertyChangeListener* >( aIt.next() )->propertyChange( rEvt );
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index bdb173c22da0..bd2e2fe72dcd 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -22,7 +22,7 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/multiinterfacecontainer2.hxx>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -59,7 +59,7 @@ public:
             GetActiveDics() const   { return pData->aActiveDics; }
 };
 
-typedef cppu::OMultiTypeInterfaceContainerHelperVar<sal_Int32>
+typedef comphelper::OMultiTypeInterfaceContainerHelperVar2<sal_Int32>
     OPropertyListenerContainerHelper;
 
 class LinguProps :
-- 
cgit