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 /filter | |
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 'filter')
-rw-r--r-- | filter/source/config/cache/basecontainer.cxx | 4 | ||||
-rw-r--r-- | filter/source/config/cache/basecontainer.hxx | 4 | ||||
-rw-r--r-- | filter/source/config/cache/configflush.cxx | 4 | ||||
-rw-r--r-- | filter/source/config/cache/configflush.hxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 71eb4f931399..4047f4df2719 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -451,11 +451,11 @@ void SAL_CALL BaseContainer::flush() // Further it's not a good idea to hold the own lock // if an outside object is called :-) css::lang::EventObject aSource (static_cast< css::util::XFlushable* >(this)); - ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer(cppu::UnoType<css::util::XFlushListener>::get()); + comphelper::OInterfaceContainerHelper2* pContainer = m_lListener.getContainer(cppu::UnoType<css::util::XFlushListener>::get()); if (!pContainer) return; - ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); + comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer); while (pIterator.hasMoreElements()) { try diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 001c304ffaed..dee054d90731 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/util/XFlushable.hpp> -#include <cppuhelper/interfacecontainer.h> +#include <comphelper/multicontainer2.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/ustring.hxx> @@ -93,7 +93,7 @@ class BaseContainer : public BaseLock FilterCache::EItemType m_eType; /** @short holds all listener, which are registered at this instance. */ - ::cppu::OMultiTypeInterfaceContainerHelper m_lListener; + comphelper::OMultiTypeInterfaceContainerHelper2 m_lListener; // native interface diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 5643e2d0ccf4..017fd8b19bb1 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -59,11 +59,11 @@ void SAL_CALL ConfigFlush::refresh() // Further it's not a good idea to hold the own lock // if an outside object is called :-) css::lang::EventObject aSource (static_cast< css::util::XRefreshable* >(this)); - ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer(cppu::UnoType<css::util::XRefreshListener>::get()); + comphelper::OInterfaceContainerHelper2* pContainer = m_lListener.getContainer(cppu::UnoType<css::util::XRefreshListener>::get()); if (!pContainer) return; - ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); + comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer); while (pIterator.hasMoreElements()) { try diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index 05edb639c886..20b1c14caae6 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -21,7 +21,7 @@ #include "cacheitem.hxx" #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/interfacecontainer.h> +#include <comphelper/multicontainer2.hxx> #include <cppuhelper/implbase.hxx> @@ -41,7 +41,7 @@ class ConfigFlush final : public BaseLock > { /** @short holds all listener, which are registered at this instance. */ - ::cppu::OMultiTypeInterfaceContainerHelper m_lListener; + comphelper::OMultiTypeInterfaceContainerHelper2 m_lListener; // native interface |