[Libreoffice-commits] core.git: UnoControls/inc UnoControls/source
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 04:02:43 PST 2014
UnoControls/inc/basecontainercontrol.hxx | 64 +-
UnoControls/inc/basecontrol.hxx | 80 +--
UnoControls/inc/multiplexer.hxx | 68 +-
UnoControls/source/base/basecontrol.cxx | 256 +++++-----
UnoControls/source/controls/OConnectionPointContainerHelper.cxx | 40 -
UnoControls/source/controls/framecontrol.cxx | 112 ++--
UnoControls/source/controls/progressbar.cxx | 72 +-
UnoControls/source/inc/OConnectionPointContainerHelper.hxx | 28 -
UnoControls/source/inc/OConnectionPointHelper.hxx | 32 -
UnoControls/source/inc/framecontrol.hxx | 72 +-
UnoControls/source/inc/progressbar.hxx | 48 -
UnoControls/source/inc/progressmonitor.hxx | 76 +-
UnoControls/source/inc/statusindicator.hxx | 74 +-
13 files changed, 511 insertions(+), 511 deletions(-)
New commits:
commit b06820d74c701e305f007d4cb91f939e5644d11d
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 22:41:38 2014 +0100
Remove visual noise from UnoControls
Change-Id: I0ffbc08cf769e39e8c3b7519e8d2e13ccbe6e3d8
Reviewed-on: https://gerrit.libreoffice.org/8331
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index a6a0906..1165082 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -34,15 +34,15 @@
#include "basecontrol.hxx"
-//____________________________________________________________________________________________________________
+
// "namespaces"
-//____________________________________________________________________________________________________________
+
namespace unocontrols{
-//____________________________________________________________________________________________________________
+
// structs, types, forwards
-//____________________________________________________________________________________________________________
+
struct IMPL_ControlInfo
{
@@ -55,15 +55,15 @@ class BaseContainerControl : public ::com::sun::star::awt::XControlModel
, public BaseControl
{
-//____________________________________________________________________________________________________________
+
// public methods
-//____________________________________________________________________________________________________________
+
public:
- //________________________________________________________________________________________________________
+
// construct/destruct
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -95,9 +95,9 @@ public:
virtual ~BaseContainerControl();
- //________________________________________________________________________________________________________
+
// XInterface
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short give answer, if interface is supported
@@ -116,9 +116,9 @@ public:
const ::com::sun::star::uno::Type& aType
) throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XTypeProvider
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short get information about supported interfaces
@@ -136,9 +136,9 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XAggregation
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -157,9 +157,9 @@ public:
const ::com::sun::star::uno::Type& aType
) throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XControl
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -212,9 +212,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XComponent
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -231,9 +231,9 @@ public:
virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XEventListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -250,9 +250,9 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XControlContainer
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -373,9 +373,9 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls()
throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XUnoControlContainer
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -444,9 +444,9 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > SAL_CALL getTabControllers()
throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XWindow
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -463,9 +463,9 @@ public:
virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException );
-//____________________________________________________________________________________________________________
+
// protected methods
-//____________________________________________________________________________________________________________
+
protected:
using OComponentHelper::disposing;
@@ -505,9 +505,9 @@ protected:
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics
);
-//____________________________________________________________________________________________________________
+
// private methods
-//____________________________________________________________________________________________________________
+
private:
@@ -541,9 +541,9 @@ private:
void impl_cleanMemory();
-//____________________________________________________________________________________________________________
+
// private variables
-//____________________________________________________________________________________________________________
+
private:
// list of pointer of "struct IMPL_ControlInfo" to hold child-controls
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index be90e9d..68c47e6 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -92,22 +92,22 @@ namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
} } } }
-//____________________________________________________________________________________________________________
+
// "namespaces"
-//____________________________________________________________________________________________________________
+
namespace unocontrols{
-//____________________________________________________________________________________________________________
+
// macros
-//____________________________________________________________________________________________________________
+
#define TRGB_COLORDATA(TRANSPARENCE,RED,GREEN,BLUE) \
((sal_Int32)(((sal_uInt32)((sal_uInt8)(BLUE))))|(((sal_uInt32)((sal_uInt8)(GREEN)))<<8)|(((sal_uInt32)((sal_uInt8)(RED)))<<16)|(((sal_uInt32)((sal_uInt8)(TRANSPARENCE)))<<24))
-//____________________________________________________________________________________________________________
+
// structs
-//____________________________________________________________________________________________________________
+
struct IMPL_MutexContainer
{
@@ -124,15 +124,15 @@ class BaseControl : public ::com::sun::star::lang::XServiceInfo
, public IMPL_MutexContainer
, public ::cppu::OComponentHelper
{
-//____________________________________________________________________________________________________________
+
// public methods
-//____________________________________________________________________________________________________________
+
public:
- //________________________________________________________________________________________________________
+
// construct/destruct
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -164,9 +164,9 @@ public:
virtual ~BaseControl();
- //________________________________________________________________________________________________________
+
// XInterface
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short give answer, if interface is supported
@@ -217,9 +217,9 @@ public:
virtual void SAL_CALL release() throw();
- //________________________________________________________________________________________________________
+
// XTypeProvider
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short get information about supported interfaces
@@ -254,9 +254,9 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XAggregation
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -292,9 +292,9 @@ public:
const ::com::sun::star::uno::Type& aType
) throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XServiceInfo
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -345,9 +345,9 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XComponent
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -398,9 +398,9 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener
) throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XControl
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -563,9 +563,9 @@ public:
virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XWindow
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -850,9 +850,9 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener
) throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XView
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -934,9 +934,9 @@ public:
virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// ::com::sun::star::lang::XEventListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -955,9 +955,9 @@ public:
const ::com::sun::star::lang::EventObject& rSource
) throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XPaintListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -976,9 +976,9 @@ public:
const ::com::sun::star::awt::PaintEvent& rEvent
) throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// XWindowListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -998,9 +998,9 @@ public:
virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException );
- //________________________________________________________________________________________________________
+
// impl but public method to register service
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -1032,9 +1032,9 @@ public:
static const OUString impl_getStaticImplementationName();
-//____________________________________________________________________________________________________________
+
// protected methods
-//____________________________________________________________________________________________________________
+
protected:
using OComponentHelper::disposing;
@@ -1178,9 +1178,9 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > impl_getDelegator();
-//____________________________________________________________________________________________________________
+
// private methods
-//____________________________________________________________________________________________________________
+
private:
@@ -1214,9 +1214,9 @@ private:
OMRCListenerMultiplexerHelper* impl_getMultiplexer();
-//____________________________________________________________________________________________________________
+
// private variables
-//____________________________________________________________________________________________________________
+
private:
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index 9d1fdba..d712bef 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -46,15 +46,15 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-//____________________________________________________________________________________________________________
+
// "namespaces"
-//____________________________________________________________________________________________________________
+
namespace unocontrols{
-//____________________________________________________________________________________________________________
+
// class
-//____________________________________________________________________________________________________________
+
class OMRCListenerMultiplexerHelper : public ::com::sun::star::awt::XFocusListener
, public ::com::sun::star::awt::XWindowListener
@@ -66,15 +66,15 @@ class OMRCListenerMultiplexerHelper : public ::com::sun::star::awt::XFocusListen
, public ::cppu::OWeakObject
{
-//____________________________________________________________________________________________________________
+
// public methods
-//____________________________________________________________________________________________________________
+
public:
- //________________________________________________________________________________________________________
+
// construct/destruct
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short constructor
@@ -123,9 +123,9 @@ public:
~OMRCListenerMultiplexerHelper();
- //________________________________________________________________________________________________________
+
// XInterface
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short give answer, if interface is supported
@@ -175,9 +175,9 @@ public:
virtual void SAL_CALL release() throw();
- //________________________________________________________________________________________________________
+
// operator
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -209,9 +209,9 @@ public:
OMRCListenerMultiplexerHelper& operator= ( const OMRCListenerMultiplexerHelper& aCopyInstance );
- //________________________________________________________________________________________________________
+
// container methods
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short Remove all listeners from the previous set peer and add the needed listeners to rPeer.
@@ -275,9 +275,9 @@ public:
void unadvise( const ::com::sun::star::uno::Type& aType ,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener );
- //________________________________________________________________________________________________________
+
// XEventListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -296,9 +296,9 @@ public:
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& aSource)
throw( ::com::sun::star::uno::RuntimeException ) ;
- //________________________________________________________________________________________________________
+
// XFocusListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -334,9 +334,9 @@ public:
virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException ) ;
- //________________________________________________________________________________________________________
+
// XWindowListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -406,9 +406,9 @@ public:
virtual void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException ) ;
- //________________________________________________________________________________________________________
+
// XKeyListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -444,9 +444,9 @@ public:
virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException ) ;
- //________________________________________________________________________________________________________
+
// XMouseListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -516,9 +516,9 @@ public:
virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException ) ;
- //________________________________________________________________________________________________________
+
// XMouseMotionListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -554,9 +554,9 @@ public:
virtual void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException ) ;
- //________________________________________________________________________________________________________
+
// XPaintListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -575,9 +575,9 @@ public:
virtual void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& aEvent )
throw( ::com::sun::star::uno::RuntimeException ) ;
- //________________________________________________________________________________________________________
+
// XTopWindowListener
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short -
@@ -698,9 +698,9 @@ public:
virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& aEvent )
throw( ::com::sun::star::uno::RuntimeException ) ;
-//____________________________________________________________________________________________________________
+
// protected methods
-//____________________________________________________________________________________________________________
+
protected:
@@ -738,9 +738,9 @@ protected:
void impl_unadviseFromPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xPeer ,
const ::com::sun::star::uno::Type& aType );
-//____________________________________________________________________________________________________________
+
// private variables
-//____________________________________________________________________________________________________________
+
private:
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 4659495..b355344 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -29,9 +29,9 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
-//____________________________________________________________________________________________________________
+
// namespaces
-//____________________________________________________________________________________________________________
+
using namespace ::cppu ;
using namespace ::osl ;
@@ -51,9 +51,9 @@ namespace unocontrols{
#define DEFAULT_INDESIGNMODE false
#define DEFAULT_ENABLE true
-//____________________________________________________________________________________________________________
+
// construct/destruct
-//____________________________________________________________________________________________________________
+
BaseControl::BaseControl( const Reference< XComponentContext >& rxContext )
: IMPL_MutexContainer ( )
@@ -74,9 +74,9 @@ BaseControl::~BaseControl()
{
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException )
{
@@ -96,9 +96,9 @@ Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeExce
return aReturn ;
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::acquire() throw()
{
@@ -109,9 +109,9 @@ void SAL_CALL BaseControl::acquire() throw()
OComponentHelper::acquire();
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::release() throw()
{
@@ -122,9 +122,9 @@ void SAL_CALL BaseControl::release() throw()
OComponentHelper::release();
}
-//____________________________________________________________________________________________________________
+
// XTypeProvider
-//____________________________________________________________________________________________________________
+
Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException )
{
@@ -159,9 +159,9 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException )
return pTypeCollection->getTypes();
}
-//____________________________________________________________________________________________________________
+
// XTypeProvider
-//____________________________________________________________________________________________________________
+
Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException )
{
@@ -191,9 +191,9 @@ Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeE
return pID->getImplementationId();
}
-//____________________________________________________________________________________________________________
+
// XAggregation
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException )
{
@@ -202,9 +202,9 @@ void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) t
m_xDelegator = xDel;
}
-//____________________________________________________________________________________________________________
+
// XAggregation
-//____________________________________________________________________________________________________________
+
Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException )
{
@@ -233,36 +233,36 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx
}
}
-//____________________________________________________________________________________________________________
+
// XServiceInfo
-//____________________________________________________________________________________________________________
+
OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException )
{
return impl_getStaticImplementationName();
}
-//____________________________________________________________________________________________________________
+
// XServiceInfo
-//____________________________________________________________________________________________________________
+
sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException )
{
return cppu::supportsService(this, sServiceName);
}
-//____________________________________________________________________________________________________________
+
// XServiceInfo
-//____________________________________________________________________________________________________________
+
Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException )
{
return impl_getStaticSupportedServiceNames();
}
-//____________________________________________________________________________________________________________
+
// XComponent
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::dispose() throw( RuntimeException )
{
@@ -289,9 +289,9 @@ void SAL_CALL BaseControl::dispose() throw( RuntimeException )
}
}
-//____________________________________________________________________________________________________________
+
// XComponent
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
{
@@ -300,9 +300,9 @@ void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >&
OComponentHelper::addEventListener( xListener );
}
-//____________________________________________________________________________________________________________
+
// XComponent
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
{
@@ -311,9 +311,9 @@ 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 )
@@ -374,9 +374,9 @@ void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToo
}
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException )
{
@@ -385,9 +385,9 @@ void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext )
m_xContext = xContext ;
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException )
{
@@ -396,9 +396,9 @@ void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException
m_bInDesignMode = bOn ;
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException )
{
@@ -407,9 +407,9 @@ Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeExcepti
return m_xContext ;
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException )
{
@@ -418,9 +418,9 @@ Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException
return m_xPeer ;
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException )
{
@@ -429,9 +429,9 @@ Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException )
return Reference< XView >( (OWeakObject*)this, UNO_QUERY );
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException )
{
@@ -440,18 +440,18 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException )
return m_bInDesignMode ;
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException )
{
return sal_False ;
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::setPosSize( sal_Int32 nX ,
sal_Int32 nY ,
@@ -492,9 +492,9 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX ,
}
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException )
{
@@ -511,9 +511,9 @@ void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeExcepti
}
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException )
{
@@ -530,9 +530,9 @@ void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException
}
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::setFocus() throw( RuntimeException )
{
@@ -545,9 +545,9 @@ void SAL_CALL BaseControl::setFocus() throw( RuntimeException )
}
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException )
{
@@ -556,117 +556,117 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException )
return Rectangle( m_nX, m_nY , m_nWidth, m_nHeight );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException )
{
impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
}
-//____________________________________________________________________________________________________________
+
// XView
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::draw( sal_Int32 nX ,
sal_Int32 nY ) throw( RuntimeException )
@@ -680,9 +680,9 @@ 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 )
{
@@ -702,9 +702,9 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic
return bReturn ;
}
-//____________________________________________________________________________________________________________
+
// XView
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::setZoom( float /*fZoomX*/ ,
float /*fZoomY*/ ) throw( RuntimeException )
@@ -712,9 +712,9 @@ void SAL_CALL BaseControl::setZoom( float /*fZoomX*/ ,
// Not implemented yet
}
-//____________________________________________________________________________________________________________
+
// XView
-//____________________________________________________________________________________________________________
+
Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException )
{
@@ -723,9 +723,9 @@ Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeExcepti
return m_xGraphicsView ;
}
-//____________________________________________________________________________________________________________
+
// XView
-//____________________________________________________________________________________________________________
+
Size SAL_CALL BaseControl::getSize() throw( RuntimeException )
{
@@ -734,9 +734,9 @@ Size SAL_CALL BaseControl::getSize() throw( RuntimeException )
return Size( m_nWidth, m_nHeight );
}
-//____________________________________________________________________________________________________________
+
// XEventListener
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException )
{
@@ -758,9 +758,9 @@ void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( Ru
}
}
-//____________________________________________________________________________________________________________
+
// XPaintListener
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException )
{
@@ -773,9 +773,9 @@ 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 )
{
@@ -790,9 +790,9 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run
impl_recalcLayout( aMappedEvent );
}
-//____________________________________________________________________________________________________________
+
// XWindowListener
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException )
{
@@ -807,90 +807,90 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti
impl_recalcLayout( aMappedEvent );
}
-//____________________________________________________________________________________________________________
+
// XWindowListener
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException )
{
}
-//____________________________________________________________________________________________________________
+
// XWindowListener
-//____________________________________________________________________________________________________________
+
void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException )
{
}
-//____________________________________________________________________________________________________________
+
// 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 )
{
@@ -910,9 +910,9 @@ WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindo
return pDescriptor ;
}
-//____________________________________________________________________________________________________________
+
// protected method
-//____________________________________________________________________________________________________________
+
void BaseControl::impl_paint( sal_Int32 /*nX*/ ,
sal_Int32 /*nY*/ ,
@@ -923,9 +923,9 @@ 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*/ )
{
@@ -933,18 +933,18 @@ void BaseControl::impl_recalcLayout( const WindowEvent& /*aEvent*/ )
// 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()
{
@@ -969,9 +969,9 @@ void BaseControl::impl_releasePeer()
}
}
-//____________________________________________________________________________________________________________
+
// private method
-//____________________________________________________________________________________________________________
+
OMRCListenerMultiplexerHelper* BaseControl::impl_getMultiplexer()
{
diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
index b3e4f76..48b69a5 100644
--- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
@@ -21,9 +21,9 @@
#include "OConnectionPointHelper.hxx"
-//______________________________________________________________________________________________________________
+
// namespaces
-//______________________________________________________________________________________________________________
+
using namespace ::rtl ;
using namespace ::osl ;
@@ -33,9 +33,9 @@ using namespace ::com::sun::star::lang ;
namespace unocontrols{
-//______________________________________________________________________________________________________________
+
// construct/destruct
-//______________________________________________________________________________________________________________
+
OConnectionPointContainerHelper::OConnectionPointContainerHelper( Mutex& aMutex )
: m_aSharedMutex ( aMutex )
@@ -47,9 +47,9 @@ OConnectionPointContainerHelper::~OConnectionPointContainerHelper()
{
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) throw( RuntimeException )
{
@@ -72,9 +72,9 @@ Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType
return aReturn ;
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
void SAL_CALL OConnectionPointContainerHelper::acquire() throw()
{
@@ -85,9 +85,9 @@ void SAL_CALL OConnectionPointContainerHelper::acquire() throw()
OWeakObject::acquire();
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
void SAL_CALL OConnectionPointContainerHelper::release() throw()
{
@@ -98,9 +98,9 @@ void SAL_CALL OConnectionPointContainerHelper::release() throw()
OWeakObject::release();
}
-//______________________________________________________________________________________________________________
+
// XConnectionPointContainer
-//______________________________________________________________________________________________________________
+
Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() throw( RuntimeException )
{
@@ -108,9 +108,9 @@ Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTyp
return m_aMultiTypeContainer.getContainedTypes();
}
-//______________________________________________________________________________________________________________
+
// XConnectionPointContainer
-//______________________________________________________________________________________________________________
+
Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) throw( RuntimeException )
{
@@ -131,9 +131,9 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon
return xConnectionPoint ;
}
-//______________________________________________________________________________________________________________
+
// XConnectionPointContainer
-//______________________________________________________________________________________________________________
+
void SAL_CALL OConnectionPointContainerHelper::advise( const Type& aType ,
const Reference< XInterface >& xListener ) throw( RuntimeException )
@@ -142,9 +142,9 @@ void SAL_CALL OConnectionPointContainerHelper::advise( const Type&
m_aMultiTypeContainer.addInterface( aType, xListener );
}
-//______________________________________________________________________________________________________________
+
// XConnectionPointContainer
-//______________________________________________________________________________________________________________
+
void SAL_CALL OConnectionPointContainerHelper::unadvise( const Type& aType ,
const Reference< XInterface >& xListener ) throw( RuntimeException )
@@ -153,10 +153,10 @@ void SAL_CALL OConnectionPointContainerHelper::unadvise( const Type&
m_aMultiTypeContainer.removeInterface( aType, xListener );
}
-//______________________________________________________________________________________________________________
+
// public but impl method!
// Is necessary to get container member at OConnectionPoint-instance.
-//______________________________________________________________________________________________________________
+
OMultiTypeInterfaceContainerHelper& OConnectionPointContainerHelper::impl_getMultiTypeContainer()
{
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index fb12538..b209983 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -30,9 +30,9 @@
#include <cppuhelper/typeprovider.hxx>
#include <osl/diagnose.h>
-//______________________________________________________________________________________________________________
+
// namespaces
-//______________________________________________________________________________________________________________
+
using namespace ::rtl ;
using namespace ::osl ;
@@ -46,9 +46,9 @@ using namespace ::com::sun::star::util ;
namespace unocontrols{
-//______________________________________________________________________________________________________________
+
// construct/destruct
-//______________________________________________________________________________________________________________
+
FrameControl::FrameControl( const Reference< XComponentContext >& rxContext)
: BaseControl ( rxContext )
@@ -63,9 +63,9 @@ FrameControl::~FrameControl()
{
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeException )
{
@@ -88,9 +88,9 @@ Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeExc
return aReturn ;
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
void SAL_CALL FrameControl::acquire() throw()
{
@@ -101,9 +101,9 @@ void SAL_CALL FrameControl::acquire() throw()
BaseControl::acquire();
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
void SAL_CALL FrameControl::release() throw()
{
@@ -114,9 +114,9 @@ void SAL_CALL FrameControl::release() throw()
BaseControl::release();
}
-//____________________________________________________________________________________________________________
+
// XTypeProvider
-//____________________________________________________________________________________________________________
+
Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException )
{
@@ -147,9 +147,9 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException )
return pTypeCollection->getTypes();
}
-//____________________________________________________________________________________________________________
+
// XAggregation
-//____________________________________________________________________________________________________________
+
Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeException )
{
@@ -175,9 +175,9 @@ Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeE
return aReturn ;
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToolkit ,
const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException )
@@ -192,9 +192,9 @@ void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToo
}
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException )
{
@@ -202,9 +202,9 @@ sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xM
return sal_False ;
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeException )
{
@@ -212,9 +212,9 @@ Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeExcep
return Reference< XControlModel >();
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
void SAL_CALL FrameControl::dispose() throw( RuntimeException )
{
@@ -222,9 +222,9 @@ void SAL_CALL FrameControl::dispose() throw( RuntimeException )
BaseControl::dispose();
}
-//____________________________________________________________________________________________________________
+
// XView
-//____________________________________________________________________________________________________________
+
sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException )
{
@@ -232,9 +232,9 @@ sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDe
return sal_False ;
}
-//____________________________________________________________________________________________________________
+
// XView
-//____________________________________________________________________________________________________________
+
Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeException )
{
@@ -242,9 +242,9 @@ Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeExcept
return Reference< XGraphics >();
}
-//____________________________________________________________________________________________________________
+
// XConnectionPointContainer
-//____________________________________________________________________________________________________________
+
Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException )
{
@@ -252,9 +252,9 @@ Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( Runtime
return m_aConnectionPointContainer.getConnectionPointTypes();
}
-//____________________________________________________________________________________________________________
+
// XConnectionPointContainer
-//____________________________________________________________________________________________________________
+
Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException )
{
@@ -262,9 +262,9 @@ Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const
return m_aConnectionPointContainer.queryConnectionPoint( aType );
}
-//____________________________________________________________________________________________________________
+
// XConnectionPointContainer
-//____________________________________________________________________________________________________________
+
void SAL_CALL FrameControl::advise( const Type& aType ,
const Reference< XInterface >& xListener ) throw( RuntimeException )
@@ -273,9 +273,9 @@ void SAL_CALL FrameControl::advise( const Type& aType
m_aConnectionPointContainer.advise( aType, xListener );
}
-//____________________________________________________________________________________________________________
+
// XConnectionPointContainer
-//____________________________________________________________________________________________________________
+
void SAL_CALL FrameControl::unadvise( const Type& aType ,
const Reference< XInterface >& xListener ) throw( RuntimeException )
@@ -284,9 +284,9 @@ void SAL_CALL FrameControl::unadvise( const Type& aTyp
m_aConnectionPointContainer.unadvise( aType, xListener );
}
-//____________________________________________________________________________________________________________
+
// impl but public method to register service
-//____________________________________________________________________________________________________________
+
const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
{
@@ -296,18 +296,18 @@ const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
return seqServiceNames ;
}
-//____________________________________________________________________________________________________________
+
// impl but public method to register service
-//____________________________________________________________________________________________________________
+
const OUString FrameControl::impl_getStaticImplementationName()
{
return OUString(IMPLEMENTATIONNAME_FRAMECONTROL);
}
-//____________________________________________________________________________________________________________
+
// OPropertySetHelper
-//____________________________________________________________________________________________________________
+
sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedValue ,
Any& rOldValue ,
@@ -336,9 +336,9 @@ sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedVa
return bReturn ;
}
-//____________________________________________________________________________________________________________
+
// OPropertySetHelper
-//____________________________________________________________________________________________________________
+
void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
const Any& rValue )
@@ -362,9 +362,9 @@ void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHan
}
}
-//____________________________________________________________________________________________________________
+
// OPropertySetHelper
-//____________________________________________________________________________________________________________
+
void FrameControl::getFastPropertyValue( Any& rRet ,
sal_Int32 nHandle ) const
@@ -386,9 +386,9 @@ void FrameControl::getFastPropertyValue( Any& rRet ,
}
}
-//____________________________________________________________________________________________________________
+
// OPropertySetHelper
-//____________________________________________________________________________________________________________
+
IPropertyArrayHelper& FrameControl::getInfoHelper()
{
@@ -409,9 +409,9 @@ IPropertyArrayHelper& FrameControl::getInfoHelper()
return *pInfo ;
}
-//____________________________________________________________________________________________________________
+
// OPropertySetHelper
-//____________________________________________________________________________________________________________
+
Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( RuntimeException )
{
@@ -435,9 +435,9 @@ Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw(
return ( *pInfo ) ;
}
-//____________________________________________________________________________________________________________
+
// BaseControl
-//____________________________________________________________________________________________________________
+
WindowDescriptor* FrameControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
{
@@ -452,9 +452,9 @@ WindowDescriptor* FrameControl::impl_getWindowDescriptor( const Reference< XWind
return pDescriptor ;
}
-//____________________________________________________________________________________________________________
+
// private method
-//____________________________________________________________________________________________________________
+
void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPeer ,
const OUString& rURL ,
@@ -509,9 +509,9 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee
}
}
-//____________________________________________________________________________________________________________
+
// private method
-//____________________________________________________________________________________________________________
+
void FrameControl::impl_deleteFrame()
{
@@ -536,9 +536,9 @@ void FrameControl::impl_deleteFrame()
xOldFrame->dispose();
}
-//____________________________________________________________________________________________________________
+
// private method
-//____________________________________________________________________________________________________________
+
const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
{
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 1fc1aad..5f7d423 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -38,9 +38,9 @@ using namespace ::com::sun::star::awt ;
namespace unocontrols{
-//____________________________________________________________________________________________________________
+
// construct/destruct
-//____________________________________________________________________________________________________________
+
ProgressBar::ProgressBar( const Reference< XComponentContext >& rxContext )
: BaseControl ( rxContext )
@@ -59,9 +59,9 @@ ProgressBar::~ProgressBar()
{
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeException )
{
@@ -84,9 +84,9 @@ Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeExce
return aReturn ;
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
void SAL_CALL ProgressBar::acquire() throw()
{
@@ -97,9 +97,9 @@ void SAL_CALL ProgressBar::acquire() throw()
BaseControl::acquire();
}
-//____________________________________________________________________________________________________________
+
// XInterface
-//____________________________________________________________________________________________________________
+
void SAL_CALL ProgressBar::release() throw()
{
@@ -110,9 +110,9 @@ void SAL_CALL ProgressBar::release() throw()
BaseControl::release();
}
-//____________________________________________________________________________________________________________
+
// XTypeProvider
-//____________________________________________________________________________________________________________
+
Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException )
{
@@ -142,9 +142,9 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException )
return pTypeCollection->getTypes();
}
-//____________________________________________________________________________________________________________
+
// XAggregation
-//____________________________________________________________________________________________________________
+
Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeException )
{
@@ -166,9 +166,9 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx
return aReturn ;
}
-//____________________________________________________________________________________________________________
+
// XProgressBar
-//____________________________________________________________________________________________________________
+
void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException )
{
@@ -182,9 +182,9 @@ void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( Runtime
impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
}
-//____________________________________________________________________________________________________________
+
// XProgressBar
-//____________________________________________________________________________________________________________
+
void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException )
{
@@ -198,9 +198,9 @@ void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( Runtim
impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
}
-//____________________________________________________________________________________________________________
+
// XProgressBar
-//____________________________________________________________________________________________________________
+
void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException )
{
@@ -229,9 +229,9 @@ void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException
}
}
-//____________________________________________________________________________________________________________
+
// XProgressBar
-//____________________________________________________________________________________________________________
+
void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException )
{
@@ -273,9 +273,9 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru
// Next call of "ProgressBar::setValue()" do this.
}
-//____________________________________________________________________________________________________________
+
// XProgressBar
-//____________________________________________________________________________________________________________
+
sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException )
{
@@ -285,9 +285,9 @@ sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException )
return ( m_nValue ) ;
}
-//____________________________________________________________________________________________________________
+
// XWindow
-//____________________________________________________________________________________________________________
+
void SAL_CALL ProgressBar::setPosSize (
sal_Int32 nX,
@@ -313,9 +313,9 @@ void SAL_CALL ProgressBar::setPosSize (
}
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException )
{
@@ -323,9 +323,9 @@ sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xMo
return sal_False ;
}
-//____________________________________________________________________________________________________________
+
// XControl
-//____________________________________________________________________________________________________________
+
Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeException )
{
@@ -333,27 +333,27 @@ Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeExcept
return Reference< XControlModel >();
}
-//____________________________________________________________________________________________________________
+
// impl but public method to register service
-//____________________________________________________________________________________________________________
+
const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
{
return css::uno::Sequence<OUString>();
}
-//____________________________________________________________________________________________________________
+
// impl but public method to register service
-//____________________________________________________________________________________________________________
+
const OUString ProgressBar::impl_getStaticImplementationName()
{
return OUString("stardiv.UnoControls.ProgressBar");
}
-//____________________________________________________________________________________________________________
+
// protected method
-//____________________________________________________________________________________________________________
+
void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGraphics > & rGraphics )
{
@@ -426,9 +426,9 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra
}
}
-//____________________________________________________________________________________________________________
+
// protected method
-//____________________________________________________________________________________________________________
+
void ProgressBar::impl_recalcRange ()
{
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 09cce74..de2212a 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -25,29 +25,29 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/propshlp.hxx>
-//______________________________________________________________________________________________________________
+
// namespaces
-//______________________________________________________________________________________________________________
+
namespace unocontrols{
-//______________________________________________________________________________________________________________
+
// class declaration OConnectionPointContainerHelper
-//______________________________________________________________________________________________________________
+
class OConnectionPointContainerHelper : public ::com::sun::star::lang::XConnectionPointContainer
, public ::cppu::OWeakObject
{
-//______________________________________________________________________________________________________________
+
// public methods
-//______________________________________________________________________________________________________________
+
public:
- //__________________________________________________________________________________________________________
+
// construct/destruct
- //__________________________________________________________________________________________________________
+
/**_________________________________________________________________________________________________________
@short
@@ -79,9 +79,9 @@ public:
virtual ~OConnectionPointContainerHelper();
- //________________________________________________________________________________________________________
+
// XInterface
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short give answer, if interface is supported
@@ -131,9 +131,9 @@ public:
virtual void SAL_CALL release() throw();
- //__________________________________________________________________________________________________________
+
// XConnectionPointContainer
- //__________________________________________________________________________________________________________
+
/**_________________________________________________________________________________________________________
@short
@@ -219,9 +219,9 @@ public:
::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer();
-//______________________________________________________________________________________________________________
+
// private variables
-//______________________________________________________________________________________________________________
+
private:
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index 2d10bd8..e1687b4 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -27,29 +27,29 @@
#include "OConnectionPointContainerHelper.hxx"
-//______________________________________________________________________________________________________________
+
// namespaces
-//______________________________________________________________________________________________________________
+
namespace unocontrols{
-//______________________________________________________________________________________________________________
+
// class declaration OConnectionPointHelper
-//______________________________________________________________________________________________________________
+
class OConnectionPointHelper : public ::com::sun::star::lang::XConnectionPoint
, public ::cppu::OWeakObject
{
-//______________________________________________________________________________________________________________
+
// public methods
-//______________________________________________________________________________________________________________
+
public:
- //__________________________________________________________________________________________________________
+
// construct/destruct
- //__________________________________________________________________________________________________________
+
/**_________________________________________________________________________________________________________
@short
@@ -83,9 +83,9 @@ public:
virtual ~OConnectionPointHelper();
- //________________________________________________________________________________________________________
+
// XInterface
- //________________________________________________________________________________________________________
+
/**_______________________________________________________________________________________________________
@short give answer, if interface is supported
@@ -135,9 +135,9 @@ public:
virtual void SAL_CALL release() throw();
- //__________________________________________________________________________________________________________
+
// XConnectionPoint
- //__________________________________________________________________________________________________________
+
/**_________________________________________________________________________________________________________
@short
@@ -224,9 +224,9 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getConnections()
throw( ::com::sun::star::uno::RuntimeException );
-//______________________________________________________________________________________________________________
+
// private methods
-//______________________________________________________________________________________________________________
+
private:
@@ -260,9 +260,9 @@ private:
void impl_UnlockContainer();
-//______________________________________________________________________________________________________________
+
// private variables
-//______________________________________________________________________________________________________________
+
private:
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index ed97527..b0bf03d 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -33,9 +33,9 @@
#include "basecontrol.hxx"
#include "OConnectionPointContainerHelper.hxx"
-//______________________________________________________________________________________________________________
+
// namespaces
-//______________________________________________________________________________________________________________
+
namespace unocontrols{
@@ -50,9 +50,9 @@ namespace unocontrols{
#define PROPERTYHANDLE_FRAME 1
#define PROPERTYHANDLE_LOADERARGUMENTS 2
-//______________________________________________________________________________________________________________
+
// class
-//______________________________________________________________________________________________________________
+
class FrameControl : public ::com::sun::star::awt::XControlModel
, public ::com::sun::star::lang::XConnectionPointContainer
@@ -61,23 +61,23 @@ class FrameControl : public ::com::sun::star::awt::XControlModel
, public ::cppu::OPropertySetHelper
{
-//______________________________________________________________________________________________________________
+
// public methods
-//______________________________________________________________________________________________________________
+
public:
- //__________________________________________________________________________________________________________
+
// construct/destruct
- //__________________________________________________________________________________________________________
+
FrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~FrameControl();
- //__________________________________________________________________________________________________________
+
// XInterface
- //__________________________________________________________________________________________________________
+
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type& aType
@@ -115,24 +115,24 @@ public:
virtual void SAL_CALL release() throw();
- //__________________________________________________________________________________________________________
+
// XTypeProvider
- //__________________________________________________________________________________________________________
+
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
throw( ::com::sun::star::uno::RuntimeException );
- //__________________________________________________________________________________________________________
+
// XAggregation
- //__________________________________________________________________________________________________________
+
::com::sun::star::uno::Any SAL_CALL queryAggregation(
const ::com::sun::star::uno::Type& aType
) throw( ::com::sun::star::uno::RuntimeException );
- //__________________________________________________________________________________________________________
+
// XControl
- //__________________________________________________________________________________________________________
+
virtual void SAL_CALL createPeer(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit ,
@@ -146,15 +146,15 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
throw( ::com::sun::star::uno::RuntimeException );
- //__________________________________________________________________________________________________________
+
// XComponent
- //__________________________________________________________________________________________________________
+
virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
- //__________________________________________________________________________________________________________
+
// XView
- //__________________________________________________________________________________________________________
+
virtual sal_Bool SAL_CALL setGraphics(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xDevice
@@ -163,9 +163,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics()
throw( ::com::sun::star::uno::RuntimeException );
- //__________________________________________________________________________________________________________
+
// XConnectionPointContainer
- //__________________________________________________________________________________________________________
+
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes()
throw( ::com::sun::star::uno::RuntimeException );
@@ -184,23 +184,23 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener
) throw( ::com::sun::star::uno::RuntimeException );
- //__________________________________________________________________________________________________________
+
// impl but public methods to register service!
- //__________________________________________________________________________________________________________
+
static const ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
static const OUString impl_getStaticImplementationName();
-//______________________________________________________________________________________________________________
+
// protected methods
-//______________________________________________________________________________________________________________
+
protected:
using OPropertySetHelper::getFastPropertyValue;
- //__________________________________________________________________________________________________________
+
// OPropertySetHelper
- //__________________________________________________________________________________________________________
+
virtual sal_Bool SAL_CALL convertFastPropertyValue(
::com::sun::star::uno::Any& rConvertedValue ,
@@ -219,24 +219,24 @@ protected:
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
- //__________________________________________________________________________________________________________
+
// XPropertySet
- //__________________________________________________________________________________________________________
+
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
throw( ::com::sun::star::uno::RuntimeException );
- //__________________________________________________________________________________________________________
+
// BaseControl
- //__________________________________________________________________________________________________________
+
virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer
);
-//______________________________________________________________________________________________________________
+
// private methods
-//______________________________________________________________________________________________________________
+
private:
@@ -249,9 +249,9 @@ private:
static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
-//______________________________________________________________________________________________________________
+
// private variables
-//______________________________________________________________________________________________________________
+
private:
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index c901429..cbe8a7e 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -25,9 +25,9 @@
#include "basecontrol.hxx"
-//____________________________________________________________________________________________________________
+
// namespaces
-//____________________________________________________________________________________________________________
+
namespace unocontrols{
@@ -48,15 +48,15 @@ class ProgressBar : public ::com::sun::star::awt::XControlModel
, public BaseControl
{
-//____________________________________________________________________________________________________________
+
// public methods
-//____________________________________________________________________________________________________________
+
public:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list