diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-11-28 20:49:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-30 09:51:25 +0100 |
| commit | b6f35f5db701fbd31852fad937a38f81c5c817f0 (patch) | |
| tree | 797d7448bf9d491fa5e720a49aafdaa5c19183b4 /ucb/source/cacher | |
| parent | cda9a5af36977420bae34737cd7b52cddb3226ef (diff) | |
use more OInterfaceContainerHelper2 in ucb
Change-Id: I81300a707c81a011f29bd6b63794e1abd472a015
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126062
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb/source/cacher')
| -rw-r--r-- | ucb/source/cacher/contentresultsetwrapper.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/cacher/contentresultsetwrapper.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/cacher/dynamicresultsetwrapper.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/cacher/dynamicresultsetwrapper.hxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 0b1175e324f0..f9e504e2d933 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -408,7 +408,7 @@ void SAL_CALL ContentResultSetWrapper::addEventListener( const Reference< XEvent if ( !m_pDisposeEventListeners ) m_pDisposeEventListeners.reset( - new OInterfaceContainerHelper2( m_aContainerMutex ) ); + new OInterfaceContainerHelper3<XEventListener>( m_aContainerMutex ) ); m_pDisposeEventListeners->addInterface( Listener ); } diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index 254ab530606d..eda5b5e83e9d 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/interfacecontainer.h> -#include <comphelper/interfacecontainer2.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <comphelper/multiinterfacecontainer2.hxx> #include <memory> @@ -86,7 +86,7 @@ private: bool m_bDisposed; ///Dispose call ready. bool m_bInDispose;///In dispose call osl::Mutex m_aContainerMutex; - std::unique_ptr<comphelper::OInterfaceContainerHelper2> + std::unique_ptr<comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>> m_pDisposeEventListeners; std::unique_ptr<PropertyChangeListenerContainer_Impl> m_pPropertyChangeListeners; diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index e465bbe6da0c..fb37a5fa6864 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -163,7 +163,7 @@ void SAL_CALL DynamicResultSetWrapper::addEventListener( const Reference< XEvent if ( !m_pDisposeEventListeners ) m_pDisposeEventListeners.reset( - new OInterfaceContainerHelper2( m_aContainerMutex ) ); + new OInterfaceContainerHelper3<XEventListener>( m_aContainerMutex ) ); m_pDisposeEventListeners->addInterface( Listener ); } diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index 3d0cb9e737b6..8f9c0473f072 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -22,7 +22,7 @@ #include <osl/mutex.hxx> #include <osl/conditn.hxx> #include <cppuhelper/weak.hxx> -#include <comphelper/interfacecontainer2.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <com/sun/star/ucb/XDynamicResultSet.hpp> #include <com/sun/star/ucb/XSourceInitialization.hpp> #include <com/sun/star/ucb/XDynamicResultSetListener.hpp> @@ -42,7 +42,7 @@ private: bool m_bDisposed; ///Dispose call ready. bool m_bInDispose;///In dispose call osl::Mutex m_aContainerMutex; - std::unique_ptr<comphelper::OInterfaceContainerHelper2> + std::unique_ptr<comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>> m_pDisposeEventListeners; protected: rtl::Reference<DynamicResultSetWrapperListener> |