summaryrefslogtreecommitdiff
path: root/UnoControls/source/base/multiplexer.cxx
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2010-10-31 21:34:25 -0700
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-11-01 00:16:13 -0500
commitddec70f39e40eea43b8a3380edbb2086dcfb73ac (patch)
tree96f66959f84ae5dd7c72addd5f7bbe7e7fb3d4e1 /UnoControls/source/base/multiplexer.cxx
parenta62ff01d8c447928a85b6eeeb2d3d1ab4251490a (diff)
Macro Cleanup in UNO land.
Diffstat (limited to 'UnoControls/source/base/multiplexer.cxx')
-rw-r--r--UnoControls/source/base/multiplexer.cxx71
1 files changed, 22 insertions, 49 deletions
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 3fe037c4d6d0..4ac7156eb2ae 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -276,35 +276,8 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo
// XFcousListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException )
{
-/*
- OInterfaceContainerHelper * pCont = aListenerHolder.getContainer( ::getCppuType((const Reference< XFocusListener >*)0) );
- if( pCont )
- {
- OInterfaceIteratorHelper aIt( *pCont );
- FocusEvent aEvt = e;
- // Reamark: The control is the event source not the peer. We must change
- // the source of the event
- xControl.queryHardRef( ((XInterface*)NULL)->getSmartUik(), aEvt.Source );
- //.is the control not destroyed
- if( aEvt.Source.is() )
- {
- if( aIt.hasMoreElements() )
- {
- XFocusListener * pListener = (XFocusListener *)aIt.next();
- try
- {
- pListener->focusGained( aEvt );
- }
- catch( RuntimeException, e )
- {
- // ignore all usr system exceptions from the listener
- }
- }
- }
- }
-*/
MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent )
}
@@ -312,7 +285,7 @@ void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw
// XFcousListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent )
}
@@ -321,7 +294,7 @@ void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw(
// XWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent )
}
@@ -330,7 +303,7 @@ void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) th
// XWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent )
}
@@ -339,7 +312,7 @@ void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) thro
// XWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent )
}
@@ -348,7 +321,7 @@ void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) thro
// XWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent )
}
@@ -357,7 +330,7 @@ void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) thr
// XKeyListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent )
}
@@ -366,7 +339,7 @@ void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( UN
// XKeyListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent )
}
@@ -375,7 +348,7 @@ void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( U
// XMouseListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent )
}
@@ -384,7 +357,7 @@ void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw
// XMouseListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent )
}
@@ -393,7 +366,7 @@ void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) thro
// XMouseListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent )
}
@@ -402,7 +375,7 @@ void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw
// XMouseListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent )
}
@@ -411,7 +384,7 @@ void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw(
// XMouseMotionListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent )
}
@@ -420,7 +393,7 @@ void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw
// XMouseMotionListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent )
}
@@ -429,7 +402,7 @@ void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw(
// XPaintListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent )
}
@@ -438,7 +411,7 @@ void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw(
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent )
}
@@ -447,7 +420,7 @@ void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) thro
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent )
}
@@ -456,7 +429,7 @@ void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) t
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent )
}
@@ -465,7 +438,7 @@ void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) th
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent )
}
@@ -474,7 +447,7 @@ void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent )
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent )
}
@@ -483,7 +456,7 @@ void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent )
}
@@ -492,7 +465,7 @@ void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent )
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent )
}