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 /scripting | |
| 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 'scripting')
| -rw-r--r-- | scripting/Library_stringresource.mk | 1 | ||||
| -rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 2 | ||||
| -rw-r--r-- | scripting/source/stringresource/stringresource.hxx | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index 1588fd4faff4..c70a054d1bc6 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_external,stringresource,boost_headers)) $(eval $(call gb_Library_use_sdk_api,stringresource)) $(eval $(call gb_Library_use_libraries,stringresource,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index f37c4e8fc4e7..46d011d44543 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -701,7 +701,7 @@ void StringResourceImpl::implNotifyListeners() EventObject aEvent; aEvent.Source = static_cast< XInterface* >( static_cast<OWeakObject*>(this) ); - ::cppu::OInterfaceIteratorHelper it( m_aListenerContainer ); + ::comphelper::OInterfaceIteratorHelper2 it( m_aListenerContainer ); while( it.hasMoreElements() ) { Reference< XInterface > xIface = it.next(); diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index fc130b852e8e..4519f7cfa678 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <osl/mutex.hxx> #include <unordered_map> @@ -103,7 +103,7 @@ protected: LocaleItem* m_pDefaultLocaleItem; bool m_bDefaultModified; - ::cppu::OInterfaceContainerHelper m_aListenerContainer; + ::comphelper::OInterfaceContainerHelper2 m_aListenerContainer; LocaleItemVector m_aLocaleItemVector; LocaleItemVector m_aDeletedLocaleItemVector; |