summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/hierarchy
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2016-01-19 19:45:45 +0200
committerNoel Grandin <noel@peralex.com>2016-01-25 08:52:03 +0200
commit752cd07d085ac0aadc99bd512d49072843139032 (patch)
tree21ff2f55761b34bfdd721b5e1ed43333e8874e46 /ucb/source/ucp/hierarchy
parent0e7cd653ea90da388820220bf6a3eb140b57bbd6 (diff)
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 'ucb/source/ucp/hierarchy')
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.cxx4
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.hxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 398a044047a9..d9b9e8ce2e53 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -31,7 +31,7 @@
#include "osl/doublecheckedlocking.h"
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/interfacecontainer2.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -322,7 +322,7 @@ void SAL_CALL HierarchyDataSource::addEventListener(
if ( !m_pDisposeEventListeners )
m_pDisposeEventListeners
- = new cppu::OInterfaceContainerHelper( m_aMutex );
+ = new comphelper::OInterfaceContainerHelper2( m_aMutex );
m_pDisposeEventListeners->addInterface( Listener );
}
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 8ee2ac3d2a6e..dc750fc2b0a1 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -29,7 +29,7 @@
#include <cppuhelper/weak.hxx>
#include <ucbhelper/macros.hxx>
-namespace cppu { class OInterfaceContainerHelper; }
+namespace comphelper { class OInterfaceContainerHelper2; }
namespace hierarchy_ucp {
@@ -44,7 +44,7 @@ class HierarchyDataSource : public cppu::OWeakObject,
osl::Mutex m_aMutex;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider;
- cppu::OInterfaceContainerHelper * m_pDisposeEventListeners;
+ comphelper::OInterfaceContainerHelper2 * m_pDisposeEventListeners;
public:
explicit HierarchyDataSource( const css::uno::Reference< css::uno::XComponentContext > & rxContext );