summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-08-07 09:24:46 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-08-07 21:34:33 +0200
commit86abf3a682b424dc0fcbccf030f5a0b9bfb81d8c (patch)
treeba40de884231f604bbd8eedb610834d92afb86ae /avmedia
parent2cd1442f83d41af1f2b663ccb8bfab6a954009f1 (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 'avmedia')
-rw-r--r--avmedia/source/macavf/window.hxx4
-rw-r--r--avmedia/source/win/window.cxx16
-rw-r--r--avmedia/source/win/window.hxx4
3 files changed, 12 insertions, 12 deletions
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index cfaae6f47d3b..14fdaf389811 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -21,7 +21,7 @@
#include "macavfcommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/multicontainer2.hxx>
#include <com/sun/star/media/XPlayerWindow.hpp>
@@ -92,7 +92,7 @@ public:
private:
::osl::Mutex maMutex;
- ::cppu::OMultiTypeInterfaceContainerHelper maListeners;
+ comphelper::OMultiTypeInterfaceContainerHelper2 maListeners;
css::media::ZoomLevel meZoomLevel;
Player& mrPlayer;
int mnPointerType;
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index b7aa28ba26d5..4f4ef47456e6 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -423,11 +423,11 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
void Window::fireMousePressedEvent( const css::awt::MouseEvent& rEvt )
{
- ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get());
+ comphelper::OInterfaceContainerHelper2* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get());
if( pContainer )
{
- ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+ comphelper::OInterfaceIteratorHelper2 aIter( *pContainer );
while( aIter.hasMoreElements() )
static_cast< awt::XMouseListener* >( aIter.next() )->mousePressed( rEvt );
@@ -436,11 +436,11 @@ void Window::fireMousePressedEvent( const css::awt::MouseEvent& rEvt )
void Window::fireMouseReleasedEvent( const css::awt::MouseEvent& rEvt )
{
- ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get());
+ comphelper::OInterfaceContainerHelper2* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get());
if( pContainer )
{
- ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+ comphelper::OInterfaceIteratorHelper2 aIter( *pContainer );
while( aIter.hasMoreElements() )
static_cast< awt::XMouseListener* >( aIter.next() )->mouseReleased( rEvt );
@@ -449,11 +449,11 @@ void Window::fireMouseReleasedEvent( const css::awt::MouseEvent& rEvt )
void Window::fireMouseMovedEvent( const css::awt::MouseEvent& rEvt )
{
- ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseMotionListener>::get());
+ comphelper::OInterfaceContainerHelper2* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseMotionListener>::get());
if( pContainer )
{
- ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+ comphelper::OInterfaceIteratorHelper2 aIter( *pContainer );
while( aIter.hasMoreElements() )
static_cast< awt::XMouseMotionListener* >( aIter.next() )->mouseMoved( rEvt );
@@ -462,11 +462,11 @@ void Window::fireMouseMovedEvent( const css::awt::MouseEvent& rEvt )
void Window::fireSetFocusEvent( const css::awt::FocusEvent& rEvt )
{
- ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XFocusListener>::get());
+ comphelper::OInterfaceContainerHelper2* pContainer = maListeners.getContainer( cppu::UnoType<awt::XFocusListener>::get());
if( pContainer )
{
- ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+ comphelper::OInterfaceIteratorHelper2 aIter( *pContainer );
while( aIter.hasMoreElements() )
static_cast< awt::XFocusListener* >( aIter.next() )->focusGained( rEvt );
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index c13bd8b62ea4..39d5aec626c4 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -25,7 +25,7 @@
#include "wincommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/multicontainer2.hxx>
#include <com/sun/star/media/XPlayerWindow.hpp>
@@ -96,7 +96,7 @@ public:
private:
::osl::Mutex maMutex;
- ::cppu::OMultiTypeInterfaceContainerHelper maListeners;
+ comphelper::OMultiTypeInterfaceContainerHelper2 maListeners;
css::media::ZoomLevel meZoomLevel;
Player& mrPlayer;
HWND mnFrameWnd;