From 9104017e1bf76857d2b9686363013e1e7c49e355 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 7 Aug 2021 18:17:03 +0200 Subject: create comphelper:OMultiTypeInterfaceContainerHelperVar2 and use it based on OInterfaceContainerHelper2 which is considerably faster than the original OInterfaceContainerHelper Change-Id: Ia8cdbc5ef877a7af3d9193e1bb2faf1595c15470 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120165 Tested-by: Jenkins Reviewed-by: Noel Grandin --- framework/inc/stdtypes.h | 4 ++-- framework/source/services/autorecovery.cxx | 4 ++-- framework/source/services/frame.cxx | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'framework') diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index a61ccc8fdc33..feec3ef92ceb 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -21,7 +21,7 @@ #include -#include +#include #include namespace framework{ @@ -61,7 +61,7 @@ struct KeyEventEqualsFunc Mapping between these two parts of a property should be done in the fastest way :-) */ -typedef cppu::OMultiTypeInterfaceContainerHelperVar ListenerHash; +typedef comphelper::OMultiTypeInterfaceContainerHelperVar2 ListenerHash; } // namespace framework diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 0c79cd4c97e9..43869f7bdc44 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -3489,7 +3489,7 @@ void AutoRecovery::implts_informListener( Job eJob , const css::frame::FeatureStateEvent& aEvent) { // Helper shares mutex with us -> threadsafe! - ::cppu::OInterfaceContainerHelper* pListenerForURL = nullptr; + ::comphelper::OInterfaceContainerHelper2* pListenerForURL = nullptr; OUString sJob = AutoRecovery::implst_getJobDescription(eJob); // inform listener, which are registered for any URLs(!) @@ -3497,7 +3497,7 @@ void AutoRecovery::implts_informListener( Job eJob , if(pListenerForURL == nullptr) return; - ::cppu::OInterfaceIteratorHelper pIt(*pListenerForURL); + ::comphelper::OInterfaceIteratorHelper2 pIt(*pListenerForURL); while(pIt.hasMoreElements()) { try diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index c373c5fa1162..9c3aeb2897ef 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2870,11 +2870,11 @@ bool XFrameImpl::impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent) The used helper is threadsafe and it lives for the whole lifetime of our own object. */ - ::cppu::OInterfaceContainerHelper* pVetoListener = m_lVetoChangeListener.getContainer(aEvent.PropertyName); + ::comphelper::OInterfaceContainerHelper2* pVetoListener = m_lVetoChangeListener.getContainer(aEvent.PropertyName); if (! pVetoListener) return false; - ::cppu::OInterfaceIteratorHelper pListener(*pVetoListener); + ::comphelper::OInterfaceIteratorHelper2 pListener(*pVetoListener); while (pListener.hasMoreElements()) { try @@ -2899,11 +2899,11 @@ void XFrameImpl::impl_notifyChangeListener(const css::beans::PropertyChangeEvent The used helper is threadsafe and it lives for the whole lifetime of our own object. */ - ::cppu::OInterfaceContainerHelper* pSimpleListener = m_lSimpleChangeListener.getContainer(aEvent.PropertyName); + ::comphelper::OInterfaceContainerHelper2* pSimpleListener = m_lSimpleChangeListener.getContainer(aEvent.PropertyName); if (! pSimpleListener) return; - ::cppu::OInterfaceIteratorHelper pListener(*pSimpleListener); + ::comphelper::OInterfaceIteratorHelper2 pListener(*pSimpleListener); while (pListener.hasMoreElements()) { try -- cgit