summaryrefslogtreecommitdiff
path: root/UnoControls/inc
diff options
context:
space:
mode:
Diffstat (limited to 'UnoControls/inc')
-rw-r--r--UnoControls/inc/basecontainercontrol.hxx18
-rw-r--r--UnoControls/inc/basecontrol.hxx24
-rw-r--r--UnoControls/inc/multiplexer.hxx34
3 files changed, 28 insertions, 48 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index 55a8f940d7c4..b986a58eda98 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -34,11 +34,7 @@
#include "basecontrol.hxx"
-// "namespaces"
-
-namespace unocontrols{
-
-// structs, types, forwards
+namespace unocontrols {
struct IMPL_ControlInfo
{
@@ -50,16 +46,15 @@ class BaseContainerControl : public css::awt::XControlModel
, public css::awt::XControlContainer
, public BaseControl
{
-
public:
- BaseContainerControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
+ BaseContainerControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~BaseContainerControl() override;
// XInterface
- /**_______________________________________________________________________________________________________
+ /**
@short give answer, if interface is supported
@descr The interfaces are searched by type.
@@ -78,7 +73,7 @@ public:
// XTypeProvider
- /**_______________________________________________________________________________________________________
+ /**
@short get information about supported interfaces
@seealso XTypeProvider
@return Sequence of types of all supported interfaces
@@ -155,7 +150,6 @@ protected:
) override;
private:
-
void impl_activateTabControllers();
void impl_cleanMemory();
@@ -168,9 +162,9 @@ private:
::cppu::OMultiTypeInterfaceContainerHelper m_aListeners;
-}; // class BaseContainerControl
+};
-} // namespace unocontrols
+}
#endif // INCLUDED_UNOCONTROLS_INC_BASECONTAINERCONTROL_HXX
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 3b218e09142e..b3451ab91734 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -93,11 +93,7 @@ namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
} } } }
-// "namespaces"
-
-namespace unocontrols{
-
-// structs
+namespace unocontrols {
struct IMPL_MutexContainer
{
@@ -114,16 +110,14 @@ class BaseControl : public css::lang::XServiceInfo
, public IMPL_MutexContainer
, public ::cppu::OComponentHelper
{
-
public:
-
BaseControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~BaseControl() override;
// XInterface
- /**_______________________________________________________________________________________________________
+ /**
@short give answer, if interface is supported
@descr The interfaces are searched by type.
@@ -140,7 +134,7 @@ public:
const css::uno::Type& aType
) override;
- /**_______________________________________________________________________________________________________
+ /**
@short increment refcount
@seealso XInterface
@seealso release()
@@ -149,7 +143,7 @@ public:
virtual void SAL_CALL acquire() throw() override;
- /**_______________________________________________________________________________________________________
+ /**
@short decrement refcount
@seealso XInterface
@seealso acquire()
@@ -160,7 +154,7 @@ public:
// XTypeProvider
- /**_______________________________________________________________________________________________________
+ /**
@short get information about supported interfaces
@seealso XTypeProvider
@return Sequence of types of all supported interfaces
@@ -170,7 +164,7 @@ public:
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
- /**_______________________________________________________________________________________________________
+ /**
@short get implementation id
@descr This ID is necessary for UNO-caching. If there no ID, cache is disabled.
Another way, cache is enabled.
@@ -368,7 +362,6 @@ protected:
const css::uno::Reference< css::uno::XInterface >& impl_getDelegator() const { return m_xDelegator;}
private:
-
OMRCListenerMultiplexerHelper* impl_getMultiplexer();
css::uno::Reference< css::uno::XComponentContext > m_xComponentContext;
@@ -386,10 +379,9 @@ private:
bool m_bVisible; // Some state flags
bool m_bInDesignMode;
bool m_bEnable;
+};
-}; // class BaseControl
-
-} // namespace unocontrols
+}
#endif // INCLUDED_UNOCONTROLS_INC_BASECONTROL_HXX
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index 6229b5a5b17e..f36ba3a3d6cb 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -47,11 +47,7 @@
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-// "namespaces"
-
-namespace unocontrols{
-
-// class
+namespace unocontrols {
class OMRCListenerMultiplexerHelper : public css::awt::XFocusListener
, public css::awt::XWindowListener
@@ -62,10 +58,9 @@ class OMRCListenerMultiplexerHelper : public css::awt::XFocusListener
, public css::awt::XTopWindowListener
, public ::cppu::OWeakObject
{
-
public:
- /**_______________________________________________________________________________________________________
+ /**
@short constructor
@descr Create a Multiplexer of XWindowEvents.
@param rControl The control. All listeners think that this is the original broadcaster.
@@ -75,7 +70,7 @@ public:
OMRCListenerMultiplexerHelper( const css::uno::Reference< css::awt::XWindow >& xControl ,
const css::uno::Reference< css::awt::XWindow >& xPeer );
- /**_______________________________________________________________________________________________________
+ /**
@short copy-constructor
@descr
@param rCopyInstance C++-Reference to instance to make copy from.
@@ -87,7 +82,7 @@ public:
// XInterface
- /**_______________________________________________________________________________________________________
+ /**
@short give answer, if interface is supported
@descr The interfaces are searched by type.
@@ -102,7 +97,7 @@ public:
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- /**_______________________________________________________________________________________________________
+ /**
@short increment refcount
@seealso XInterface
@seealso release()
@@ -111,7 +106,7 @@ public:
virtual void SAL_CALL acquire() throw() override;
- /**_______________________________________________________________________________________________________
+ /**
@short decrement refcount
@seealso XInterface
@seealso acquire()
@@ -124,27 +119,27 @@ public:
// container methods
- /**_______________________________________________________________________________________________________
+ /**
@short Remove all listeners from the previous set peer and add the needed listeners to rPeer.
@param rPeer The peer from which the original events are dispatched. Null is allowed.
*/
void setPeer( const css::uno::Reference< css::awt::XWindow >& xPeer );
- /**_______________________________________________________________________________________________________
+ /**
@short Remove all listeners and send a disposing message.
*/
void disposeAndClear();
- /**_______________________________________________________________________________________________________
+ /**
@short Add the specified listener to the source.
*/
void advise( const css::uno::Type& aType ,
const css::uno::Reference< css::uno::XInterface >& xListener );
- /**_______________________________________________________________________________________________________
+ /**
@short Remove the specified listener from the source.
*/
@@ -217,7 +212,7 @@ public:
protected:
- /**_______________________________________________________________________________________________________
+ /**
@short Remove the listener from the peer.
@param xPeer The peer from which the listener is removed.
@param rType The listener type, which specify the type of the listener.
@@ -226,7 +221,7 @@ protected:
void impl_adviseToPeer( const css::uno::Reference< css::awt::XWindow >& xPeer ,
const css::uno::Type& aType );
- /**_______________________________________________________________________________________________________
+ /**
@short Add the listener to the peer.
@param xPeer The peer to which the listener is added.
@param rType The listener type, which specify the type of the listener.
@@ -238,15 +233,14 @@ protected:
// private variables
private:
-
::osl::Mutex m_aMutex;
css::uno::Reference< css::awt::XWindow > m_xPeer; /// The source of the events. Normally this is the peer object.
css::uno::WeakReference< css::awt::XWindow > m_xControl;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerHolder;
-}; // class OMRCListenerMultiplexerHelper
+};
-} // namespace unocontrols
+}
#endif // INCLUDED_UNOCONTROLS_INC_MULTIPLEXER_HXX