Replace remaining getCppuType et al with cppu::UnoType

Change-Id: I5321d1e0d29e3f74ae341feb9fba98f401be8358
This commit is contained in:
Stephan Bergmann
2015-04-01 08:35:17 +02:00
parent d246f47422
commit e360c2a861
3 changed files with 42 additions and 42 deletions

View File

@@ -191,7 +191,7 @@ void SAL_CALL Window::setFocus()
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -199,7 +199,7 @@ void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListe
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -207,7 +207,7 @@ void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowLi
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -215,7 +215,7 @@ void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListene
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -223,7 +223,7 @@ void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusList
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -231,7 +231,7 @@ void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >&
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -239,7 +239,7 @@ void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -247,7 +247,7 @@ void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListene
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -255,7 +255,7 @@ void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseList
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -263,7 +263,7 @@ void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseM
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -271,7 +271,7 @@ void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMou
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -279,7 +279,7 @@ void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListene
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
@@ -296,7 +296,7 @@ void SAL_CALL Window::dispose( )
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// ------------------------------------------------------------------------------
@@ -304,7 +304,7 @@ void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListen
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// XServiceInfo

View File

@@ -168,73 +168,73 @@ void SAL_CALL Window::setFocus( )
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// XComponent
@@ -247,13 +247,13 @@ void SAL_CALL Window::dispose( )
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
// XServiceInfo

View File

@@ -444,73 +444,73 @@ void SAL_CALL Window::setFocus( )
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::dispose( )
@@ -521,13 +521,13 @@ void SAL_CALL Window::dispose( )
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )