summaryrefslogtreecommitdiff
path: root/xmlhelp
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 /xmlhelp
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 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.cxx6
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.hxx8
2 files changed, 7 insertions, 7 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index f4ef8fe0f8bb..0266ef118a03 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -104,7 +104,7 @@ ResultSetBase::addEventListener(
if ( ! m_pDisposeEventListeners )
m_pDisposeEventListeners =
- new cppu::OInterfaceContainerHelper( m_aMutex );
+ new comphelper::OInterfaceContainerHelper2( m_aMutex );
m_pDisposeEventListeners->addInterface( Listener );
}
@@ -560,7 +560,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pIsFinalListeners )
m_pIsFinalListeners =
- new cppu::OInterfaceContainerHelper( m_aMutex );
+ new comphelper::OInterfaceContainerHelper2( m_aMutex );
m_pIsFinalListeners->addInterface( xListener );
}
@@ -569,7 +569,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pRowCountListeners )
m_pRowCountListeners =
- new cppu::OInterfaceContainerHelper( m_aMutex );
+ new comphelper::OInterfaceContainerHelper2( m_aMutex );
m_pRowCountListeners->addInterface( xListener );
}
else
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index c9660f2b9f00..fc2cf624fb91 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -21,7 +21,7 @@
#include <vector>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/interfacecontainer2.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/sdbc/XCloseable.hpp>
@@ -548,10 +548,10 @@ namespace chelp {
css::uno::Sequence< css::beans::Property > m_sProperty;
osl::Mutex m_aMutex;
- cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
+ comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners;
- cppu::OInterfaceContainerHelper* m_pRowCountListeners;
- cppu::OInterfaceContainerHelper* m_pIsFinalListeners;
+ comphelper::OInterfaceContainerHelper2* m_pRowCountListeners;
+ comphelper::OInterfaceContainerHelper2* m_pIsFinalListeners;
};