summaryrefslogtreecommitdiff
path: root/UnoControls/source/base
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-06 19:54:59 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-06 20:00:27 +0300
commit5814e764328e93c7618d384225fe6c7d628aa3c9 (patch)
tree534b6eeed8e60bd9290b21e2f748f8a732a653e6 /UnoControls/source/base
parent149e3d4212704b36c101c2cab11cb43ad633ddd5 (diff)
Kill superfluous vertical whitespace
Change-Id: Ieb7956acdc24d6b18939e916e33eb12dc268e778
Diffstat (limited to 'UnoControls/source/base')
-rw-r--r--UnoControls/source/base/basecontainercontrol.cxx40
-rw-r--r--UnoControls/source/base/basecontrol.cxx128
-rw-r--r--UnoControls/source/base/multiplexer.cxx70
3 files changed, 0 insertions, 238 deletions
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 37ca44480989..00d63052fbc1 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -21,10 +21,8 @@
#include <cppuhelper/typeprovider.hxx>
-
// namespaces
-
using namespace ::cppu ;
using namespace ::osl ;
using namespace ::rtl ;
@@ -35,10 +33,8 @@ using namespace ::com::sun::star::container ;
namespace unocontrols{
-
// construct/destruct
-
BaseContainerControl::BaseContainerControl( const Reference< XComponentContext >& rxContext )
: BaseControl ( rxContext )
, m_aListeners ( m_aMutex )
@@ -50,10 +46,8 @@ BaseContainerControl::~BaseContainerControl()
impl_cleanMemory();
}
-
// XInterface
-
Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
{
// Attention:
@@ -75,10 +69,8 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru
return aReturn ;
}
-
// XTypeProvider
-
Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException, std::exception )
{
// Optimize this method !
@@ -107,10 +99,8 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti
return pTypeCollection->getTypes();
}
-
// XAggregation
-
Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception )
{
// Ask for my own supported interfaces ...
@@ -134,10 +124,8 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw(
}
}
-
// XControl
-
void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >& xToolkit ,
const Reference< XWindowPeer >& xParent ) throw( RuntimeException, std::exception )
{
@@ -161,20 +149,16 @@ void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >&
}
}
-
// XControl
-
sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException, std::exception )
{
// This object has NO model.
return sal_False ;
}
-
// XControl
-
Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException, std::exception )
{
// This object has NO model.
@@ -182,10 +166,8 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt
return Reference< XControlModel >();
}
-
// XComponent
-
void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exception )
{
// Tell everything that this container is now gone.
@@ -223,10 +205,8 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exce
BaseControl::dispose();
}
-
// XEventListener
-
void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException, std::exception )
{
Reference< XControl > xControl( rEvent.Source, UNO_QUERY );
@@ -235,10 +215,8 @@ void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw
removeControl( xControl );
}
-
// XControlContainer
-
void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException, std::exception )
{
if ( !rControl.is () )
@@ -294,10 +272,8 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
}
}
-
// XControlContainer
-
void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException, std::exception )
{
if ( rControl.is() )
@@ -347,10 +323,8 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl >
}
}
-
// XControlContainer
-
void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException, std::exception )
{
// go down to each parent
@@ -362,10 +336,8 @@ void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText
}
}
-
// XControlContainer
-
Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -390,10 +362,8 @@ Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString
return Reference< XControl > () ;
}
-
// XControlContainer
-
Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -415,10 +385,8 @@ Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls ()
return aDescriptor ;
}
-
// XWindow
-
void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException, std::exception )
{
// override baseclass definition
@@ -432,10 +400,8 @@ void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( Runt
}
}
-
// protected method
-
WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Reference< XWindowPeer > & rParentPeer )
{
// - used from "createPeer()" to set the values of an WindowDescriptor !!!
@@ -454,18 +420,14 @@ WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Referen
return aDescriptor ;
}
-
// protected method
-
void BaseContainerControl::impl_paint ( sal_Int32 /*nX*/, sal_Int32 /*nY*/, const Reference< XGraphics > & /*rGraphics*/ )
{
}
-
// private method
-
void BaseContainerControl::impl_activateTabControllers ()
{
// Ready for multithreading
@@ -481,10 +443,8 @@ void BaseContainerControl::impl_activateTabControllers ()
}
}
-
// private method
-
void BaseContainerControl::impl_cleanMemory ()
{
// Get count of listitems.
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index c2ac982180a3..c60a999e75e9 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -29,10 +29,8 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
-
// namespaces
-
using namespace ::cppu ;
using namespace ::osl ;
using namespace ::rtl ;
@@ -51,10 +49,8 @@ namespace unocontrols{
#define DEFAULT_INDESIGNMODE false
#define DEFAULT_ENABLE true
-
// construct/destruct
-
BaseControl::BaseControl( const Reference< XComponentContext >& rxContext )
: IMPL_MutexContainer ( )
, OComponentHelper ( m_aMutex )
@@ -74,10 +70,8 @@ BaseControl::~BaseControl()
{
}
-
// XInterface
-
Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
{
Any aReturn ;
@@ -96,10 +90,8 @@ Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeExce
return aReturn ;
}
-
// XInterface
-
void SAL_CALL BaseControl::acquire() throw()
{
// Attention:
@@ -109,10 +101,8 @@ void SAL_CALL BaseControl::acquire() throw()
OComponentHelper::acquire();
}
-
// XInterface
-
void SAL_CALL BaseControl::release() throw()
{
// Attention:
@@ -122,10 +112,8 @@ void SAL_CALL BaseControl::release() throw()
OComponentHelper::release();
}
-
// XTypeProvider
-
Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std::exception )
{
// Optimize this method !
@@ -159,19 +147,15 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std::
return pTypeCollection->getTypes();
}
-
// XTypeProvider
-
Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException, std::exception )
{
return css::uno::Sequence<sal_Int8>();
}
-
// XAggregation
-
void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -179,10 +163,8 @@ void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) t
m_xDelegator = xDel;
}
-
// XAggregation
-
Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception )
{
// Ask for my own supported interfaces ...
@@ -210,37 +192,29 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx
}
}
-
// XServiceInfo
-
OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException, std::exception )
{
return impl_getStaticImplementationName();
}
-
// XServiceInfo
-
sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
{
return cppu::supportsService(this, sServiceName);
}
-
// XServiceInfo
-
Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException, std::exception )
{
return impl_getStaticSupportedServiceNames();
}
-
// XComponent
-
void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -266,10 +240,8 @@ void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception )
}
}
-
// XComponent
-
void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -277,10 +249,8 @@ void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >&
OComponentHelper::addEventListener( xListener );
}
-
// XComponent
-
void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -288,10 +258,8 @@ void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener
OComponentHelper::removeEventListener( xListener );
}
-
// XControl
-
void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToolkit ,
const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException, std::exception )
{
@@ -351,10 +319,8 @@ void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToo
}
}
-
// XControl
-
void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -362,10 +328,8 @@ void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext )
m_xContext = xContext ;
}
-
// XControl
-
void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -373,10 +337,8 @@ void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException
m_bInDesignMode = bOn ;
}
-
// XControl
-
Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -384,10 +346,8 @@ Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeExcepti
return m_xContext ;
}
-
// XControl
-
Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -395,10 +355,8 @@ Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException
return m_xPeer ;
}
-
// XControl
-
Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -406,10 +364,8 @@ Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std:
return Reference< XView >( (OWeakObject*)this, UNO_QUERY );
}
-
// XControl
-
sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -417,19 +373,15 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exce
return m_bInDesignMode ;
}
-
// XControl
-
sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException, std::exception )
{
return sal_False ;
}
-
// XWindow
-
void SAL_CALL BaseControl::setPosSize( sal_Int32 nX ,
sal_Int32 nY ,
sal_Int32 nWidth ,
@@ -469,10 +421,8 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX ,
}
}
-
// XWindow
-
void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -488,10 +438,8 @@ void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeExcepti
}
}
-
// XWindow
-
void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -507,10 +455,8 @@ void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException
}
}
-
// XWindow
-
void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -522,10 +468,8 @@ void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception )
}
}
-
// XWindow
-
Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -533,118 +477,92 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::excep
return Rectangle( m_nX, m_nY , m_nWidth, m_nHeight );
}
-
// XWindow
-
void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
}
-
// XWindow
-
void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
}
-
// XView
-
void SAL_CALL BaseControl::draw( sal_Int32 nX ,
sal_Int32 nY ) throw( RuntimeException, std::exception )
{
@@ -657,10 +575,8 @@ void SAL_CALL BaseControl::draw( sal_Int32 nX ,
impl_paint( nX, nY, m_xGraphicsView );
}
-
// XView
-
sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException, std::exception )
{
// - set the graphics for an view
@@ -679,20 +595,16 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic
return bReturn ;
}
-
// XView
-
void SAL_CALL BaseControl::setZoom( float /*fZoomX*/ ,
float /*fZoomY*/ ) throw( RuntimeException, std::exception )
{
// Not implemented yet
}
-
// XView
-
Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -700,10 +612,8 @@ Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeExcepti
return m_xGraphicsView ;
}
-
// XView
-
Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -711,10 +621,8 @@ Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception )
return Size( m_nWidth, m_nHeight );
}
-
// XEventListener
-
void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -735,10 +643,8 @@ void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( Ru
}
}
-
// XPaintListener
-
void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -750,10 +656,8 @@ void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( Ru
impl_paint( 0, 0, m_xGraphicsPeer );
}
-
// XWindowListener
-
void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -767,10 +671,8 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run
impl_recalcLayout( aMappedEvent );
}
-
// XWindowListener
-
void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
@@ -784,91 +686,71 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti
impl_recalcLayout( aMappedEvent );
}
-
// XWindowListener
-
void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception )
{
}
-
// XWindowListener
-
void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception )
{
}
-
// impl but public method to register service in DLL
// (In this BASE-implementation not implemented! Overwrite it in derived classes.)
-
const Sequence< OUString > BaseControl::impl_getStaticSupportedServiceNames()
{
return Sequence< OUString >();
}
-
// impl but public method to register service in DLL
// (In this BASE-implementation not implemented! Overwrite it in derived classes.)
-
const OUString BaseControl::impl_getStaticImplementationName()
{
return OUString();
}
-
// protected method
-
const Reference< XComponentContext > BaseControl::impl_getComponentContext()
{
return m_xComponentContext ;
}
-
// protected method
-
const Reference< XWindow > BaseControl::impl_getPeerWindow()
{
return m_xPeerWindow ;
}
-
// protected method
-
const Reference< XGraphics > BaseControl::impl_getGraphicsPeer()
{
return m_xGraphicsPeer ;
}
-
// protected method
-
const sal_Int32& BaseControl::impl_getWidth()
{
return m_nWidth ;
}
-
// protected method
-
const sal_Int32& BaseControl::impl_getHeight()
{
return m_nHeight ;
}
-
// protected method
-
WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
{
// - used from "createPeer()" to set the values of an ::com::sun::star::awt::WindowDescriptor !!!
@@ -887,10 +769,8 @@ WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindo
return pDescriptor ;
}
-
// protected method
-
void BaseControl::impl_paint( sal_Int32 /*nX*/ ,
sal_Int32 /*nY*/ ,
const Reference< XGraphics >& /*xGraphics*/ )
@@ -900,29 +780,23 @@ void BaseControl::impl_paint( sal_Int32 /*nX*/
// - not used in this implementation, but its not necessary to make it pure virtual !!!
}
-
// protected method
-
void BaseControl::impl_recalcLayout( const WindowEvent& /*aEvent*/ )
{
// We need as virtual function to support automaticly resizing of derived controls!
// But we make it not pure virtual because it's not necessary for all derived classes!
}
-
// protected method
-
Reference< XInterface > BaseControl::impl_getDelegator()
{
return m_xDelegator ;
}
-
// private method
-
void BaseControl::impl_releasePeer()
{
if ( m_xPeer.is() )
@@ -946,10 +820,8 @@ void BaseControl::impl_releasePeer()
}
}
-
// private method
-
OMRCListenerMultiplexerHelper* BaseControl::impl_getMultiplexer()
{
if ( m_pMultiplexer == NULL )
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index ccee9bea5a13..54340c2323bc 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -29,10 +29,8 @@ using namespace ::com::sun::star::lang ;
namespace unocontrols{
-
// macros
-
#define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT ) \
\
/* First get all interfaces from container with right type.*/ \
@@ -63,10 +61,8 @@ namespace unocontrols{
} \
}
-
// construct/destruct
-
OMRCListenerMultiplexerHelper::OMRCListenerMultiplexerHelper( const Reference< XWindow >& xControl ,
const Reference< XWindow >& xPeer )
: m_xPeer ( xPeer )
@@ -92,10 +88,8 @@ OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper()
{
}
-
// XInterface
-
Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
{
// Attention:
@@ -128,10 +122,8 @@ Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType )
}
}
-
// XInterface
-
void SAL_CALL OMRCListenerMultiplexerHelper::acquire() throw()
{
// Attention:
@@ -141,10 +133,8 @@ void SAL_CALL OMRCListenerMultiplexerHelper::acquire() throw()
OWeakObject::acquire();
}
-
// XInterface
-
void SAL_CALL OMRCListenerMultiplexerHelper::release() throw()
{
// Attention:
@@ -154,19 +144,15 @@ void SAL_CALL OMRCListenerMultiplexerHelper::release() throw()
OWeakObject::release();
}
-
// operator
-
OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const
{
return ((OWeakObject*)this) ;
}
-
// container method
-
void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
{
MutexGuard aGuard( m_aMutex );
@@ -196,10 +182,8 @@ void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
}
}
-
// container method
-
void OMRCListenerMultiplexerHelper::disposeAndClear()
{
EventObject aEvent ;
@@ -207,10 +191,8 @@ void OMRCListenerMultiplexerHelper::disposeAndClear()
m_aListenerHolder.disposeAndClear( aEvent );
}
-
// container method
-
void OMRCListenerMultiplexerHelper::advise( const Type& aType ,
const Reference< XInterface >& xListener )
{
@@ -225,10 +207,8 @@ void OMRCListenerMultiplexerHelper::advise( const Type&
}
}
-
// container method
-
void OMRCListenerMultiplexerHelper::unadvise( const Type& aType ,
const Reference< XInterface >& xListener )
{
@@ -243,10 +223,8 @@ void OMRCListenerMultiplexerHelper::unadvise( const Type&
}
}
-
// XEventListener
-
void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception )
{
MutexGuard aGuard( m_aMutex );
@@ -254,208 +232,162 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo
m_xPeer.clear();
}
-
// XFcousListener
-
void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent )
}
-
// XFcousListener
-
void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent )
}
-
// XWindowListener
-
void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent )
}
-
// XWindowListener
-
void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent )
}
-
// XWindowListener
-
void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent )
}
-
// XWindowListener
-
void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent )
}
-
// XKeyListener
-
void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException, std::exception )
{
MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent )
}
-
// XKeyListener
-
void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException, std::exception )
{
MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent )
}
-
// XMouseListener
-
void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
{
MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent )
}
-
// XMouseListener
-
void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
{
MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent )
}
-
// XMouseListener
-
void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
{
MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent )
}
-
// XMouseListener
-
void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
{
MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent )
}
-
// XMouseMotionListener
-
void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
{
MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent )
}
-
// XMouseMotionListener
-
void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
{
MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent )
}
-
// XPaintListener
-
void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException, std::exception )
{
MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent )
}
-
// XTopWindowListener
-
void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException, std::exception )
{
MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent )
}
-
// XTopWindowListener
-
void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent )
}
-
// XTopWindowListener
-
void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent )
}
-
// XTopWindowListener
-
void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent )
}
-
// XTopWindowListener
-
void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent )
}
-
// XTopWindowListener
-
void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent )
}
-
// XTopWindowListener
-
void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException, std::exception )
{
MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent )
}
-
// protected method
-
void OMRCListenerMultiplexerHelper::impl_adviseToPeer( const Reference< XWindow >& xPeer ,
const Type& aType )
{
@@ -484,10 +416,8 @@ void OMRCListenerMultiplexerHelper::impl_adviseToPeer( const Reference< XWind
}
}
-
// protected method
-
void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer( const Reference< XWindow >& xPeer ,
const Type& aType )
{