From 752cd07d085ac0aadc99bd512d49072843139032 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 19 Jan 2016 19:45:45 +0200 Subject: 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 --- embedserv/source/embed/intercept.cxx | 4 ++-- embedserv/source/inc/intercept.hxx | 2 +- embedserv/source/inc/xwin.hxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'embedserv') diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx index 58fa93526501..cefff859e13c 100644 --- a/embedserv/source/embed/intercept.cxx +++ b/embedserv/source/embed/intercept.cxx @@ -52,7 +52,7 @@ Interceptor::addEventListener( if ( ! m_pDisposeEventListeners ) m_pDisposeEventListeners = - new cppu::OInterfaceContainerHelper( m_aMutex ); + new comphelper::OInterfaceContainerHelper2( m_aMutex ); m_pDisposeEventListeners->addInterface( Listener ); } @@ -216,7 +216,7 @@ void Interceptor::generateFeatureStateEvent() if( i == 1 || (m_bLink && i != 5) ) continue; - cppu::OInterfaceContainerHelper* pICH = + comphelper::OInterfaceContainerHelper2* pICH = m_pStatCL->getContainer(m_aInterceptedURL[i]); uno::Sequence > aSeq; if(pICH) diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx index ac226108ea01..49b8ae093aec 100644 --- a/embedserv/source/inc/intercept.hxx +++ b/embedserv/source/inc/intercept.hxx @@ -166,7 +166,7 @@ private: static css::uno::Sequence< OUString > m_aInterceptedURL; - cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; + comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners; StatusChangeListenerContainer* m_pStatCL; sal_Bool m_bLink; diff --git a/embedserv/source/inc/xwin.hxx b/embedserv/source/inc/xwin.hxx index a5e9dbfc6329..5aeb7d5fd370 100644 --- a/embedserv/source/inc/xwin.hxx +++ b/embedserv/source/inc/xwin.hxx @@ -224,7 +224,7 @@ public: private: osl::Mutex m_aMutex; - cppu::OInterfaceContainerHelper *m_pDisposeEventListeners; + comphelper::OInterfaceContainerHelper2 *m_pDisposeEventListeners; HWND m_aHwnd; }; -- cgit