diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-07 09:24:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-07 21:34:33 +0200 |
| commit | 86abf3a682b424dc0fcbccf030f5a0b9bfb81d8c (patch) | |
| tree | ba40de884231f604bbd8eedb610834d92afb86ae /sfx2/source/view/sfxbasecontroller.cxx | |
| parent | 2cd1442f83d41af1f2b663ccb8bfab6a954009f1 (diff) | |
create comphelper::OMultiTypeInterfaceContainerHelper2 and use it
based on OInterfaceContainerHelper2 which is considerably
faster than the original OInterfaceContainerHelper
Change-Id: I9c8b6d0e5382018824bf7188a26343703abf2d51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120161
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/view/sfxbasecontroller.cxx')
| -rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 8f5bfddba32d..60252a3b71cb 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <comphelper/interfacecontainer2.hxx> +#include <comphelper/multicontainer2.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/docfac.hxx> #include <sfx2/viewfrm.hxx> @@ -353,7 +354,7 @@ struct IMPL_SfxBaseController_DataContainer Reference< XFrameActionListener > m_xListener ; Reference< XCloseListener > m_xCloseListener ; ::sfx2::UserInputInterception m_aUserInputInterception; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer ; + ::comphelper::OMultiTypeInterfaceContainerHelper2 m_aListenerContainer ; ::comphelper::OInterfaceContainerHelper2 m_aInterceptorContainer ; Reference< XStatusIndicator > m_xIndicator ; SfxViewShell* m_pViewShell ; @@ -890,7 +891,7 @@ awt::Rectangle SAL_CALL SfxBaseController::queryBorderedArea( const awt::Rectang void SfxBaseController::BorderWidthsChanged_Impl() { - ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aListenerContainer.getContainer( + ::comphelper::OInterfaceContainerHelper2* pContainer = m_pData->m_aListenerContainer.getContainer( cppu::UnoType<frame::XBorderResizeListener>::get()); if ( !pContainer ) return; @@ -898,7 +899,7 @@ void SfxBaseController::BorderWidthsChanged_Impl() frame::BorderWidths aBWidths = getBorder(); Reference< uno::XInterface > xThis( static_cast< ::cppu::OWeakObject* >(this), uno::UNO_QUERY ); - ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); + ::comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer); while (pIterator.hasMoreElements()) { try |