diff options
Diffstat (limited to 'sfx2/source/view/userinputinterception.cxx')
| -rw-r--r-- | sfx2/source/view/userinputinterception.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx index a92b575d42d1..3e28bf6d93c5 100644 --- a/sfx2/source/view/userinputinterception.cxx +++ b/sfx2/source/view/userinputinterception.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/KeyModifier.hpp> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/weak.hxx> #include <vcl/event.hxx> #include <vcl/window.hxx> @@ -56,8 +56,8 @@ namespace sfx2 { public: ::cppu::OWeakObject& m_rControllerImpl; - ::cppu::OInterfaceContainerHelper m_aKeyHandlers; - ::cppu::OInterfaceContainerHelper m_aMouseClickHandlers; + ::comphelper::OInterfaceContainerHelper2 m_aKeyHandlers; + ::comphelper::OInterfaceContainerHelper2 m_aMouseClickHandlers; public: UserInputInterception_Data( ::cppu::OWeakObject& _rControllerImpl, ::osl::Mutex& _rMutex ) @@ -184,7 +184,7 @@ namespace sfx2 if ( _rEvent.GetWindow() ) aEvent.Source = _rEvent.GetWindow()->GetComponentInterface(); - ::cppu::OInterfaceIteratorHelper aIterator( m_pData->m_aKeyHandlers ); + ::comphelper::OInterfaceIteratorHelper2 aIterator( m_pData->m_aKeyHandlers ); while ( aIterator.hasMoreElements() ) { Reference< XKeyHandler > xHandler( static_cast< XKeyHandler* >( aIterator.next() ) ); @@ -222,7 +222,7 @@ namespace sfx2 if ( _rEvent.GetWindow() ) aEvent.Source = _rEvent.GetWindow()->GetComponentInterface(); - ::cppu::OInterfaceIteratorHelper aIterator( m_pData->m_aMouseClickHandlers ); + ::comphelper::OInterfaceIteratorHelper2 aIterator( m_pData->m_aMouseClickHandlers ); while ( aIterator.hasMoreElements() ) { Reference< XMouseClickHandler > xHandler( static_cast< XMouseClickHandler* >( aIterator.next() ) ); |