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 /forms/source/richtext | |
| parent | 0e7cd653ea90da388820220bf6a3eb140b57bbd6 (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 'forms/source/richtext')
| -rw-r--r-- | forms/source/richtext/attributedispatcher.cxx | 2 | ||||
| -rw-r--r-- | forms/source/richtext/featuredispatcher.cxx | 2 | ||||
| -rw-r--r-- | forms/source/richtext/featuredispatcher.hxx | 6 | ||||
| -rw-r--r-- | forms/source/richtext/richtextmodel.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx index 768d3f28becb..abc6ab789283 100644 --- a/forms/source/richtext/attributedispatcher.cxx +++ b/forms/source/richtext/attributedispatcher.cxx @@ -112,7 +112,7 @@ namespace frm (void)_nAttributeId; FeatureStateEvent aEvent( buildStatusEvent() ); - ::cppu::OInterfaceIteratorHelper aIter( getStatusListeners() ); + ::comphelper::OInterfaceIteratorHelper2 aIter( getStatusListeners() ); while ( aIter.hasMoreElements() ) doNotify( static_cast< XStatusListener* >( aIter.next() ), aEvent ); } diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx index 66740eb5afa2..1e0ec84b57db 100644 --- a/forms/source/richtext/featuredispatcher.cxx +++ b/forms/source/richtext/featuredispatcher.cxx @@ -107,7 +107,7 @@ namespace frm void ORichTextFeatureDispatcher::invalidateFeatureState_Broadcast() { FeatureStateEvent aEvent( buildStatusEvent() ); - ::cppu::OInterfaceIteratorHelper aIter( getStatusListeners() ); + ::comphelper::OInterfaceIteratorHelper2 aIter( getStatusListeners() ); while ( aIter.hasMoreElements() ) doNotify( static_cast< XStatusListener* >( aIter.next() ), aEvent ); } diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index 794947ff0764..b36a563c9d0f 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/broadcasthelper.hxx> @@ -39,7 +39,7 @@ namespace frm { private: css::util::URL m_aFeatureURL; - ::cppu::OInterfaceContainerHelper m_aStatusListeners; + ::comphelper::OInterfaceContainerHelper2 m_aStatusListeners; EditView* m_pEditView; bool m_bDisposed; @@ -49,7 +49,7 @@ namespace frm protected: inline const css::util::URL& getFeatureURL() const { return m_aFeatureURL; } - inline ::cppu::OInterfaceContainerHelper& getStatusListeners() { return m_aStatusListeners; } + inline ::comphelper::OInterfaceContainerHelper2& getStatusListeners() { return m_aStatusListeners; } inline bool isDisposed() const { return m_bDisposed; } inline void checkDisposed() const { if ( isDisposed() ) throw css::lang::DisposedException(); } diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index a08a89d3f8d9..f3ed47408040 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -95,7 +95,7 @@ namespace frm m_pEngine; bool m_bSettingEngineText; - ::cppu::OInterfaceContainerHelper + ::comphelper::OInterfaceContainerHelper2 m_aModifyListeners; public: |