Macro Cleanup in UNO land.

4 files changed, 306 insertions, 368 deletions

diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index 26cfdf8cec2e..cc052ca67f5f 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -56,25 +56,10 @@
 
 namespace unocontrols{
 
-#define UNO3_REFERENCE                              ::com::sun::star::uno::Reference
-#define UNO3_XCONTROL                               ::com::sun::star::awt::XControl
-#define UNO3_OUSTRING                               ::rtl::OUString
-#define UNO3_XCONTROLMODEL                          ::com::sun::star::awt::XControlModel
-#define UNO3_XCONTROLCONTAINER                      ::com::sun::star::awt::XControlContainer
-#define UNO3_XMULTISERVICEFACTORY                   ::com::sun::star::lang::XMultiServiceFactory
-#define UNO3_TYPE                                   ::com::sun::star::uno::Type
-#define UNO3_RUNTIMEEXCEPTION                       ::com::sun::star::uno::RuntimeException
-#define UNO3_XTOOLKIT                               ::com::sun::star::awt::XToolkit
-#define UNO3_XWINDOWPEER                            ::com::sun::star::awt::XWindowPeer
-#define UNO3_EVENTOBJECT                            ::com::sun::star::lang::EventObject
-#define UNO3_SEQUENCE                               ::com::sun::star::uno::Sequence
-#define UNO3_XCONTAINERLISTENER                     ::com::sun::star::container::XContainerListener
-#define UNO3_ANY                                    ::com::sun::star::uno::Any
-#define UNO3_XTABCONTROLLER                         ::com::sun::star::awt::XTabController
-#define UNO3_WINDOWDESCRIPTOR                       ::com::sun::star::awt::WindowDescriptor
-#define UNO3_XGRAPHICS                              ::com::sun::star::awt::XGraphics
-#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER     ::cppu::OMultiTypeInterfaceContainerHelper
-#define UNO3_ILLEGALARGUMENTEXCEPTION               ::com::sun::star::lang::IllegalArgumentException
+#define CSS_UNO         ::com::sun::star::uno
+#define CSS_AWT         ::com::sun::star::awt
+#define CSS_LANG        ::com::sun::star::lang
+#define CSS_CONTAINER   ::com::sun::star::container
 
 //____________________________________________________________________________________________________________
 //  structs, types, forwards
@@ -82,8 +67,8 @@ namespace unocontrols{
 
 struct IMPL_ControlInfo
 {
-    UNO3_REFERENCE< UNO3_XCONTROL >     xControl    ;
-    UNO3_OUSTRING                       sName       ;
+    CSS_UNO::Reference< CSS_AWT::XControl > xControl ;
+    ::rtl::OUString                         sName    ;
 };
 
 // makro define a list-class for struct IMPL_ControlInfo!
@@ -94,8 +79,8 @@ DECLARE_LIST( IMPL_ControlInfoList, IMPL_ControlInfo* )
 //  classes
 //____________________________________________________________________________________________________________
 
-class BaseContainerControl  : public UNO3_XCONTROLMODEL
-                            , public UNO3_XCONTROLCONTAINER
+class BaseContainerControl  : public CSS_AWT::XControlModel
+                            , public CSS_AWT::XControlContainer
                             , public BaseControl
 {
 
@@ -122,7 +107,7 @@ public:
         @onerror    -
     */
 
-       BaseContainerControl( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+       BaseContainerControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -156,7 +141,9 @@ 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 );
 
     //________________________________________________________________________________________________________
     //  XTypeProvider
@@ -175,7 +162,8 @@ 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
@@ -194,7 +182,9 @@ 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 );
 
     //________________________________________________________________________________________________________
     //  XControl
@@ -213,8 +203,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      -
@@ -229,7 +221,9 @@ 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      -
@@ -244,7 +238,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
@@ -263,7 +258,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XEventListener
@@ -282,7 +277,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL disposing( const UNO3_EVENTOBJECT& rEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL disposing( const CSS_LANG::EventObject& rEvent ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XControlContainer
@@ -301,8 +296,10 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL addControl(   const   UNO3_OUSTRING&                      sName       ,
-                                        const   UNO3_REFERENCE< UNO3_XCONTROL >&    xControl    ) throw( UNO3_RUNTIMEEXCEPTION  );
+    virtual void SAL_CALL addControl(
+        const ::rtl::OUString&                            sName    ,
+        const CSS_UNO::Reference< CSS_AWT::XControl >&    xControl
+    ) throw( CSS_UNO::RuntimeException  );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -317,7 +314,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL addContainerListener( const UNO3_REFERENCE< UNO3_XCONTAINERLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addContainerListener(
+        const CSS_UNO::Reference< CSS_CONTAINER::XContainerListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -332,7 +331,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL removeControl( const UNO3_REFERENCE< UNO3_XCONTROL >& xControl ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeControl(
+        const CSS_UNO::Reference< CSS_AWT::XControl >& xControl
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -347,7 +348,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL removeContainerListener( const UNO3_REFERENCE< UNO3_XCONTAINERLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeContainerListener(
+        const CSS_UNO::Reference< CSS_CONTAINER::XContainerListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -362,7 +365,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setStatusText( const UNO3_OUSTRING& sStatusText ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setStatusText(
+        const ::rtl::OUString& sStatusText
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -377,7 +382,9 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_REFERENCE< UNO3_XCONTROL > SAL_CALL getControl( const UNO3_OUSTRING& sName) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Reference< CSS_AWT::XControl > SAL_CALL getControl(
+        const ::rtl::OUString& sName
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -392,7 +399,8 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XCONTROL > > SAL_CALL getControls() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XControl > > SAL_CALL getControls()
+        throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XUnoControlContainer
@@ -411,7 +419,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL addTabController( const UNO3_REFERENCE< UNO3_XTABCONTROLLER >& xTabController ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addTabController(
+        const CSS_UNO::Reference< CSS_AWT::XTabController >& xTabController
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -426,7 +436,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL removeTabController( const UNO3_REFERENCE< UNO3_XTABCONTROLLER >& xTabController ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeTabController(
+        const CSS_UNO::Reference< CSS_AWT::XTabController >& xTabController
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -441,7 +453,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setTabControllers( const UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XTABCONTROLLER > >& xTabControllers ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setTabControllers(
+        const CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > >& xTabControllers
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -456,7 +470,8 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XTABCONTROLLER > > SAL_CALL getTabControllers() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > > SAL_CALL getTabControllers()
+        throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XWindow
@@ -475,7 +490,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( CSS_UNO::RuntimeException );
 
 //____________________________________________________________________________________________________________
 //  protected methods
@@ -496,7 +511,9 @@ protected:
         @onerror
     */
 
-    virtual UNO3_WINDOWDESCRIPTOR* impl_getWindowDescriptor( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParentPeer );
+    virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
+        const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+    );
 
     /**_______________________________________________________________________________________________________
         @short
@@ -511,9 +528,11 @@ 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
@@ -556,13 +575,22 @@ private:
 //____________________________________________________________________________________________________________
 
 private:
+    // list of pointer of "struct IMPL_ControlInfo" to hold child-controls
+    IMPL_ControlInfoList*                                               m_pControlInfoList      ;
 
-    IMPL_ControlInfoList*                                   m_pControlInfoList      ;   /// list of pointer of "struct IMPL_ControlInfo" to hold child-controls
-    UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XTABCONTROLLER > >  m_xTabControllerList    ;   /// list of references of XTabController to hold tab-order in this container
-    UNO3_OMULTITYPEINTERFACECONTAINERHELPER                 m_aListeners            ;
+    // list of references of XTabController to hold tab-order in this container
+    CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > >  m_xTabControllerList    ;
+
+    ::cppu::OMultiTypeInterfaceContainerHelper                          m_aListeners            ;
 
 };  // class BaseContainerControl
 
+// The namespace aliases are only used in this header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+#undef CSS_CONTAINER
+
 }   // namespace unocontrols
 
 #endif  // ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 71106cc4f49e..e8eb59bce4ac 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -111,36 +111,9 @@
 
 namespace unocontrols{
 
-#define UNO3_ANY                                    ::com::sun::star::uno::Any
-#define UNO3_EVENTOBJECT                            ::com::sun::star::lang::EventObject
-#define UNO3_MUTEX                                  ::osl::Mutex
-#define UNO3_OCOMPONENTHELPER                       ::cppu::OComponentHelper
-#define UNO3_OUSTRING                               ::rtl::OUString
-#define UNO3_PAINTEVENT                             ::com::sun::star::awt::PaintEvent
-#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_WINDOWDESCRIPTOR                       ::com::sun::star::awt::WindowDescriptor
-#define UNO3_XCONTROL                               ::com::sun::star::awt::XControl
-#define UNO3_XCONTROLMODEL                          ::com::sun::star::awt::XControlModel
-#define UNO3_XEVENTLISTENER                         ::com::sun::star::lang::XEventListener
-#define UNO3_XFOCUSLISTENER                         ::com::sun::star::awt::XFocusListener
-#define UNO3_XGRAPHICS                              ::com::sun::star::awt::XGraphics
-#define UNO3_XKEYLISTENER                           ::com::sun::star::awt::XKeyListener
-#define UNO3_XMOUSELISTENER                         ::com::sun::star::awt::XMouseListener
-#define UNO3_XMOUSEMOTIONLISTENER                   ::com::sun::star::awt::XMouseMotionListener
-#define UNO3_XMULTISERVICEFACTORY                   ::com::sun::star::lang::XMultiServiceFactory
-#define UNO3_XPAINTLISTENER                         ::com::sun::star::awt::XPaintListener
-#define UNO3_XSERVICEINFO                           ::com::sun::star::lang::XServiceInfo
-#define UNO3_XTOOLKIT                               ::com::sun::star::awt::XToolkit
-#define UNO3_XVIEW                                  ::com::sun::star::awt::XView
-#define UNO3_XWINDOW                                ::com::sun::star::awt::XWindow
-#define UNO3_XWINDOWLISTENER                        ::com::sun::star::awt::XWindowListener
-#define UNO3_XWINDOWPEER                            ::com::sun::star::awt::XWindowPeer
-#define UNO3_XINTERFACE                             ::com::sun::star::uno::XInterface
+#define CSS_UNO     ::com::sun::star::uno
+#define CSS_AWT     ::com::sun::star::awt
+#define CSS_LANG    ::com::sun::star::lang
 
 //____________________________________________________________________________________________________________
 //  macros
@@ -156,21 +129,21 @@ namespace unocontrols{
 struct IMPL_MutexContainer
 {
     // Is necassery to initialize "BaseControl" and make this class thread-safe.
-    UNO3_MUTEX m_aMutex ;
+    ::osl::Mutex m_aMutex ;
 };
 
 //____________________________________________________________________________________________________________
 //  classes
 //____________________________________________________________________________________________________________
 
-class BaseControl   : public UNO3_XSERVICEINFO
-                    , public UNO3_XPAINTLISTENER
-                    , public UNO3_XWINDOWLISTENER
-                    , public UNO3_XVIEW
-                    , public UNO3_XWINDOW
-                    , public UNO3_XCONTROL
+class BaseControl   : public CSS_LANG::XServiceInfo
+                    , public CSS_AWT::XPaintListener
+                    , public CSS_AWT::XWindowListener
+                    , public CSS_AWT::XView
+                    , public CSS_AWT::XWindow
+                    , public CSS_AWT::XControl
                     , public IMPL_MutexContainer
-                    , public UNO3_OCOMPONENTHELPER
+                    , public ::cppu::OComponentHelper
 {
 //____________________________________________________________________________________________________________
 //  public methods
@@ -195,7 +168,7 @@ public:
         @onerror    -
     */
 
-    BaseControl( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+    BaseControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -229,7 +202,9 @@ 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
@@ -280,7 +255,8 @@ 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 );
 
     /**_______________________________________________________________________________________________________
         @short      get implementation id
@@ -296,7 +272,8 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual UNO3_SEQUENCE< sal_Int8 > SAL_CALL getImplementationId() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XAggregation
@@ -315,7 +292,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setDelegator( const UNO3_REFERENCE< UNO3_XINTERFACE >& xDelegator ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setDelegator(
+        const CSS_UNO::Reference< CSS_UNO::XInterface >& xDelegator
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -330,7 +309,9 @@ 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 );
 
     //________________________________________________________________________________________________________
     //  XServiceInfo
@@ -349,7 +330,9 @@ public:
         @onerror    -
     */
 
-    virtual sal_Bool SAL_CALL supportsService( const UNO3_OUSTRING& sServiceName ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL supportsService(
+        const ::rtl::OUString& sServiceName
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -364,7 +347,8 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_OUSTRING SAL_CALL getImplementationName() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -379,7 +363,8 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_SEQUENCE< UNO3_OUSTRING > SAL_CALL getSupportedServiceNames() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+        throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XComponent
@@ -398,7 +383,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -413,7 +398,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL addEventListener( const UNO3_REFERENCE< UNO3_XEVENTLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addEventListener(
+        const CSS_UNO::Reference< CSS_LANG::XEventListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -428,7 +415,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL removeEventListener( const UNO3_REFERENCE< UNO3_XEVENTLISTENER >& xListener   ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeEventListener(
+        const CSS_UNO::Reference< CSS_LANG::XEventListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XControl
@@ -447,7 +436,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      -
@@ -462,7 +454,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setContext( const UNO3_REFERENCE< UNO3_XINTERFACE >& xContext ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setContext(
+        const CSS_UNO::Reference< CSS_UNO::XInterface >& xContext
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -477,7 +471,9 @@ public:
         @onerror    -
     */
 
-    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION ) = 0 ;
+    virtual sal_Bool SAL_CALL setModel(
+        const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
+    ) throw( CSS_UNO::RuntimeException ) = 0 ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -492,7 +488,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -507,7 +503,8 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_REFERENCE< UNO3_XINTERFACE > SAL_CALL getContext() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Reference< CSS_UNO::XInterface > SAL_CALL getContext()
+        throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -522,7 +519,8 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION ) = 0;
+    virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+        throw( CSS_UNO::RuntimeException ) = 0;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -537,7 +535,8 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_REFERENCE< UNO3_XWINDOWPEER > SAL_CALL getPeer() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Reference< CSS_AWT::XWindowPeer > SAL_CALL getPeer()
+        throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -552,7 +551,8 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_REFERENCE< UNO3_XVIEW > SAL_CALL getView() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Reference< CSS_AWT::XView > SAL_CALL getView()
+        throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -567,7 +567,7 @@ public:
         @onerror    -
     */
 
-    virtual sal_Bool SAL_CALL isDesignMode() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL isDesignMode() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -582,7 +582,7 @@ public:
         @onerror    -
     */
 
-    virtual sal_Bool SAL_CALL isTransparent() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL isTransparent() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XWindow
@@ -605,7 +605,7 @@ public:
                                         sal_Int32   nY      ,
                                         sal_Int32   nWidth  ,
                                         sal_Int32   nHeight ,
-                                        sal_Int16   nFlags  ) throw( UNO3_RUNTIMEEXCEPTION );
+                                        sal_Int16   nFlags  ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -620,7 +620,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -635,7 +635,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -650,7 +650,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setFocus() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL setFocus() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -665,7 +665,7 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_RECTANGLE SAL_CALL getPosSize() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_AWT::Rectangle SAL_CALL getPosSize() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -680,7 +680,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL addWindowListener( const UNO3_REFERENCE< UNO3_XWINDOWLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addWindowListener(
+        const CSS_UNO::Reference< CSS_AWT::XWindowListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -695,7 +697,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL addFocusListener( const UNO3_REFERENCE< UNO3_XFOCUSLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addFocusListener(
+        const CSS_UNO::Reference< CSS_AWT::XFocusListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -710,7 +714,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL addKeyListener( const UNO3_REFERENCE< UNO3_XKEYLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addKeyListener(
+        const CSS_UNO::Reference< CSS_AWT::XKeyListener >& xListener )
+    throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -725,7 +731,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL addMouseListener( const UNO3_REFERENCE< UNO3_XMOUSELISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addMouseListener(
+        const CSS_UNO::Reference< CSS_AWT::XMouseListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -740,7 +748,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL addMouseMotionListener( const UNO3_REFERENCE< UNO3_XMOUSEMOTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addMouseMotionListener(
+        const CSS_UNO::Reference< CSS_AWT::XMouseMotionListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -755,7 +765,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL addPaintListener( const UNO3_REFERENCE< UNO3_XPAINTLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL addPaintListener(
+        const CSS_UNO::Reference< CSS_AWT::XPaintListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -770,7 +782,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL removeWindowListener( const UNO3_REFERENCE< UNO3_XWINDOWLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeWindowListener(
+        const CSS_UNO::Reference< CSS_AWT::XWindowListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -785,7 +799,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL removeFocusListener( const UNO3_REFERENCE< UNO3_XFOCUSLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeFocusListener(
+        const CSS_UNO::Reference< CSS_AWT::XFocusListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -800,7 +816,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL removeKeyListener( const UNO3_REFERENCE< UNO3_XKEYLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeKeyListener(
+        const CSS_UNO::Reference< CSS_AWT::XKeyListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -815,7 +833,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL removeMouseListener( const UNO3_REFERENCE< UNO3_XMOUSELISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeMouseListener(
+        const CSS_UNO::Reference< CSS_AWT::XMouseListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -830,7 +850,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL removeMouseMotionListener( const UNO3_REFERENCE< UNO3_XMOUSEMOTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removeMouseMotionListener(
+        const CSS_UNO::Reference< CSS_AWT::XMouseMotionListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -845,7 +867,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL removePaintListener( const UNO3_REFERENCE< UNO3_XPAINTLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL removePaintListener(
+        const CSS_UNO::Reference< CSS_AWT::XPaintListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XView
@@ -865,7 +889,7 @@ public:
     */
 
     virtual void SAL_CALL draw( sal_Int32   nX  ,
-                                sal_Int32   nY  ) throw( UNO3_RUNTIMEEXCEPTION );
+                                sal_Int32   nY  ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -880,7 +904,9 @@ public:
         @onerror    -
     */
 
-    virtual sal_Bool SAL_CALL setGraphics( const UNO3_REFERENCE< UNO3_XGRAPHICS >& xDevice ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual sal_Bool SAL_CALL setGraphics(
+        const CSS_UNO::Reference< CSS_AWT::XGraphics >& xDevice
+    ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -896,7 +922,7 @@ public:
     */
 
     virtual void SAL_CALL setZoom(  float   fZoomX  ,
-                                    float   fZoomY  ) throw( UNO3_RUNTIMEEXCEPTION );
+                                    float   fZoomY  ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -911,7 +937,8 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_REFERENCE< UNO3_XGRAPHICS > SAL_CALL getGraphics() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_UNO::Reference< CSS_AWT::XGraphics > SAL_CALL getGraphics()
+        throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -926,10 +953,10 @@ public:
         @onerror    -
     */
 
-    virtual UNO3_SIZE SAL_CALL getSize() throw( UNO3_RUNTIMEEXCEPTION );
+    virtual CSS_AWT::Size SAL_CALL getSize() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  UNO3_XEVENTLISTENER
+    //  CSS_LANG::XEventListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
@@ -945,7 +972,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL disposing( const UNO3_EVENTOBJECT& rSource    ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL disposing(
+        const CSS_LANG::EventObject& rSource
+    ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XPaintListener
@@ -964,7 +993,9 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowPaint( const UNO3_PAINTEVENT& rEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL windowPaint(
+        const CSS_AWT::PaintEvent& rEvent
+    ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  XWindowListener
@@ -983,10 +1014,10 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowResized( const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
-    virtual void SAL_CALL windowMoved( const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
-    virtual void SAL_CALL windowShown( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
-    virtual void SAL_CALL windowHidden( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL windowResized( const CSS_AWT::WindowEvent& aEvent ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL windowMoved( const CSS_AWT::WindowEvent& aEvent ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL windowShown( const CSS_LANG::EventObject& aEvent ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL windowHidden( const CSS_LANG::EventObject& aEvent ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
     //  impl but public method to register service
@@ -1005,7 +1036,7 @@ public:
         @onerror    -
     */
 
-    static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+    static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -1020,7 +1051,7 @@ public:
         @onerror    -
     */
 
-    static const UNO3_OUSTRING impl_getStaticImplementationName();
+    static const ::rtl::OUString impl_getStaticImplementationName();
 
 //____________________________________________________________________________________________________________
 //  protected methods
@@ -1042,7 +1073,7 @@ protected:
         @onerror    -
     */
 
-    const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY > impl_getMultiServiceFactory();
+    const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory > impl_getMultiServiceFactory();
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -1057,7 +1088,7 @@ protected:
         @onerror    -
     */
 
-    const UNO3_REFERENCE< UNO3_XWINDOW > impl_getPeerWindow();
+    const CSS_UNO::Reference< CSS_AWT::XWindow > impl_getPeerWindow();
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -1072,7 +1103,7 @@ protected:
         @onerror    -
     */
 
-    const UNO3_REFERENCE< UNO3_XGRAPHICS > impl_getGraphicsPeer();
+    const CSS_UNO::Reference< CSS_AWT::XGraphics > impl_getGraphicsPeer();
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -1117,7 +1148,9 @@ protected:
         @onerror    -
     */
 
-    virtual UNO3_WINDOWDESCRIPTOR* impl_getWindowDescriptor( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParentPeer );
+    virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
+        const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+    );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -1134,7 +1167,7 @@ protected:
 
     virtual void impl_paint(        sal_Int32               nX          ,
                                     sal_Int32               nY          ,
-                            const   UNO3_REFERENCE< UNO3_XGRAPHICS >&   xGraphics   );
+                            const   CSS_UNO::Reference< CSS_AWT::XGraphics >&   xGraphics   );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -1149,7 +1182,7 @@ protected:
         @onerror    -
     */
 
-    virtual void impl_recalcLayout( const UNO3_WINDOWEVENT& aEvent );
+    virtual void impl_recalcLayout( const CSS_AWT::WindowEvent& aEvent );
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -1164,7 +1197,7 @@ protected:
         @onerror    -
     */
 
-    UNO3_REFERENCE< UNO3_XINTERFACE > impl_getDelegator();
+    CSS_UNO::Reference< CSS_UNO::XInterface > impl_getDelegator();
 
 //____________________________________________________________________________________________________________
 //  private methods
@@ -1208,15 +1241,15 @@ private:
 
 private:
 
-    UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >     m_xFactory              ;
-    UNO3_REFERENCE< UNO3_XINTERFACE >               m_xDelegator            ;
+    CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >    m_xFactory              ;
+    CSS_UNO::Reference< CSS_UNO::XInterface >               m_xDelegator            ;
     OMRCListenerMultiplexerHelper*                  m_pMultiplexer          ;   // multiplex events
-    UNO3_REFERENCE< UNO3_XINTERFACE >               m_xMultiplexer          ;
-    UNO3_REFERENCE< UNO3_XINTERFACE >               m_xContext              ;
-    UNO3_REFERENCE< UNO3_XWINDOWPEER >              m_xPeer                 ;
-    UNO3_REFERENCE< UNO3_XWINDOW >                  m_xPeerWindow           ;
-    UNO3_REFERENCE< UNO3_XGRAPHICS >                m_xGraphicsView         ;   // graphics for ::com::sun::star::awt::XView-operations
-    UNO3_REFERENCE< UNO3_XGRAPHICS >                m_xGraphicsPeer         ;   // graphics for painting on a peer
+    CSS_UNO::Reference< CSS_UNO::XInterface >               m_xMultiplexer          ;
+    CSS_UNO::Reference< CSS_UNO::XInterface >               m_xContext              ;
+    CSS_UNO::Reference< CSS_AWT::XWindowPeer >              m_xPeer                 ;
+    CSS_UNO::Reference< CSS_AWT::XWindow >                  m_xPeerWindow           ;
+    CSS_UNO::Reference< CSS_AWT::XGraphics >                m_xGraphicsView         ;   // graphics for CSS_AWT::XView-operations
+    CSS_UNO::Reference< CSS_AWT::XGraphics >                m_xGraphicsPeer         ;   // graphics for painting on a peer
     sal_Int32                                       m_nX                    ;   // Position ...
     sal_Int32                                       m_nY                    ;
     sal_Int32                                       m_nWidth                ;   // ... and size of window
@@ -1227,6 +1260,11 @@ private:
 
 };  // class BaseControl
 
+// The namespace aliaes are only used in this header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+
 }   // namespace unocontrols
 
 #endif  // ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX
diff --git a/UnoControls/inc/definesunocontrols.hxx b/UnoControls/inc/definesunocontrols.hxx
deleted file mode 100644
index 7910343faf57..000000000000
--- a/UnoControls/inc/definesunocontrols.hxx
+++ /dev/null
@@ -1,138 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _UNOCONTROLS_DEFINES_CTRL_HXX
-#define _UNOCONTROLS_DEFINES_CTRL_HXX
-
-//-------------------------------------------------------------------------------------------------------------------
-// includes
-#include <limits.h> // defines for min/max of INT
-
-namespace unocontrols{
-
-//-------------------------------------------------------------------------------------------------------------------
-// global defines for all UnoControls
-//-------------------------------------------------------------------------------------------------------------------
-#define UNOCONTROLS_TRGB_COLORDATA( t,r,g,b )               ((INT32)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)|(((UINT32)((UINT8)(t)))<<24))
-//-------------------------------------------------------------------------------------------------------------------
-
-// defines for BaseControl
-#ifdef _UNOCONTROLS_BASECONTROL_CTRL_HXX
-    #define BASECONTROL_IDLCLASSNAME                        "BaseControl"
-    #define BASECONTROL_DEFAULT_PMULTIPLEXER                NULL
-    #define BASECONTROL_DEFAULT_X                           0
-    #define BASECONTROL_DEFAULT_Y                           0
-    #define BASECONTROL_DEFAULT_WIDTH                       100
-    #define BASECONTROL_DEFAULT_HEIGHT                      100
-    #define BASECONTROL_DEFAULT_VISIBLE                     FALSE
-    #define BASECONTROL_DEFAULT_INDESIGNMODE                FALSE
-    #define BASECONTROL_DEFAULT_ENABLE                      TRUE
-    #define BASECONTROL_SERVICE_VCLTOOLKIT                  "com.sun.star.awt.VclToolkit"
-#endif
-//-------------------------------------------------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------------------------------------------
-// defines for BaseContainerControl
-#ifdef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
-    #define BASECONTAINERCONTROL_IDLCLASSNAME               "BaseContainerControl"
-#endif
-//-------------------------------------------------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------------------------------------------
-// defines for ProgressBar
-#ifdef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
-    #define PROGRESSBAR_IDLCLASSNAME                        "XProgressbar"
-    #define PROGRESSBAR_SERVICENAME                         "com.sun.star.awt.XProgressBar"
-    #define PROGRESSBAR_IMPLEMENTATIONNAME                  "stardiv.UnoControls.ProgressBar"
-    #define PROGRESSBAR_FREEBORDER                          2
-    #define PROGRESSBAR_DEFAULT_HORIZONTAL                  TRUE
-    #define PROGRESSBAR_DEFAULT_BLOCKDIMENSION              Size(1,1)
-    #define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR             UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )    // lightgray
-    #define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR             UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 )    // blue
-    #define PROGRESSBAR_DEFAULT_MINRANGE                    INT_MIN
-    #define PROGRESSBAR_DEFAULT_MAXRANGE                    INT_MAX
-    #define PROGRESSBAR_DEFAULT_BLOCKVALUE                  1
-    #define PROGRESSBAR_DEFAULT_VALUE                       PROGRESSBAR_DEFAULT_MINRANGE
-    #define PROGRESSBAR_LINECOLOR_BRIGHT                    UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )    // white
-    #define PROGRESSBAR_LINECOLOR_SHADOW                    UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )    // black
-#endif
-//-------------------------------------------------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------------------------------------------
-// defines for FrameControl
-#ifdef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
-    #define FRAMECONTROL_IDLCLASSNAME                       "FrameControl"
-    #define FRAMECONTROL_SERVICENAME                        "com.sun.star.frame.FrameControl"
-    #define FRAMECONTROL_IMPLEMENTATIONNAME                 "stardiv.UnoControls.FrameControl"
-    #define FRAMECONTROL_DEFAULT_COMPONENTURL               "private:factory/swriter"
-    #define FRAMECONTROL_PROPERTYNAME_LOADERARGUMENTS       "LoaderArguments"
-    #define FRAMECONTROL_PROPERTYNAME_COMPONENTURL          "ComponentURL"
-    #define FRAMECONTROL_PROPERTYNAME_FRAME                 "Frame"
-    #define FRAMECONTROL_PROPERTYNAME_IDLCLASSES            "IDLClasses"
-    #define FRAMECONTROL_ERRORTEXT_VOSENSHURE               "This is an invalid property handle."
-    #define FRAMECONTROL_PROPERTY_COUNT                     4                                                       // you must count the propertys
-    #define FRAMECONTROL_PROPERTY_COMPONENTURL              0                                                       // Id must be the index into the array
-    #define FRAMECONTROL_PROPERTY_FRAME                     1
-    #define FRAMECONTROL_PROPERTY_IDLCLASSES                2
-    #define FRAMECONTROL_PROPERTY_LOADERARGUMENTS           3
-#endif
-//-------------------------------------------------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------------------------------------------
-// defines for ProgressMonitor
-#ifdef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
-    #define PROGRESSMONITOR_IDLCLASSNAME                    "XProgressMonitor"
-    #define PROGRESSMONITOR_SERVICENAME                     "com.sun.star.awt.XProgressMonitor"
-    #define PROGRESSMONITOR_IMPLEMENTATIONNAME              "stardiv.UnoControls.ProgressMonitor"
-    #define PROGRESSMONITOR_FREEBORDER                      10                                                      // border around and between the controls
-    #define PROGRESSMONITOR_WIDTH_RELATION                  4                                                       // reserve 1/4 for button width and rest for progressbar width
-    #define PROGRESSMONITOR_HEIGHT_RELATION                 5                                                       // reserve 1/5 for button and progressbar heigth and rest for text height
-    #define PROGRESSMONITOR_FIXEDTEXT_SERVICENAME           "com.sun.star.awt.UnoControlFixedText"
-    #define PROGRESSMONITOR_BUTTON_SERVICENAME              "com.sun.star.awt.UnoControlButton"
-    #define PROGRESSMONITOR_FIXEDTEXT_MODELNAME             "com.sun.star.awt.UnoControlFixedTextModel"
-    #define PROGRESSMONITOR_BUTTON_MODELNAME                "com.sun.star.awt.UnoControlButtonModel"
-    #define PROGRESSMONITOR_CONTROLNAME_TEXT                "Text"                                                  // identifier the control in container
-    #define PROGRESSMONITOR_CONTROLNAME_BUTTON              "Button"                                                //              -||-
-    #define PROGRESSMONITOR_CONTROLNAME_PROGRESSBAR         "ProgressBar"                                           //              -||-
-    #define PROGRESSMONITOR_DEFAULT_BUTTONLABEL             "Abbrechen"
-    #define PROGRESSMONITOR_DEFAULT_TOPIC                   "\0"
-    #define PROGRESSMONITOR_DEFAULT_TEXT                    "\0"
-    #define PROGRESSMONITOR_BACKGROUNDCOLOR                 UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )    // lighgray
-    #define PROGRESSMONITOR_LINECOLOR_BRIGHT                UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )    // white
-    #define PROGRESSMONITOR_LINECOLOR_SHADOW                UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )    // black
-    #define PROGRESSMONITOR_HEIGHT_PROGRESSBAR              15
-    #define PROGRESSMONITOR_DEFAULT_WIDTH                   350
-    #define PROGRESSMONITOR_DEFAULT_HEIGHT                  100
-#endif
-//-------------------------------------------------------------------------------------------------------------------
-
-}   // namespace unocontrols
-
-#endif  // #ifndef _UNOCONTROLS_DEFINES_CTRL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index a97f6e79255b..b9a90c5a33f1 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -68,42 +68,22 @@
 
 namespace unocontrols{
 
-#define UNO3_OWEAKOBJECT                            ::cppu::OWeakObject
-#define UNO3_XWINDOW                                ::com::sun::star::awt::XWindow
-#define UNO3_REFERENCE                              ::com::sun::star::uno::Reference
-#define UNO3_WEAKREFERENCE                          ::com::sun::star::uno::WeakReference
-#define UNO3_MUTEX                                  ::osl::Mutex
-#define UNO3_XWINDOWLISTENER                        ::com::sun::star::awt::XWindowListener
-#define UNO3_XKEYLISTENER                           ::com::sun::star::awt::XKeyListener
-#define UNO3_XMOUSELISTENER                         ::com::sun::star::awt::XMouseListener
-#define UNO3_XMOUSEMOTIONLISTENER                   ::com::sun::star::awt::XMouseMotionListener
-#define UNO3_XPAINTLISTENER                         ::com::sun::star::awt::XPaintListener
-#define UNO3_XTOPWINDOWLISTENER                     ::com::sun::star::awt::XTopWindowListener
-#define UNO3_XFOCUSLISTENER                         ::com::sun::star::awt::XFocusListener
-#define UNO3_ANY                                    ::com::sun::star::uno::Any
-#define UNO3_TYPE                                   ::com::sun::star::uno::Type
-#define UNO3_RUNTIMEEXCEPTION                       ::com::sun::star::uno::RuntimeException
-#define UNO3_XINTERFACE                             ::com::sun::star::uno::XInterface
-#define UNO3_EVENTOBJECT                            ::com::sun::star::lang::EventObject
-#define UNO3_FOCUSEVENT                             ::com::sun::star::awt::FocusEvent
-#define UNO3_WINDOWEVENT                            ::com::sun::star::awt::WindowEvent
-#define UNO3_KEYEVENT                               ::com::sun::star::awt::KeyEvent
-#define UNO3_MOUSEEVENT                             ::com::sun::star::awt::MouseEvent
-#define UNO3_PAINTEVENT                             ::com::sun::star::awt::PaintEvent
-#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER     ::cppu::OMultiTypeInterfaceContainerHelper
+#define CSS_UNO     ::com::sun::star::uno
+#define CSS_AWT     ::com::sun::star::awt
+#define CSS_LANG    ::com::sun::star::lang
 
 //____________________________________________________________________________________________________________
 //  class
 //____________________________________________________________________________________________________________
 
-class OMRCListenerMultiplexerHelper : public UNO3_XFOCUSLISTENER
-                                    , public UNO3_XWINDOWLISTENER
-                                    , public UNO3_XKEYLISTENER
-                                    , public UNO3_XMOUSELISTENER
-                                    , public UNO3_XMOUSEMOTIONLISTENER
-                                    , public UNO3_XPAINTLISTENER
-                                    , public UNO3_XTOPWINDOWLISTENER
-                                    , public UNO3_OWEAKOBJECT
+class OMRCListenerMultiplexerHelper : public CSS_AWT::XFocusListener
+                                    , public CSS_AWT::XWindowListener
+                                    , public CSS_AWT::XKeyListener
+                                    , public CSS_AWT::XMouseListener
+                                    , public CSS_AWT::XMouseMotionListener
+                                    , public CSS_AWT::XPaintListener
+                                    , public CSS_AWT::XTopWindowListener
+                                    , public ::cppu::OWeakObject
 {
 
 //____________________________________________________________________________________________________________
@@ -130,8 +110,8 @@ public:
         @onerror    -
     */
 
-    OMRCListenerMultiplexerHelper(  const   UNO3_REFERENCE< UNO3_XWINDOW >& xControl    ,
-                                    const   UNO3_REFERENCE< UNO3_XWINDOW >& xPeer       );
+    OMRCListenerMultiplexerHelper(  const   CSS_UNO::Reference< CSS_AWT::XWindow >& xControl    ,
+                                    const   CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer       );
 
     /**_______________________________________________________________________________________________________
         @short      copy-constructor
@@ -180,7 +160,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
@@ -231,7 +212,7 @@ public:
         @onerror    -
     */
 
-    operator UNO3_REFERENCE< UNO3_XINTERFACE >() const;
+    operator CSS_UNO::Reference< CSS_UNO::XInterface >() const;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -265,7 +246,7 @@ public:
         @onerror    -
     */
 
-    void setPeer( const UNO3_REFERENCE< UNO3_XWINDOW >& xPeer );
+    void setPeer( const CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer );
 
     /**_______________________________________________________________________________________________________
         @short      Remove all listeners and send a disposing message.
@@ -295,8 +276,8 @@ public:
         @onerror    -
     */
 
-    void advise(    const   UNO3_TYPE&                          aType       ,
-                    const   UNO3_REFERENCE< UNO3_XINTERFACE >&  xListener   );
+    void advise(    const   CSS_UNO::Type&                              aType       ,
+                    const   CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener   );
 
     /**_______________________________________________________________________________________________________
         @short      Remove the specified listener from the source.
@@ -311,8 +292,8 @@ public:
         @onerror    -
     */
 
-    void unadvise(  const   UNO3_TYPE&                          aType       ,
-                    const   UNO3_REFERENCE< UNO3_XINTERFACE >&  xListener   );
+    void unadvise(  const   CSS_UNO::Type&                              aType       ,
+                    const   CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener   );
 
     //________________________________________________________________________________________________________
     //  XEventListener
@@ -332,7 +313,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL disposing(const UNO3_EVENTOBJECT& aSource) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL disposing(const CSS_LANG::EventObject& aSource)
+        throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
     //  XFocusListener
@@ -352,7 +334,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL focusGained(const UNO3_FOCUSEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL focusGained(const CSS_AWT::FocusEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -368,7 +351,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL focusLost(const UNO3_FOCUSEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL focusLost(const CSS_AWT::FocusEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
     //  XWindowListener
@@ -388,7 +372,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowResized(const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowResized(const CSS_AWT::WindowEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -404,7 +389,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowMoved(const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowMoved(const CSS_AWT::WindowEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -420,7 +406,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowShown(const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowShown(const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -436,7 +423,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowHidden(const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowHidden(const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
     //  XKeyListener
@@ -456,7 +444,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL keyPressed( const UNO3_KEYEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL keyPressed( const CSS_AWT::KeyEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -472,7 +461,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL keyReleased( const UNO3_KEYEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL keyReleased( const CSS_AWT::KeyEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
     //  XMouseListener
@@ -492,7 +482,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL mousePressed(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mousePressed(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -508,7 +499,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL mouseReleased(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mouseReleased(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -524,7 +516,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL mouseEntered(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mouseEntered(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -540,7 +533,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL mouseExited(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mouseExited(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
     //  XMouseMotionListener
@@ -560,7 +554,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL mouseDragged(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mouseDragged(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -576,7 +571,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL mouseMoved(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL mouseMoved(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
     //  XPaintListener
@@ -596,7 +592,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowPaint(const UNO3_PAINTEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowPaint(const CSS_AWT::PaintEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
     //  XTopWindowListener
@@ -616,7 +613,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowOpened( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowOpened( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -632,7 +630,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowClosing( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowClosing( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -648,7 +647,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowClosed( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowClosed( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -664,7 +664,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowMinimized( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowMinimized( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -680,7 +681,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowNormalized( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowNormalized( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -696,7 +698,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowActivated( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowActivated( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -712,7 +715,8 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowDeactivated( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+    virtual void SAL_CALL windowDeactivated( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
 
 //____________________________________________________________________________________________________________
 //  protected methods
@@ -734,8 +738,8 @@ protected:
         @onerror    -
     */
 
-    void impl_adviseToPeer( const   UNO3_REFERENCE< UNO3_XWINDOW >& xPeer   ,
-                            const   UNO3_TYPE&                      aType   );
+    void impl_adviseToPeer( const   CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer   ,
+                            const   CSS_UNO::Type&                          aType   );
 
     /**_______________________________________________________________________________________________________
         @short      Add the listener to the peer.
@@ -751,8 +755,8 @@ protected:
         @onerror    -
     */
 
-    void impl_unadviseFromPeer( const   UNO3_REFERENCE< UNO3_XWINDOW >& xPeer   ,
-                                const   UNO3_TYPE&                      aType   );
+    void impl_unadviseFromPeer( const   CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer   ,
+                                const   CSS_UNO::Type&                          aType   );
 
 //____________________________________________________________________________________________________________
 //  private variables
@@ -760,13 +764,19 @@ protected:
 
 private:
 
-    UNO3_MUTEX                                  m_aMutex            ;
-    UNO3_REFERENCE< UNO3_XWINDOW >              m_xPeer             ;   /// The source of the events. Normally this is the peer object.
-    UNO3_WEAKREFERENCE< UNO3_XWINDOW >          m_xControl          ;
-    UNO3_OMULTITYPEINTERFACECONTAINERHELPER     m_aListenerHolder   ;
+    ::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
 
+// The namespace aliases are only used in this header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+
+
 }   // namespace unocontrols
 
 #endif  // ifndef _UNOCONTROLS_MULTIPLEXER_HXX