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 /fpicker | |
| 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 'fpicker')
| -rw-r--r-- | fpicker/source/win32/VistaFilePickerEventHandler.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/win32/VistaFilePickerEventHandler.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fpicker/source/win32/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/VistaFilePickerEventHandler.cxx index c7946b0216bc..97c0c9fbd41e 100644 --- a/fpicker/source/win32/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/VistaFilePickerEventHandler.cxx @@ -279,11 +279,11 @@ void doRequest(Request& rRequest) void VistaFilePickerEventHandler::impl_sendEvent( EEventType eEventType, ::sal_Int16 nControlID) { - ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer( cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get()); + comphelper::OInterfaceContainerHelper2* pContainer = m_lListener.getContainer( cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get()); if ( ! pContainer) return; - ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); + comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer); while (pIterator.hasMoreElements()) { try diff --git a/fpicker/source/win32/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/VistaFilePickerEventHandler.hxx index 71199cd07b45..b27ef7326f35 100644 --- a/fpicker/source/win32/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/VistaFilePickerEventHandler.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/interfacecontainer.h> +#include <comphelper/multicontainer2.hxx> #include <osl/interlck.h> namespace fpicker{ @@ -182,7 +182,7 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex * be locked during this time. If we call our listener back now synchronously .. * we will block on SolarMutex.acquire() forever .-)) */ - ::cppu::OMultiTypeInterfaceContainerHelper m_lListener; + comphelper::OMultiTypeInterfaceContainerHelper2 m_lListener; }; } // namespace vista |