[Libreoffice-commits] core.git: connectivity/source include/connectivity

[Noel Grandin (via logerrit)]

 connectivity/source/commontools/parameters.cxx |    4 ++--
 include/connectivity/parameters.hxx            |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 203ba801eee12f9d6bffb2ae49ad82ba7bf191c1
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Nov 22 21:03:58 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 27 08:10:17 2021 +0100

    use more OInterfaceContainerHelper3 in dbtools::ParameterManager
    
    Change-Id: Ice607fb67468484e98c94e4f41c3e249639e1edb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125922
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/connectivity/source/commontools/parameters.cxx 
b/connectivity/source/commontools/parameters.cxx
index 380c4658ae43..117282fbd7f3 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -707,14 +707,14 @@ namespace dbtools
             // TODO: shouldn't we subtract all the parameters which were 
already visited?
         if ( nParamsLeft )
         {
-            ::comphelper::OInterfaceIteratorHelper2 aIter( 
m_aParameterListeners );
+            ::comphelper::OInterfaceIteratorHelper3 aIter( 
m_aParameterListeners );
             Reference< XPropertySet > xProp = m_xComponent;
             OSL_ENSURE(xProp.is(),"Some already released my component!");
             DatabaseParameterEvent aEvent( xProp, m_pOuterParameters );
 
             _rClearForNotifies.clear();
             while ( aIter.hasMoreElements() && !bCanceled )
-                bCanceled = !static_cast< XDatabaseParameterListener* >( 
aIter.next() )->approveParameter( aEvent );
+                bCanceled = !aIter.next()->approveParameter( aEvent );
             _rClearForNotifies.reset();
         }
 
diff --git a/include/connectivity/parameters.hxx 
b/include/connectivity/parameters.hxx
index 50026521ab69..f2196af12bac 100644
--- a/include/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.hxx
@@ -27,7 +27,7 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/paramwrapper.hxx>
 #include <unotools/sharedunocomponent.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
 
 namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::container { class XIndexAccess; }
@@ -98,7 +98,7 @@ namespace dbtools
 
     private:
         ::osl::Mutex&                       m_rMutex;
-        ::comphelper::OInterfaceContainerHelper2  m_aParameterListeners;
+        
::comphelper::OInterfaceContainerHelper3<css::form::XDatabaseParameterListener> 
m_aParameterListeners;
 
         css::uno::Reference< css::uno::XComponentContext >
                                             m_xContext;