[Libreoffice-commits] core.git: UnoControls/inc UnoControls/source
Tor Lillqvist
tml at collabora.com
Tue Mar 13 07:07:31 UTC 2018
UnoControls/inc/basecontainercontrol.hxx | 18 -
UnoControls/inc/basecontrol.hxx | 24 -
UnoControls/inc/multiplexer.hxx | 34 --
UnoControls/source/base/basecontainercontrol.cxx | 2
UnoControls/source/base/basecontrol.cxx | 2
UnoControls/source/base/multiplexer.cxx | 2
UnoControls/source/controls/OConnectionPointContainerHelper.cxx | 2
UnoControls/source/controls/OConnectionPointHelper.cxx | 2
UnoControls/source/controls/framecontrol.cxx | 2
UnoControls/source/controls/progressbar.cxx | 2
UnoControls/source/controls/progressmonitor.cxx | 2
UnoControls/source/controls/statusindicator.cxx | 2
UnoControls/source/inc/OConnectionPointContainerHelper.hxx | 21 -
UnoControls/source/inc/OConnectionPointHelper.hxx | 20 -
UnoControls/source/inc/framecontrol.hxx | 27 -
UnoControls/source/inc/progressbar.hxx | 15
UnoControls/source/inc/progressmonitor.hxx | 25 -
UnoControls/source/inc/statusindicator.hxx | 168 ++++------
18 files changed, 147 insertions(+), 223 deletions(-)
New commits:
commit b0259d3e857bef53b27c3f61ecc448c3f96aad07
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 12 22:02:43 2018 +0200
Sorry, could not resist: Drive-by cosmetic changes
Remove noise comments, ASCII graphics, and superfluous whitespace.
Change-Id: Icca0995082ce8afad1e770a263fdef00bfc33449
Reviewed-on: https://gerrit.libreoffice.org/51168
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
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
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index ee3a4789e30a..499bf34e6bd9 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::container;
-namespace unocontrols{
+namespace unocontrols {
// construct/destruct
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 517ddb67586f..03f49f978202 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::awt;
-namespace unocontrols{
+namespace unocontrols {
#define DEFAULT_X 0
#define DEFAULT_Y 0
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 681eab9ac7ce..9b9e93a96e5b 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
-namespace unocontrols{
+namespace unocontrols {
// macros
diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
index b58eb9548f6a..9146d66e87d4 100644
--- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
@@ -30,7 +30,7 @@ using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-namespace unocontrols{
+namespace unocontrols {
// construct/destruct
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
index f6814b9e9e4c..a7f18ea2973b 100644
--- a/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -31,7 +31,7 @@ using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-namespace unocontrols{
+namespace unocontrols {
// construct/destruct
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 6f3617825978..4c0a2f84864a 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::util;
-namespace unocontrols{
+namespace unocontrols {
enum PropertyHandle // values represent index in PropertyArray
{ // for FrameControl
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 898c4032ebaf..d18ae7bd7c57 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::awt;
-namespace unocontrols{
+namespace unocontrols {
// construct/destruct
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index d7296e871639..4d513ee26b2f 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::awt;
using ::std::vector;
using ::std::find;
-namespace unocontrols{
+namespace unocontrols {
ProgressMonitor::ProgressMonitor( const css::uno::Reference< XComponentContext >& rxContext )
: BaseContainerControl ( rxContext )
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index e678a2ff9ad2..651f55becc0b 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::task;
-namespace unocontrols{
+namespace unocontrols {
// construct/destruct
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index abc4191e7bde..316a8368ca3d 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -25,25 +25,19 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/propshlp.hxx>
-// namespaces
-
-namespace unocontrols{
-
-// class declaration OConnectionPointContainerHelper
+namespace unocontrols {
class OConnectionPointContainerHelper : public css::lang::XConnectionPointContainer
, public ::cppu::OWeakObject
{
-
public:
-
OConnectionPointContainerHelper( ::osl::Mutex& aMutex );
virtual ~OConnectionPointContainerHelper() override;
// XInterface
- /**_______________________________________________________________________________________________________
+ /**
@short give answer, if interface is supported
@descr The interfaces are searched by type.
@@ -58,7 +52,7 @@ public:
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- /**_______________________________________________________________________________________________________
+ /**
@short increment refcount
@seealso XInterface
@seealso release()
@@ -67,7 +61,7 @@ public:
virtual void SAL_CALL acquire() throw() override;
- /**_______________________________________________________________________________________________________
+ /**
@short decrement refcount
@seealso XInterface
@seealso acquire()
@@ -100,15 +94,12 @@ public:
// "Parent" function must do this.
::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer() { return m_aMultiTypeContainer; }
-
private:
-
::osl::Mutex& m_aSharedMutex;
::cppu::OMultiTypeInterfaceContainerHelper m_aMultiTypeContainer; // Container to hold listener
+};
-}; // class OConnectionPointContainerHelper
-
-} // namespace unocontrols
+}
#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_OCONNECTIONPOINTCONTAINERHELPER_HXX
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index 77a788651b77..cf87833b29ca 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -28,18 +28,12 @@
#include "OConnectionPointContainerHelper.hxx"
-// namespaces
-
-namespace unocontrols{
-
-// class declaration OConnectionPointHelper
+namespace unocontrols {
class OConnectionPointHelper : public css::lang::XConnectionPoint
, public ::cppu::OWeakObject
{
-
public:
-
OConnectionPointHelper( ::osl::Mutex& aMutex ,
OConnectionPointContainerHelper* pContainerImplementation ,
css::uno::Type const & aType );
@@ -48,7 +42,7 @@ public:
// XInterface
- /**_______________________________________________________________________________________________________
+ /**
@short give answer, if interface is supported
@descr The interfaces are searched by type.
@@ -63,7 +57,7 @@ public:
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- /**_______________________________________________________________________________________________________
+ /**
@short increment refcount
@seealso XInterface
@seealso release()
@@ -72,7 +66,7 @@ public:
virtual void SAL_CALL acquire() throw() override;
- /**_______________________________________________________________________________________________________
+ /**
@short decrement refcount
@seealso XInterface
@seealso acquire()
@@ -96,7 +90,6 @@ public:
virtual css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > SAL_CALL getConnections() override;
private:
-
bool impl_LockContainer();
void impl_UnlockContainer();
@@ -109,10 +102,9 @@ private:
OConnectionPointContainerHelper* m_pContainerImplementation;
css::uno::Type m_aInterfaceType;
css::uno::Reference< css::uno::XInterface > m_xLock;
+};
-}; // class OConnectionPointHelper
-
-} // namespace unocontrols
+}
#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_OCONNECTIONPOINTHELPER_HXX
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index 204d04d94e9b..90d3bec494fb 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -30,11 +30,7 @@
#include <basecontrol.hxx>
#include "OConnectionPointContainerHelper.hxx"
-// namespaces
-
-namespace unocontrols{
-
-// class
+namespace unocontrols {
class FrameControl : public css::awt::XControlModel
, public css::lang::XConnectionPointContainer
@@ -42,13 +38,8 @@ class FrameControl : public css::awt::XControlModel
, public ::cppu::OBroadcastHelper
, public ::cppu::OPropertySetHelper
{
-
-// public methods
-
public:
- // construct/destruct
-
FrameControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~FrameControl() override;
@@ -59,7 +50,7 @@ public:
const css::uno::Type& aType
) override;
- /**_______________________________________________________________________________________________________
+ /**
@short increment refcount
@seealso XInterface
@seealso release()
@@ -68,7 +59,7 @@ public:
virtual void SAL_CALL acquire() throw() override;
- /**_______________________________________________________________________________________________________
+ /**
@short decrement refcount
@seealso XInterface
@seealso acquire()
@@ -140,8 +131,6 @@ public:
static const OUString impl_getStaticImplementationName();
-// protected methods
-
protected:
using OPropertySetHelper::getFastPropertyValue;
@@ -174,8 +163,6 @@ protected:
const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer
) override;
-// private methods
-
private:
void impl_createFrame( const css::uno::Reference< css::awt::XWindowPeer >& xPeer ,
@@ -184,18 +171,14 @@ private:
void impl_deleteFrame();
-// private variables
-
-private:
-
css::uno::Reference< css::frame::XFrame2 > m_xFrame;
OUString m_sComponentURL;
css::uno::Sequence< css::beans::PropertyValue > m_seqLoaderArguments;
rtl::Reference<OConnectionPointContainerHelper> m_aConnectionPointContainer;
-}; // class FrameControl
+};
-} // namespace unocontrols
+}
#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_FRAMECONTROL_HXX
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index f162f423a58c..99a5bb340efb 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -28,9 +28,7 @@
#include <basecontrol.hxx>
-// namespaces
-
-namespace unocontrols{
+namespace unocontrols {
#define PROGRESSBAR_FREESPACE 4
#define PROGRESSBAR_DEFAULT_HORIZONTAL true
@@ -48,7 +46,6 @@ class ProgressBar : public css::awt::XControlModel
, public css::awt::XProgressBar
, public BaseControl
{
-
public:
ProgressBar( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
@@ -59,7 +56,7 @@ public:
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- /**_______________________________________________________________________________________________________
+ /**
@short increment refcount
@seealso XInterface
@seealso release()
@@ -68,7 +65,7 @@ public:
virtual void SAL_CALL acquire() throw() override;
- /**_______________________________________________________________________________________________________
+ /**
@short decrement refcount
@seealso XInterface
@seealso acquire()
@@ -125,7 +122,6 @@ public:
static const OUString impl_getStaticImplementationName();
protected:
-
virtual void impl_paint(
sal_Int32 nX ,
sal_Int32 nY ,
@@ -135,7 +131,6 @@ protected:
void impl_recalcRange();
private:
-
bool m_bHorizontal; // orientation for steps [true=horizontal/false=vertical]
css::awt::Size m_aBlockSize; // width and height of a block [>=0,0]
Color m_nForegroundColor; // (alpha,r,g,b)
@@ -145,9 +140,9 @@ private:
double m_nBlockValue; // value for one block [long, >0]
sal_Int32 m_nValue; // value for progress [long]
-}; // class ProgressBar
+};
-} // namespace unocontrols
+}
#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_PROGRESSBAR_HXX
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 1e6827f4c272..5ab211eaa0ef 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -63,7 +63,7 @@
#include <basecontainercontrol.hxx>
-namespace unocontrols{
+namespace unocontrols {
class ProgressBar;
@@ -83,8 +83,6 @@ class ProgressBar;
#define PROGRESSMONITOR_DEFAULT_WIDTH 350
#define PROGRESSMONITOR_DEFAULT_HEIGHT 100
-// structs, types
-
/// Item of TextList
struct IMPL_TextlistItem
{
@@ -92,23 +90,19 @@ struct IMPL_TextlistItem
OUString sText; /// Right site of textline in dialog
};
-// class declaration
-
class ProgressMonitor : public css::awt::XLayoutConstrains
, public css::awt::XButton
, public css::awt::XProgressMonitor
, public BaseContainerControl
{
-
public:
-
ProgressMonitor( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~ProgressMonitor() override;
// XInterface
- /**_______________________________________________________________________________________________________
+ /**
@short give answer, if interface is supported
@descr The interfaces are searched by type.
@@ -123,7 +117,7 @@ public:
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- /**_______________________________________________________________________________________________________
+ /**
@short increment refcount
@seealso XInterface
@seealso release()
@@ -132,7 +126,7 @@ public:
virtual void SAL_CALL acquire() throw() override;
- /**_______________________________________________________________________________________________________
+ /**
@short decrement refcount
@seealso XInterface
@seealso acquire()
@@ -143,7 +137,7 @@ public:
// XTypeProvider
- /**_______________________________________________________________________________________________________
+ /**
@short get information about supported interfaces
@seealso XTypeProvider
@return Sequence of types of all supported interfaces
@@ -159,7 +153,7 @@ public:
// XProgressMonitor
- /**_______________________________________________________________________________________________________
+ /**
@short add topic to dialog
@descr Add a topic with a text in right textlist (used for FixedText-member).<BR>
( "beforeProgress" fix the right list ). The dialog metric is recalculated.
@@ -258,7 +252,6 @@ public:
static const OUString impl_getStaticImplementationName();
protected:
-
virtual void impl_paint( sal_Int32 nX ,
sal_Int32 nY ,
const css::uno::Reference< css::awt::XGraphics >& xGraphics ) override;
@@ -277,7 +270,6 @@ private:
// debug methods
private:
-
static bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText ); // addText, updateText
static bool impl_debug_checkParameter( const OUString& rTopic ); // removeText
@@ -295,10 +287,9 @@ private:
rtl::Reference<ProgressBar> m_xProgressBar;
css::uno::Reference< css::awt::XButton > m_xButton;
css::awt::Rectangle m_a3DLine;
+};
-}; // class ProgressMonitor
-
-} // namespace unocontrols
+}
#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_PROGRESSMONITOR_HXX
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index a18c98e6f257..9c5019d8862e 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -33,7 +33,7 @@
#include <basecontainercontrol.hxx>
-namespace unocontrols{
+namespace unocontrols {
class ProgressBar;
@@ -48,146 +48,138 @@ class ProgressBar;
#define STATUSINDICATOR_DEFAULT_WIDTH 300
#define STATUSINDICATOR_DEFAULT_HEIGHT 25
-// structs, types
-
-// class declaration
-
class StatusIndicator : public css::awt::XLayoutConstrains
, public css::task::XStatusIndicator
, public BaseContainerControl
{
+public:
+ StatusIndicator( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
- public:
-
- StatusIndicator( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
+ virtual ~StatusIndicator() override;
- virtual ~StatusIndicator() override;
+ // XInterface
- // XInterface
+ /**
+ @short give answer, if interface is supported
+ @descr The interfaces are searched by type.
- /**_______________________________________________________________________________________________________
- @short give answer, if interface is supported
- @descr The interfaces are searched by type.
+ @seealso XInterface
- @seealso XInterface
+ @param "rType" is the type of searched interface.
- @param "rType" is the type of searched interface.
+ @return Any information about found interface
- @return Any information about found interface
+ @onerror A RuntimeException is thrown.
+ */
- @onerror A RuntimeException is thrown.
- */
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
+ /**
+ @short increment refcount
+ @seealso XInterface
+ @seealso release()
+ @onerror A RuntimeException is thrown.
+ */
- /**_______________________________________________________________________________________________________
- @short increment refcount
- @seealso XInterface
- @seealso release()
- @onerror A RuntimeException is thrown.
- */
+ virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL acquire() throw() override;
+ /**
+ @short decrement refcount
+ @seealso XInterface
+ @seealso acquire()
+ @onerror A RuntimeException is thrown.
+ */
- /**_______________________________________________________________________________________________________
- @short decrement refcount
- @seealso XInterface
- @seealso acquire()
- @onerror A RuntimeException is thrown.
- */
+ virtual void SAL_CALL release() throw() override;
- virtual void SAL_CALL release() throw() override;
+ // XTypeProvider
- // XTypeProvider
+ /**
+ @short get information about supported interfaces
+ @seealso XTypeProvider
+ @return Sequence of types of all supported interfaces
- /**_______________________________________________________________________________________________________
- @short get information about supported interfaces
- @seealso XTypeProvider
- @return Sequence of types of all supported interfaces
+ @onerror A RuntimeException is thrown.
+ */
- @onerror A RuntimeException is thrown.
- */
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+ // XAggregation
- // XAggregation
+ virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
- virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
+ // XStatusIndicator
- // XStatusIndicator
+ virtual void SAL_CALL start(
+ const OUString& sText ,
+ sal_Int32 nRange
+ ) override;
- virtual void SAL_CALL start(
- const OUString& sText ,
- sal_Int32 nRange
- ) override;
+ virtual void SAL_CALL end() override;
- virtual void SAL_CALL end() override;
+ virtual void SAL_CALL reset() override;
- virtual void SAL_CALL reset() override;
+ virtual void SAL_CALL setText( const OUString& sText ) override;
- virtual void SAL_CALL setText( const OUString& sText ) override;
+ virtual void SAL_CALL setValue( sal_Int32 nValue ) override;
- virtual void SAL_CALL setValue( sal_Int32 nValue ) override;
+ // XLayoutConstrains
- // XLayoutConstrains
+ virtual css::awt::Size SAL_CALL getMinimumSize() override;
- virtual css::awt::Size SAL_CALL getMinimumSize() override;
+ virtual css::awt::Size SAL_CALL getPreferredSize() override;
- virtual css::awt::Size SAL_CALL getPreferredSize() override;
+ virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
- virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
+ // XControl
- // XControl
+ virtual void SAL_CALL createPeer(
+ const css::uno::Reference< css::awt::XToolkit >& xToolkit ,
+ const css::uno::Reference< css::awt::XWindowPeer >& xParent
+ ) override;
- virtual void SAL_CALL createPeer(
- const css::uno::Reference< css::awt::XToolkit >& xToolkit ,
- const css::uno::Reference< css::awt::XWindowPeer >& xParent
- ) override;
+ virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) override;
- virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) override;
+ virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override;
- virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override;
+ // XComponent
- // XComponent
+ virtual void SAL_CALL dispose() override;
- virtual void SAL_CALL dispose() override;
+ // XWindow
- // XWindow
+ virtual void SAL_CALL setPosSize( sal_Int32 nX ,
+ sal_Int32 nY ,
+ sal_Int32 nWidth ,
+ sal_Int32 nHeight ,
+ sal_Int16 nFlags ) override;
- virtual void SAL_CALL setPosSize( sal_Int32 nX ,
- sal_Int32 nY ,
- sal_Int32 nWidth ,
- sal_Int32 nHeight ,
- sal_Int16 nFlags ) override;
+ // BaseControl
- // BaseControl
+ static const css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
- static const css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
-
- static const OUString impl_getStaticImplementationName();
+ static const OUString impl_getStaticImplementationName();
protected:
+ virtual css::awt::WindowDescriptor* impl_getWindowDescriptor(
+ const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer
+ ) override;
- virtual css::awt::WindowDescriptor* impl_getWindowDescriptor(
- const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer
- ) override;
-
- virtual void impl_paint (
- sal_Int32 nX,
- sal_Int32 nY,
- const css::uno::Reference< css::awt::XGraphics > & rGraphics
- ) override;
+ virtual void impl_paint (
+ sal_Int32 nX,
+ sal_Int32 nY,
+ const css::uno::Reference< css::awt::XGraphics > & rGraphics
+ ) override;
- virtual void impl_recalcLayout( const css::awt::WindowEvent& aEvent ) override;
+ virtual void impl_recalcLayout( const css::awt::WindowEvent& aEvent ) override;
private:
-
css::uno::Reference< css::awt::XFixedText > m_xText;
rtl::Reference<ProgressBar> m_xProgressBar;
-}; // class StatusIndicator
+};
-} // namespace unocontrols
+}
#endif // INCLUDED_UNOCONTROLS_SOURCE_INC_STATUSINDICATOR_HXX
More information about the Libreoffice-commits
mailing list