diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2016-01-19 19:45:45 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-01-25 08:52:03 +0200 |
commit | 752cd07d085ac0aadc99bd512d49072843139032 (patch) | |
tree | 21ff2f55761b34bfdd721b5e1ed43333e8874e46 /package | |
parent | tdf#86567 Dropdown for conditional formatting (diff) | |
download | core-752cd07d085ac0aadc99bd512d49072843139032.tar.gz core-752cd07d085ac0aadc99bd512d49072843139032.zip |
InterfaceContainer2 with vector instead of Sequence
create an InterfaceContainer2 class to replace InterfaceContainer.
It uses a std::vector instead of a Sequence for the mutable listener
list, which provides far better performance.
Switch all our internal use-sites to the new class.
Change-Id: I6b56cfa511ded2395faa22e68fab3b2f16c3cb88
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 1fab519ee35b..d324b0a4476c 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 <cppuhelper/interfacecontainer.h> +#include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/implbase.hxx> #include <mutexholder.hxx> @@ -46,7 +46,7 @@ class OZipFileAccess : public ::cppu::WeakImplHelper< css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::io::XInputStream > m_xContentStream; ZipFile* m_pZipFile; - ::cppu::OInterfaceContainerHelper* m_pListenersContainer; + ::comphelper::OInterfaceContainerHelper2* m_pListenersContainer; bool m_bDisposed; bool m_bOwnContent; diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index 6c98e3ba106a..57ee9ea41bbb 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -270,7 +270,7 @@ void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XE } if ( !m_pInterfaceContainer ) - m_pInterfaceContainer = new ::cppu::OInterfaceContainerHelper( m_rMutexRef->GetMutex() ); + m_pInterfaceContainer = new ::comphelper::OInterfaceContainerHelper2( m_rMutexRef->GetMutex() ); m_pInterfaceContainer->addInterface( xListener ); } diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx index 404a98013991..7600f29aac55 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 <cppuhelper/interfacecontainer.h> +#include <comphelper/interfacecontainer2.hxx> #include "mutexholder.hxx" @@ -43,7 +43,7 @@ protected: OWriteStream_Impl* m_pImpl; rtl::Reference<SotMutexHolder> m_rMutexRef; css::uno::Reference < css::io::XInputStream > m_xStream; - ::cppu::OInterfaceContainerHelper* m_pInterfaceContainer; + ::comphelper::OInterfaceContainerHelper2* 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 63248e7d108b..5a59c00e2cb2 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -431,7 +431,7 @@ void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEve throw lang::DisposedException(THROW_WHERE ); if ( !m_pListenersContainer ) - m_pListenersContainer = new ::cppu::OInterfaceContainerHelper( m_aMutexHolder->GetMutex() ); + m_pListenersContainer = new ::comphelper::OInterfaceContainerHelper2( m_aMutexHolder->GetMutex() ); m_pListenersContainer->addInterface( xListener ); } |