summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-11-29 09:25:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-11-30 09:50:53 +0100
commit557beef6a958f9fa67123ad5a8a232b467039030 (patch)
treea797a5e2ce5801f06ca63fe868fa69c8975d5879 /xmlhelp
parenta12b14c1806609fbf31ec9ff37c794e7acb5fe99 (diff)
use more OInterfaceContainerHelper3 in xmlhelp
Change-Id: I6271459b655d09cff595e7e6eb604d5e16a8ccc2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126064 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.cxx6
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.hxx8
2 files changed, 7 insertions, 7 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index b1f6219af4b7..d08c9f97e508 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -88,7 +88,7 @@ ResultSetBase::addEventListener(
if ( ! m_pDisposeEventListeners )
m_pDisposeEventListeners.reset(
- new comphelper::OInterfaceContainerHelper2( m_aMutex ));
+ new comphelper::OInterfaceContainerHelper3<lang::XEventListener>( m_aMutex ));
m_pDisposeEventListeners->addInterface( Listener );
}
@@ -440,7 +440,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pIsFinalListeners )
m_pIsFinalListeners.reset(
- new comphelper::OInterfaceContainerHelper2( m_aMutex ));
+ new comphelper::OInterfaceContainerHelper3<beans::XPropertyChangeListener>( m_aMutex ));
m_pIsFinalListeners->addInterface( xListener );
}
@@ -449,7 +449,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pRowCountListeners )
m_pRowCountListeners.reset(
- new comphelper::OInterfaceContainerHelper2( m_aMutex ));
+ new comphelper::OInterfaceContainerHelper3<beans::XPropertyChangeListener>( m_aMutex ));
m_pRowCountListeners->addInterface( xListener );
}
else
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 5a98d1a1fd19..6ec04f36d60e 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -21,7 +21,7 @@
#include <vector>
#include <memory>
#include <cppuhelper/weak.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/sdbc/XCloseable.hpp>
@@ -388,10 +388,10 @@ namespace chelp {
css::uno::Sequence< css::beans::Property > m_sProperty;
osl::Mutex m_aMutex;
- std::unique_ptr<comphelper::OInterfaceContainerHelper2> m_pDisposeEventListeners;
+ std::unique_ptr<comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>> m_pDisposeEventListeners;
- std::unique_ptr<comphelper::OInterfaceContainerHelper2> m_pRowCountListeners;
- std::unique_ptr<comphelper::OInterfaceContainerHelper2> m_pIsFinalListeners;
+ std::unique_ptr<comphelper::OInterfaceContainerHelper3<css::beans::XPropertyChangeListener>> m_pRowCountListeners;
+ std::unique_ptr<comphelper::OInterfaceContainerHelper3<css::beans::XPropertyChangeListener>> m_pIsFinalListeners;
};