use more OInterfaceContainerHelper3 in linguistic

Change-Id: I0b6a80bb317035327b98217d7a7cadfec08fe7ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125937
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

9 files changed, 19 insertions, 16 deletions

diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 26dc2aee0517..ba914d3a9779 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/util/XFlushable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
 #include <i18nlangtag/lang.h>
 
 #include <memory>
@@ -55,7 +55,7 @@ class ConvDic :
 
 protected:
 
-    ::comphelper::OInterfaceContainerHelper2       aFlushListeners;
+    ::comphelper::OInterfaceContainerHelper3<css::util::XFlushListener> aFlushListeners;
 
     ConvMap                         aFromLeft;
     std::unique_ptr< ConvMap >        pFromRight;     // only available for bidirectional conversion dictionaries
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index 907f53fa242e..11ab399aae90 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
 #include <rtl/ref.hxx>
 
 #include <linguistic/misc.hxx>
@@ -51,7 +51,7 @@ class ConvDicList :
         virtual void    AtExit() override;
     };
 
-    ::comphelper::OInterfaceContainerHelper2  aEvtListeners;
+    ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener> aEvtListeners;
     rtl::Reference<ConvDicNameContainer>      mxNameContainer;
     rtl::Reference<MyAppExitListener>         mxExitListener;
     bool                                      bDisposing;
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index dc7c94c3e91f..fdef09909519 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/frame/XStorable.hpp>
 
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
 #include <i18nlangtag/lang.h>
 #include <vcl/errcode.hxx>
 
@@ -42,7 +42,7 @@ class DictionaryNeo :
     >
 {
 
-    ::comphelper::OInterfaceContainerHelper2                    aDicEvtListeners;
+    ::comphelper::OInterfaceContainerHelper3<css::linguistic2::XDictionaryEventListener> aDicEvtListeners;
     std::vector< css::uno::Reference< css::linguistic2::XDictionaryEntry > >
                                                                 aEntries;
     OUString                                                    aDicName;
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 90067e1d4da8..b7fbfa1844ab 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -66,7 +66,7 @@ class DicEvtListenerHelper :
         XDictionaryEventListener
     >
 {
-    comphelper::OInterfaceContainerHelper2  aDicListEvtListeners;
+    comphelper::OInterfaceContainerHelper3<XDictionaryListEventListener> aDicListEvtListeners;
     uno::Reference< XDictionaryList >       xMyDicList;
 
     sal_Int16                               nCondensedEvt;
@@ -124,7 +124,7 @@ void SAL_CALL DicEvtListenerHelper::disposing( const EventObject& rSource )
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    uno::Reference< XInterface > xSrc( rSource.Source );
+    uno::Reference< XDictionaryListEventListener > xSrc( rSource.Source, UNO_QUERY );
 
     // remove event object from EventListener list
     if (xSrc.is())
@@ -133,7 +133,7 @@ void SAL_CALL DicEvtListenerHelper::disposing( const EventObject& rSource )
     // if object is a dictionary then remove it from the dictionary list
     // Note: this will probably happen only if someone makes a XDictionary
     // implementation of his own that is also a XComponent.
-    uno::Reference< XDictionary > xDic( xSrc, UNO_QUERY );
+    uno::Reference< XDictionary > xDic( rSource.Source, UNO_QUERY );
     if (xDic.is())
     {
         xMyDicList->removeDictionary( xDic );
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index df594cccdb68..97ae91f7c84f 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
+#include <comphelper/interfacecontainer3.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
@@ -54,7 +55,7 @@ class DicList :
 
     LinguOptions    aOpt;
 
-    ::comphelper::OInterfaceContainerHelper2    aEvtListeners;
+    ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener> aEvtListeners;
 
     typedef std::vector< css::uno::Reference< css::linguistic2::XDictionary > >   DictionaryVec_t;
     DictionaryVec_t                             aDicList;
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index f7d43aace23f..c4cc076b3c9b 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -36,7 +36,7 @@
 #include <osl/thread.h>
 
 #include <com/sun/star/uno/Any.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
 #include <i18nlangtag/lang.h>
 
 #include <map>
@@ -113,8 +113,8 @@ class GrammarCheckingIterator:
 
     //! beware of initialization order!
     static osl::Mutex& MyMutex();
-    comphelper::OInterfaceContainerHelper2     m_aEventListeners;
-    comphelper::OInterfaceContainerHelper2     m_aNotifyListeners;
+    comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>  m_aEventListeners;
+    comphelper::OInterfaceContainerHelper3<css::linguistic2::XLinguServiceEventListener>  m_aNotifyListeners;
 
     css::uno::Reference< css::i18n::XBreakIterator > m_xBreakIterator;
     mutable css::uno::Reference< css::util::XChangesBatch >  m_xUpdateAccess;
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index bd2e2fe72dcd..effd2e8cb790 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -22,6 +22,7 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/interfacecontainer3.hxx>
 #include <comphelper/multiinterfacecontainer2.hxx>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
@@ -72,7 +73,7 @@ class LinguProps :
         css::lang::XServiceInfo
     >
 {
-    ::comphelper::OInterfaceContainerHelper2           aEvtListeners;
+    ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener> aEvtListeners;
     OPropertyListenerContainerHelper            aPropListeners;
 
     SfxItemPropertyMap                          aPropertyMap;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 1eaef662b316..e385c3b2421c 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -34,6 +34,7 @@
 #include <tools/debug.hxx>
 #include <unotools/lingucfg.hxx>
 #include <vcl/svapp.hxx>
+#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <i18nlangtag/lang.h>
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 0f37e041b1be..5560fad69e14 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_LINGUISTIC_SOURCE_LNGSVCMGR_HXX
 
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
 
 
 #include <com/sun/star/uno/Reference.h>
@@ -64,7 +64,7 @@ class LngSvcMgr :
 {
     friend class LngSvcMgrListenerHelper;
 
-    ::comphelper::OInterfaceContainerHelper2            aEvtListeners;
+    ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>  aEvtListeners;
 
     css::uno::Reference<
         css::util::XModifyBroadcaster>                  xMB;