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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/fwe/helper/undomanagerhelper.cxx | 6 | ||||
| -rw-r--r-- | framework/source/services/frame.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 5f71ed13a89a..e0a1d0db623b 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/lang/XComponent.hpp> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/exc_hlp.hxx> #include <comphelper/flagguard.hxx> #include <comphelper/asyncnotification.hxx> @@ -197,8 +197,8 @@ namespace framework bool m_bAPIActionRunning; bool m_bProcessingEvents; sal_Int32 m_nLockCount; - ::cppu::OInterfaceContainerHelper m_aUndoListeners; - ::cppu::OInterfaceContainerHelper m_aModifyListeners; + ::comphelper::OInterfaceContainerHelper2 m_aUndoListeners; + ::comphelper::OInterfaceContainerHelper2 m_aModifyListeners; IUndoManagerImplementation& m_rUndoManagerImplementation; ::std::stack< bool > m_aContextVisibilities; #if OSL_DEBUG_LEVEL > 0 diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index ca4518c7d135..8ceb9572f462 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2832,7 +2832,7 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction // Send css::frame::FrameAction event to all listener. // Get container for right listener. // FOLLOW LINES ARE THREADSAFE!!! - // ( OInterfaceContainerHelper is synchronized with m_aListenerContainer! ) + // ( OInterfaceContainerHelper2 is synchronized with m_aListenerContainer! ) ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::frame::XFrameActionListener>::get()); if( pContainer != nullptr ) |