use more OInterfaceContainerHelper3 in dbaccess

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

3 files changed, 15 insertions, 12 deletions

diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx
index eaeb56e336bd..0ecda1ed647e 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -21,6 +21,7 @@
 
 #include "brwctrlr.hxx"
 
+#include <comphelper/interfacecontainer3.hxx>
 #include <comphelper/uno3.hxx>
 
 // SbaExternalSourceBrowser
@@ -32,7 +33,7 @@ namespace dbaui
                 :public SbaXDataBrowserController
                 ,public css::util::XModifyBroadcaster
     {
-        ::comphelper::OInterfaceContainerHelper2   m_aModifyListeners;
+        ::comphelper::OInterfaceContainerHelper3<css::util::XModifyListener>  m_aModifyListeners;
             // for multiplexing the modify events
         rtl::Reference<SbaXFormAdapter>            m_pDataSourceImpl;
         bool                            m_bInQueryDispatch;
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index c4fa9d96af66..c6d565896215 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -53,6 +53,7 @@
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/util/XCancellable.hpp>
+#include <comphelper/interfacecontainer3.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase12.hxx>
@@ -133,8 +134,8 @@ namespace dbaui
         SbaXVetoableChangeMultiplexer       m_aVetoablePropertyChangeListeners;
         SbaXPropertiesChangeMultiplexer     m_aPropertiesChangeListeners;
 
-        ::comphelper::OInterfaceContainerHelper2   m_aDisposeListeners;
-        ::comphelper::OInterfaceContainerHelper2   m_aContainerListeners;
+        ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener> m_aDisposeListeners;
+        ::comphelper::OInterfaceContainerHelper3<css::container::XContainerListener> m_aContainerListeners;
 
         // hierarchy administration
         css::uno::Reference< css::uno::XInterface >                           m_xParent;
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx
index 1ad6152b0df5..87d31c88dc2b 100644
--- a/dbaccess/source/ui/inc/sbamultiplex.hxx
+++ b/dbaccess/source/ui/inc/sbamultiplex.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/interfacecontainer3.hxx>
 #include <comphelper/multiinterfacecontainer2.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
@@ -56,7 +57,7 @@ namespace dbaui
     class SbaXStatusMultiplexer
             :public OSbaWeakSubObject
             ,public css::frame::XStatusListener
-            ,public ::comphelper::OInterfaceContainerHelper2
+            ,public ::comphelper::OInterfaceContainerHelper3<css::frame::XStatusListener>
     {
     public:
         SbaXStatusMultiplexer(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex);
@@ -81,7 +82,7 @@ namespace dbaui
     class SbaXLoadMultiplexer
             :public OSbaWeakSubObject
             ,public css::form::XLoadListener
-            ,public ::comphelper::OInterfaceContainerHelper2
+            ,public ::comphelper::OInterfaceContainerHelper3<css::form::XLoadListener>
     {
     public:
         SbaXLoadMultiplexer(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex);
@@ -105,7 +106,7 @@ namespace dbaui
     class SbaXParameterMultiplexer
             :public OSbaWeakSubObject
             ,public css::form::XDatabaseParameterListener
-            ,public ::comphelper::OInterfaceContainerHelper2
+            ,public ::comphelper::OInterfaceContainerHelper3<css::form::XDatabaseParameterListener>
     {
     public:
         SbaXParameterMultiplexer(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex);
@@ -124,7 +125,7 @@ namespace dbaui
     class SbaXSubmitMultiplexer
             :public OSbaWeakSubObject
             ,public css::form::XSubmitListener
-            ,public ::comphelper::OInterfaceContainerHelper2
+            ,public ::comphelper::OInterfaceContainerHelper3<css::form::XSubmitListener>
     {
     public:
         SbaXSubmitMultiplexer(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex);
@@ -143,7 +144,7 @@ namespace dbaui
     class SbaXResetMultiplexer
             :public OSbaWeakSubObject
             ,public css::form::XResetListener
-            ,public ::comphelper::OInterfaceContainerHelper2
+            ,public ::comphelper::OInterfaceContainerHelper3<css::form::XResetListener>
     {
     public:
         SbaXResetMultiplexer(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex);
@@ -163,7 +164,7 @@ namespace dbaui
     class SbaXRowSetMultiplexer
             :public OSbaWeakSubObject
             ,public css::sdbc::XRowSetListener
-            ,public ::comphelper::OInterfaceContainerHelper2
+            ,public ::comphelper::OInterfaceContainerHelper3<css::sdbc::XRowSetListener>
     {
     public:
         SbaXRowSetMultiplexer(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex);
@@ -184,7 +185,7 @@ namespace dbaui
     class SbaXRowSetApproveMultiplexer
             :public OSbaWeakSubObject
             ,public css::sdb::XRowSetApproveListener
-            ,public ::comphelper::OInterfaceContainerHelper2
+            ,public ::comphelper::OInterfaceContainerHelper3<css::sdb::XRowSetApproveListener>
     {
     public:
         SbaXRowSetApproveMultiplexer(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex);
@@ -205,7 +206,7 @@ namespace dbaui
     class SbaXSQLErrorMultiplexer
             :public OSbaWeakSubObject
             ,public css::sdb::XSQLErrorListener
-            ,public ::comphelper::OInterfaceContainerHelper2
+            ,public ::comphelper::OInterfaceContainerHelper3<css::sdb::XSQLErrorListener>
     {
     public:
         SbaXSQLErrorMultiplexer(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex);
@@ -288,7 +289,7 @@ namespace dbaui
     class SbaXPropertiesChangeMultiplexer
             :public OSbaWeakSubObject
             ,public css::beans::XPropertiesChangeListener
-            ,public ::comphelper::OInterfaceContainerHelper2
+            ,public ::comphelper::OInterfaceContainerHelper3<css::beans::XPropertiesChangeListener>
     {
     public:
         SbaXPropertiesChangeMultiplexer(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex);