summaryrefslogtreecommitdiff
path: root/UnoControls/inc
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 22:41:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-26 06:02:19 -0600
commitb06820d74c701e305f007d4cb91f939e5644d11d (patch)
tree524624ec71e6fdaa8e87c83c9f5ff3f9352399a4 /UnoControls/inc
parentfaabee67550fb8eaebe5f58e224508de81d2c641 (diff)
Remove visual noise from UnoControls
Change-Id: I0ffbc08cf769e39e8c3b7519e8d2e13ccbe6e3d8 Reviewed-on: https://gerrit.libreoffice.org/8331 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'UnoControls/inc')
-rw-r--r--UnoControls/inc/basecontainercontrol.hxx64
-rw-r--r--UnoControls/inc/basecontrol.hxx80
-rw-r--r--UnoControls/inc/multiplexer.hxx68
3 files changed, 106 insertions, 106 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index a6a0906bdb08..11650824a878 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 be90e9d0f32c..68c47e69f471 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 9d1fdba51e63..d712bef8e0cb 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: