diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-11-25 22:07:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-27 13:56:43 +0100 |
| commit | 1a122a5bce95bb0e6f5c776abd10c0288b48e126 (patch) | |
| tree | e943126bdbddd1e595b55660b219af3a8e1fa286 /package | |
| parent | d448b16d811593f0c8e8f2e60e957a83390c4b99 (diff) | |
use more OInterfaceContainerHelper3 in package
Change-Id: I4a9f0f4ae95ec236ef32462c1aaa8d774be15378
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125938
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/inc/zipfileaccess.hxx | 4 | ||||
| -rw-r--r-- | package/source/xstor/ocompinstream.cxx | 2 | ||||
| -rw-r--r-- | package/source/xstor/ocompinstream.hxx | 4 | ||||
| -rw-r--r-- | package/source/zippackage/zipfileaccess.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx index b1ca8b1871bb..ae795665b0bd 100644 --- a/package/inc/zipfileaccess.hxx +++ b/package/inc/zipfileaccess.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <comphelper/interfacecontainer2.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <comphelper/refcountedmutex.hxx> #include <cppuhelper/implbase.hxx> @@ -48,7 +48,7 @@ class OZipFileAccess final : public ::cppu::WeakImplHelper< css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::io::XInputStream > m_xContentStream; std::optional<ZipFile> m_pZipFile; - std::unique_ptr<::comphelper::OInterfaceContainerHelper2> m_pListenersContainer; + std::unique_ptr<::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>> m_pListenersContainer; bool m_bDisposed; bool m_bOwnContent; diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index 783b426a9af7..7f59275f491d 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -244,7 +244,7 @@ void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XE } if ( !m_pInterfaceContainer ) - m_pInterfaceContainer.reset( new ::comphelper::OInterfaceContainerHelper2( m_xMutex->GetMutex() ) ); + m_pInterfaceContainer.reset( new ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>( m_xMutex->GetMutex() ) ); m_pInterfaceContainer->addInterface( xListener ); } diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx index c41c2c25f40a..438f38631108 100644 --- a/package/source/xstor/ocompinstream.hxx +++ b/package/source/xstor/ocompinstream.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/embed/XExtendedStorageStream.hpp> #include <com/sun/star/embed/XRelationshipAccess.hpp> #include <cppuhelper/implbase.hxx> -#include <comphelper/interfacecontainer2.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <comphelper/refcountedmutex.hxx> #include <rtl/ref.hxx> #include <memory> @@ -45,7 +45,7 @@ protected: OWriteStream_Impl* m_pImpl; rtl::Reference<comphelper::RefCountedMutex> m_xMutex; css::uno::Reference < css::io::XInputStream > m_xStream; - std::unique_ptr<::comphelper::OInterfaceContainerHelper2> m_pInterfaceContainer; + std::unique_ptr<::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>> m_pInterfaceContainer; css::uno::Sequence < css::beans::PropertyValue > m_aProperties; bool m_bDisposed; sal_Int32 m_nStorageType; diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index 1e66e67936b0..a02d416286f1 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -438,7 +438,7 @@ void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEve throw lang::DisposedException(THROW_WHERE ); if ( !m_pListenersContainer ) - m_pListenersContainer.reset( new ::comphelper::OInterfaceContainerHelper2( m_aMutexHolder->GetMutex() ) ); + m_pListenersContainer.reset( new ::comphelper::OInterfaceContainerHelper3<css::lang::XEventListener>( m_aMutexHolder->GetMutex() ) ); m_pListenersContainer->addInterface( xListener ); } |