Macro Cleanup in UNO land.

1 files changed, 87 insertions, 87 deletions

diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index d09523191..db16f3c27 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -83,25 +83,9 @@
 
 namespace unocontrols{
 
-#define	UNO3_ANY										::com::sun::star::uno::Any
-#define	UNO3_OUSTRING									::rtl::OUString
-#define	UNO3_RECTANGLE									::com::sun::star::awt::Rectangle
-#define	UNO3_REFERENCE									::com::sun::star::uno::Reference
-#define	UNO3_RUNTIMEEXCEPTION							::com::sun::star::uno::RuntimeException
-#define	UNO3_SEQUENCE									::com::sun::star::uno::Sequence
-#define	UNO3_SIZE										::com::sun::star::awt::Size
-#define	UNO3_TYPE										::com::sun::star::uno::Type
-#define	UNO3_XACTIONLISTENER							::com::sun::star::awt::XActionListener
-#define	UNO3_XBUTTON									::com::sun::star::awt::XButton
-#define	UNO3_XCONTROLMODEL								::com::sun::star::awt::XControlModel
-#define	UNO3_XFIXEDTEXT									::com::sun::star::awt::XFixedText
-#define	UNO3_XGRAPHICS									::com::sun::star::awt::XGraphics
-#define	UNO3_XLAYOUTCONSTRAINS							::com::sun::star::awt::XLayoutConstrains
-#define	UNO3_XMULTISERVICEFACTORY						::com::sun::star::lang::XMultiServiceFactory
-#define	UNO3_XPROGRESSBAR								::com::sun::star::awt::XProgressBar
-#define	UNO3_XPROGRESSMONITOR							::com::sun::star::awt::XProgressMonitor
-#define	UNO3_XTOOLKIT									::com::sun::star::awt::XToolkit
-#define	UNO3_XWINDOWPEER								::com::sun::star::awt::XWindowPeer
+#define CSS_UNO     ::com::sun::star::uno
+#define CSS_AWT     ::com::sun::star::awt
+#define CSS_LANG    ::com::sun::star::lang
 
 //____________________________________________________________________________________________________________
 //	defines
@@ -109,9 +93,7 @@ namespace unocontrols{
 
 #define	SERVICENAME_PROGRESSMONITOR						"com.sun.star.awt.XProgressMonitor"
 #define	IMPLEMENTATIONNAME_PROGRESSMONITOR				"stardiv.UnoControls.ProgressMonitor"
-#define FREEBORDER										10														// border around and between the controls
-#define WIDTH_RELATION									4														// reserve 1/4 for button width and rest for progressbar width
-#define HEIGHT_RELATION									5														// reserve 1/5 for button and progressbar heigth and rest for text height
+#define PROGRESSMONITOR_FREEBORDER                      10														// border around and between the controls
 #define FIXEDTEXT_SERVICENAME							"com.sun.star.awt.UnoControlFixedText"
 #define BUTTON_SERVICENAME								"com.sun.star.awt.UnoControlButton"
 #define	FIXEDTEXT_MODELNAME								"com.sun.star.awt.UnoControlFixedTextModel"
@@ -120,17 +102,13 @@ namespace unocontrols{
 #define	CONTROLNAME_BUTTON								"Button"												//  			-||-
 #define	CONTROLNAME_PROGRESSBAR							"ProgressBar"											//  			-||-
 #define	DEFAULT_BUTTONLABEL								"Abbrechen"
-#define	DEFAULT_TOPIC									"\0"
-#define	DEFAULT_TEXT									"\0"
-#define	BACKGROUNDCOLOR									TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )				// lighgray
-#define	LINECOLOR_BRIGHT								TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )				// white
-#define	LINECOLOR_SHADOW								TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )				// black
-#define	HEIGHT_PROGRESSBAR								15
-// Overwrite defines from basecontrol.hxx!!!
-#undef	DEFAULT_WIDTH
-#undef	DEFAULT_HEIGHT
-#define DEFAULT_WIDTH 									350
-#define DEFAULT_HEIGHT									100
+#define	PROGRESSMONITOR_DEFAULT_TOPIC                   "\0"
+#define	PROGRESSMONITOR_DEFAULT_TEXT                    "\0"
+#define	PROGRESSMONITOR_BACKGROUNDCOLOR					TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )				// lighgray
+#define	PROGRESSMONITOR_LINECOLOR_BRIGHT                TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )				// white
+#define	PROGRESSMONITOR_LINECOLOR_SHADOW                TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )				// black
+#define PROGRESSMONITOR_DEFAULT_WIDTH                   350
+#define PROGRESSMONITOR_DEFAULT_HEIGHT                  100
 
 //____________________________________________________________________________________________________________
 //	structs, types
@@ -139,8 +117,8 @@ namespace unocontrols{
 ///	Item of TextList
 struct IMPL_TextlistItem
 {
-    UNO3_OUSTRING	sTopic	;	/// Left site of textline in dialog
-    UNO3_OUSTRING	sText	;	/// Right site of textline in dialog
+    ::rtl::OUString	sTopic	;	/// Left site of textline in dialog
+    ::rtl::OUString	sText	;	/// Right site of textline in dialog
 };
 
 /// Define a list-class for struct IMPL_TextlistItem
@@ -151,9 +129,9 @@ DECLARE_LIST( IMPL_Textlist, IMPL_TextlistItem* )
 //	class declaration
 //____________________________________________________________________________________________________________
 
-class ProgressMonitor	: public UNO3_XLAYOUTCONSTRAINS
-                        , public UNO3_XBUTTON
-                        , public UNO3_XPROGRESSMONITOR
+class ProgressMonitor	: public CSS_AWT::XLayoutConstrains
+                        , public CSS_AWT::XButton
+                        , public CSS_AWT::XProgressMonitor
                         , public BaseContainerControl
 {
 
@@ -180,7 +158,7 @@ public:
         @onerror
     */
 
-    ProgressMonitor( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+    ProgressMonitor( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
 
     /**_______________________________________________________________________________________________________
         @short
@@ -214,7 +192,8 @@ public:
         @onerror	A RuntimeException is thrown.
     */
 
-    virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+        throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		increment refcount
@@ -265,7 +244,7 @@ public:
         @onerror	A RuntimeException is thrown.
     */
 
-    virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //	XAggregation
@@ -284,7 +263,8 @@ public:
         @onerror	-
     */
 
-    virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
+        throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //	XProgressMonitor
@@ -310,9 +290,11 @@ public:
                     RELEASE	= nothing
     */
 
-    virtual void SAL_CALL addText(	const	UNO3_OUSTRING&	sTopic			,
-                                    const	UNO3_OUSTRING&	sText			,
-                                            sal_Bool		bbeforeProgress	) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addText(
+        const ::rtl::OUString& sTopic ,
+        const ::rtl::OUString& sText ,
+        sal_Bool bbeforeProgress
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -327,8 +309,10 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL removeText(	const	UNO3_OUSTRING&	sTopic			,
-                                                sal_Bool		bbeforeProgress	) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeText(
+        const ::rtl::OUString& sTopic ,
+        sal_Bool bbeforeProgress
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -343,9 +327,11 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL updateText(	const	UNO3_OUSTRING&	sTopic			,
-                                        const	UNO3_OUSTRING&	sText			,
-                                                sal_Bool		bbeforeProgress	) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL updateText(
+        const ::rtl::OUString&	sTopic ,
+        const ::rtl::OUString&	sText ,
+        sal_Bool bbeforeProgress
+    ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //	XProgressBar
@@ -364,7 +350,7 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -379,7 +365,7 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -394,7 +380,7 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -410,7 +396,7 @@ public:
     */
 
     virtual void SAL_CALL setRange(	sal_Int32	nMin	,
-                                    sal_Int32	nMax	) throw( UNO3_RUNTIMEEXCEPTION );
+                                    sal_Int32	nMax	) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -425,7 +411,7 @@ public:
         @onerror	-
     */
 
-    virtual sal_Int32 SAL_CALL getValue() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //	XButton
@@ -444,7 +430,9 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL addActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addActionListener(
+        const CSS_UNO::Reference< CSS_AWT::XActionListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -459,7 +447,9 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL removeActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeActionListener(
+        const CSS_UNO::Reference< CSS_AWT::XActionListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -474,7 +464,7 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL setLabel( const UNO3_OUSTRING& sLabel ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setLabel( const ::rtl::OUString& sLabel ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -489,7 +479,8 @@ public:
         @onerror	-
     */
 
-    virtual	void SAL_CALL setActionCommand( const UNO3_OUSTRING& sCommand ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual	void SAL_CALL setActionCommand( const ::rtl::OUString& sCommand )
+        throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     // 	XLayoutConstrains
@@ -508,7 +499,7 @@ public:
         @onerror	-
     */
 
-    virtual UNO3_SIZE SAL_CALL getMinimumSize() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -523,7 +514,7 @@ public:
         @onerror	-
     */
 
-    virtual UNO3_SIZE SAL_CALL getPreferredSize() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -538,7 +529,8 @@ public:
         @onerror	-
     */
 
-    virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize )
+        throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //	XControl
@@ -557,8 +549,10 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL createPeer(	const	UNO3_REFERENCE< UNO3_XTOOLKIT >&	xToolkit	,
-                                        const	UNO3_REFERENCE< UNO3_XWINDOWPEER >&	xParent		) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL createPeer(
+        const CSS_UNO::Reference< CSS_AWT::XToolkit     >& xToolkit ,
+        const CSS_UNO::Reference< CSS_AWT::XWindowPeer  >& xParent
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -573,7 +567,8 @@ public:
         @onerror	-
     */
 
-    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel )
+        throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -588,7 +583,8 @@ public:
         @onerror	-
     */
 
-    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+        throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //	XComponent
@@ -607,7 +603,7 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //	XWindow
@@ -630,7 +626,7 @@ public:
                                         sal_Int32	nY		,
                                         sal_Int32	nWidth	,
                                         sal_Int32	nHeight	,
-                                        sal_Int16	nFlags	) throw( UNO3_RUNTIMEEXCEPTION );
+                                        sal_Int16	nFlags	) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //	BaseControl
@@ -649,7 +645,7 @@ public:
         @onerror	-
     */
 
-    static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+    static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
 
     /**_______________________________________________________________________________________________________
         @short		-
@@ -664,7 +660,7 @@ public:
         @onerror	-
     */
 
-    static const UNO3_OUSTRING impl_getStaticImplementationName();
+    static const ::rtl::OUString impl_getStaticImplementationName();
 
 //____________________________________________________________________________________________________________
 //	protected methods
@@ -685,9 +681,9 @@ protected:
         @onerror	-
     */
 
-    virtual void impl_paint(		sal_Int32							nX			,
-                                    sal_Int32							nY			,
-                            const	UNO3_REFERENCE< UNO3_XGRAPHICS >&	xGraphics	);
+    virtual void impl_paint( sal_Int32 nX ,
+                             sal_Int32 nY ,
+                             const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics );
 
 //____________________________________________________________________________________________________________
 // private methods
@@ -753,8 +749,7 @@ private:
         @onerror	-
     */
 
-    IMPL_TextlistItem* impl_searchTopic(	const	UNO3_OUSTRING&	sTopic			,
-                                                     sal_Bool		bbeforeProgress	);
+    IMPL_TextlistItem* impl_searchTopic( const ::rtl::OUString&	sTopic , sal_Bool bbeforeProgress );
 
 //____________________________________________________________________________________________________________
 // debug methods
@@ -777,8 +772,8 @@ private:
 
     #ifdef DBG_UTIL
 
-    sal_Bool impl_debug_checkParameter( const UNO3_OUSTRING& sTopic, const UNO3_OUSTRING& sText, sal_Bool bbeforeProgress );	// addText, updateText
-    sal_Bool impl_debug_checkParameter( const UNO3_OUSTRING& rTopic, sal_Bool bbeforeProgress );								// removeText
+    sal_Bool impl_debug_checkParameter( const ::rtl::OUString& sTopic, const ::rtl::OUString& sText, sal_Bool bbeforeProgress );	// addText, updateText
+    sal_Bool impl_debug_checkParameter( const ::rtl::OUString& rTopic, sal_Bool bbeforeProgress );								// removeText
 
     #endif
 //____________________________________________________________________________________________________________
@@ -787,20 +782,25 @@ private:
 
 private:
 
-    IMPL_Textlist*							m_pTextlist_Top			;	// Elements before progress
-    UNO3_REFERENCE< UNO3_XFIXEDTEXT > 		m_xTopic_Top			;	// (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
-    UNO3_REFERENCE< UNO3_XFIXEDTEXT > 		m_xText_Top				;
+    IMPL_Textlist*                              m_pTextlist_Top     ;	// Elements before progress
+    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xTopic_Top        ;	// (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
+    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xText_Top         ;
 
-    IMPL_Textlist*							m_pTextlist_Bottom		;	// Elements below of progress
-    UNO3_REFERENCE< UNO3_XFIXEDTEXT > 		m_xTopic_Bottom			;	// (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
-    UNO3_REFERENCE< UNO3_XFIXEDTEXT > 		m_xText_Bottom			;
+    IMPL_Textlist*                              m_pTextlist_Bottom  ;	// Elements below of progress
+    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xTopic_Bottom     ;	// (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
+    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xText_Bottom      ;
 
-    UNO3_REFERENCE< UNO3_XPROGRESSBAR > 	m_xProgressBar			;
-    UNO3_REFERENCE< UNO3_XBUTTON > 			m_xButton				;
-    UNO3_RECTANGLE							m_a3DLine				;
+    CSS_UNO::Reference< CSS_AWT::XProgressBar > m_xProgressBar      ;
+    CSS_UNO::Reference< CSS_AWT::XButton >      m_xButton           ;
+    CSS_AWT::Rectangle                          m_a3DLine           ;
 
 };	// class ProgressMonitor
 
+// The namespaces aliases are only used the this header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+
 }	// namespace unocontrols
 
 #endif	// #ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX