com::sun::star->css in UnoControls/

and remove some noise comments

Change-Id: I290ec365b58fa1b21838a6faf84006434c3e7bbd
Reviewed-on: https://gerrit.libreoffice.org/19904
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

9 files changed, 196 insertions, 849 deletions

diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 79c5fd6fc48a..d4ce1532c18d 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -718,7 +718,7 @@ const OUString BaseControl::impl_getStaticImplementationName()
 
 WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
 {
-    // - used from "createPeer()" to set the values of an ::com::sun::star::awt::WindowDescriptor !!!
+    // - used from "createPeer()" to set the values of an css::awt::WindowDescriptor !!!
     // - if you will change the descriptor-values, you must override this virtuell function
     // - the caller must release the memory for this dynamical descriptor !!!
 
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index a1b56331af23..63751364e5ff 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -312,7 +312,7 @@ sal_Bool FrameControl::convertFastPropertyValue(        Any&        rConvertedVa
 
 void FrameControl::setFastPropertyValue_NoBroadcast(            sal_Int32   nHandle ,
                                                         const   Any&        rValue  )
-                                                        throw ( ::com::sun::star::uno::Exception, std::exception )
+                                                        throw ( css::uno::Exception, std::exception )
 {
     // this method only set the value
     MutexGuard  aGuard (m_aMutex);
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 571d5edea997..75b5c87ee053 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -373,7 +373,7 @@ const OUString StatusIndicator::impl_getStaticImplementationName()
 
 WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const css::uno::Reference< XWindowPeer >& xParentPeer )
 {
-    // - used from "createPeer()" to set the values of an ::com::sun::star::awt::WindowDescriptor !!!
+    // - used from "createPeer()" to set the values of an css::awt::WindowDescriptor !!!
     // - if you will change the descriptor-values, you must override this virtuell function
     // - the caller must release the memory for this dynamical descriptor !!!
 
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 5ea65d92da6a..698c5102552c 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -31,44 +31,14 @@ namespace unocontrols{
 
 //  class declaration OConnectionPointContainerHelper
 
-class OConnectionPointContainerHelper   :   public  ::com::sun::star::lang::XConnectionPointContainer
+class OConnectionPointContainerHelper   :   public  css::lang::XConnectionPointContainer
                                         ,   public  ::cppu::OWeakObject
 {
 
-//  public methods
-
 public:
 
-    //  construct/destruct
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
     OConnectionPointContainerHelper( ::osl::Mutex& aMutex );
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
     virtual ~OConnectionPointContainerHelper();
 
     //  XInterface
@@ -86,8 +56,8 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -109,74 +79,22 @@ public:
 
     //  XConnectionPointContainer
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint(
-        const ::com::sun::star::uno::Type& aType
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
+    virtual css::uno::Reference< css::lang::XConnectionPoint > SAL_CALL queryConnectionPoint(
+        const css::uno::Type& aType
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL advise(
-        const   ::com::sun::star::uno::Type&                              aType ,
-        const   ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&  xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
+        const   css::uno::Type&                              aType ,
+        const   css::uno::Reference< css::uno::XInterface >&  xListener
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL unadvise(
-        const   ::com::sun::star::uno::Type&                              aType       ,
-        const   ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&  xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        const   css::uno::Type&                              aType       ,
+        const   css::uno::Reference< css::uno::XInterface >&  xListener
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     //  public but impl method!
     //  Is necessary to get container member at OConnectionPoint-instance.
@@ -185,8 +103,6 @@ public:
     ::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer() { return m_aMultiTypeContainer; }
 
 
-//  private variables
-
 private:
 
     ::osl::Mutex&                                   m_aSharedMutex;
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index 2aead8160699..f686ef8e6409 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -34,45 +34,15 @@ namespace unocontrols{
 
 //  class declaration OConnectionPointHelper
 
-class OConnectionPointHelper    :   public  ::com::sun::star::lang::XConnectionPoint
+class OConnectionPointHelper    :   public  css::lang::XConnectionPoint
                                 ,   public  ::cppu::OWeakObject
 {
 
-//  public methods
-
 public:
 
-    //  construct/destruct
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
     OConnectionPointHelper( ::osl::Mutex&                       aMutex                      ,
                             OConnectionPointContainerHelper*    pContainerImplementation    ,
-                            ::com::sun::star::uno::Type                       aType                       );
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
+                            css::uno::Type                       aType                       );
 
     virtual ~OConnectionPointHelper();
 
@@ -91,8 +61,8 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -114,135 +84,40 @@ public:
 
     //  XConnectionPoint
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    virtual ::com::sun::star::uno::Type SAL_CALL getConnectionType()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
+    virtual css::uno::Type SAL_CALL getConnectionType()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
-        @param
-
-        @return
-
-        @onerror
-    */
+    virtual css::uno::Reference< css::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL advise(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener
+        const css::uno::Reference< css::uno::XInterface >& xListener
     ) throw (
-        ::com::sun::star::lang::ListenerExistException,
-        ::com::sun::star::lang::InvalidListenerException ,
-        ::com::sun::star::uno::RuntimeException, std::exception
+        css::lang::ListenerExistException,
+        css::lang::InvalidListenerException ,
+        css::uno::RuntimeException, std::exception
     ) override;
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
+    virtual void SAL_CALL unadvise( const css::uno::Reference< css::uno::XInterface >& xListener )
+        throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getConnections()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-//  private methods
+    virtual css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > SAL_CALL getConnections()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
 private:
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
     bool impl_LockContainer();
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
     void impl_UnlockContainer();
 
-//  private variables
-
 private:
 
-    ::osl::Mutex&                                                   m_aSharedMutex;
-    ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XConnectionPointContainer >   m_oContainerWeakReference;   // Reference to container-class!. Don't use Reference<...>
+    ::osl::Mutex&                                                     m_aSharedMutex;
+    css::uno::WeakReference< css::lang::XConnectionPointContainer >   m_oContainerWeakReference;   // Reference to container-class!. Don't use Reference<...>
                                                                                             // It is a ring-reference => and must be a wekreference!
-    OConnectionPointContainerHelper*                                m_pContainerImplementation;
-    ::com::sun::star::uno::Type                                                   m_aInterfaceType;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >                       m_xLock;
+    OConnectionPointContainerHelper*                                  m_pContainerImplementation;
+    css::uno::Type                                                    m_aInterfaceType;
+    css::uno::Reference< css::uno::XInterface >                       m_xLock;
 
 };  // class OConnectionPointHelper
 
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index 7ae1880ee5cc..e17fea7701f2 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -49,8 +49,8 @@ namespace unocontrols{
 
 //  class
 
-class FrameControl  : public ::com::sun::star::awt::XControlModel
-                    , public ::com::sun::star::lang::XConnectionPointContainer
+class FrameControl  : public css::awt::XControlModel
+                    , public css::lang::XConnectionPointContainer
                     , public BaseControl                                // This order is necessary for right initialization of m_aMutex!
                     , public ::cppu::OBroadcastHelper
                     , public ::cppu::OPropertySetHelper
@@ -62,15 +62,15 @@ public:
 
     //  construct/destruct
 
-    FrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+    FrameControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     virtual ~FrameControl();
 
     //  XInterface
 
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-        const ::com::sun::star::uno::Type& aType
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface(
+        const css::uno::Type& aType
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -92,14 +92,14 @@ public:
 
     //  XTypeProvider
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XAggregation
 
-    ::com::sun::star::uno::Any SAL_CALL queryAggregation(
-        const ::com::sun::star::uno::Type& aType
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    css::uno::Any SAL_CALL queryAggregation(
+        const css::uno::Type& aType
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override;
@@ -110,52 +110,52 @@ public:
     //  XControl
 
     virtual void SAL_CALL createPeer(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >&      xToolkit ,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >&   xParent
-    ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::awt::XToolkit >&      xToolkit ,
+        const css::uno::Reference< css::awt::XWindowPeer >&   xParent
+    ) throw ( css::uno::RuntimeException, std::exception ) override;
 
     virtual sal_Bool SAL_CALL setModel(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::awt::XControlModel >& xModel
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XComponent
 
-    virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XView
 
     virtual sal_Bool SAL_CALL setGraphics(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xDevice
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::awt::XGraphics >& xDevice
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XConnectionPointContainer
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint(
-        const ::com::sun::star::uno::Type& aType
-    ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::lang::XConnectionPoint > SAL_CALL queryConnectionPoint(
+        const css::uno::Type& aType
+    ) throw ( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL advise(
-        const ::com::sun::star::uno::Type&                                aType       ,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&    xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        const css::uno::Type&                                aType       ,
+        const css::uno::Reference< css::uno::XInterface >&    xListener
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL unadvise(
-        const ::com::sun::star::uno::Type&                                aType ,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&    xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        const css::uno::Type&                                aType ,
+        const css::uno::Reference< css::uno::XInterface >&    xListener
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     //  impl but public methods to register service!
 
-    static const ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
+    static const css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
 
     static const OUString impl_getStaticImplementationName();
 
@@ -167,54 +167,54 @@ protected:
     //  OPropertySetHelper
 
     virtual sal_Bool SAL_CALL convertFastPropertyValue(
-        ::com::sun::star::uno::Any&       rConvertedValue   ,
-        ::com::sun::star::uno::Any&       rOldValue         ,
+        css::uno::Any&       rConvertedValue   ,
+        css::uno::Any&       rOldValue         ,
         sal_Int32           nHandle           ,
-        const ::com::sun::star::uno::Any& rValue
-    ) throw( ::com::sun::star::lang::IllegalArgumentException ) override;
+        const css::uno::Any& rValue
+    ) throw( css::lang::IllegalArgumentException ) override;
 
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
         sal_Int32 nHandle ,
-        const ::com::sun::star::uno::Any& rValue
-    ) throw ( ::com::sun::star::uno::Exception, std::exception ) override;
+        const css::uno::Any& rValue
+    ) throw ( css::uno::Exception, std::exception ) override;
 
-    virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any&   rValue  ,
+    virtual void SAL_CALL getFastPropertyValue( css::uno::Any&   rValue  ,
                                                 sal_Int32       nHandle ) const override;
 
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     //  XPropertySet
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  BaseControl
 
-    virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer
+    virtual css::awt::WindowDescriptor* impl_getWindowDescriptor(
+        const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer
     ) override;
 
 //  private methods
 
 private:
 
-    void impl_createFrame(  const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >&       xPeer           ,
+    void impl_createFrame(  const css::uno::Reference< css::awt::XWindowPeer >&       xPeer           ,
                             const OUString&                                         sURL            ,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    seqArguments    );
+                            const css::uno::Sequence< css::beans::PropertyValue >&    seqArguments    );
 
     void impl_deleteFrame();
 
-    static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+    static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
 //  private variables
 
 private:
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 >        m_xFrame;
-    OUString                                                                    m_sComponentURL;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >   m_seqLoaderArguments;
-    ::cppu::OMultiTypeInterfaceContainerHelper                                  m_aInterfaceContainer;
-    css::uno::Reference<OConnectionPointContainerHelper>                        m_aConnectionPointContainer;
+    css::uno::Reference< css::frame::XFrame2 >              m_xFrame;
+    OUString                                                m_sComponentURL;
+    css::uno::Sequence< css::beans::PropertyValue >         m_seqLoaderArguments;
+    ::cppu::OMultiTypeInterfaceContainerHelper              m_aInterfaceContainer;
+    css::uno::Reference<OConnectionPointContainerHelper>    m_aConnectionPointContainer;
 
 };  // class FrameControl
 
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index 8beee8c6c5df..5e2046376174 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -43,64 +43,21 @@ namespace unocontrols{
 #define PROGRESSBAR_LINECOLOR_BRIGHT        TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )    // white
 #define PROGRESSBAR_LINECOLOR_SHADOW        TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )    // black
 
-class ProgressBar   : public ::com::sun::star::awt::XControlModel
-                    , public ::com::sun::star::awt::XProgressBar
+class ProgressBar   : public css::awt::XControlModel
+                    , public css::awt::XProgressBar
                     , public BaseControl
 {
 
-//  public methods
-
 public:
 
-    //  construct/destruct
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    ProgressBar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
+    ProgressBar( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     virtual ~ProgressBar();
 
     //  XInterface
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -122,256 +79,70 @@ public:
 
     //  XTypeProvider
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XAggregation
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType )
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XProgressBar
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
     virtual void SAL_CALL setForegroundColor( sal_Int32 nColor )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
+        throw( css::uno::RuntimeException, std::exception ) override;
 
-        @param
-
-        @return
-
-        @onerror
-    */
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL setRange(
         sal_Int32   nMin    ,
         sal_Int32   nMax
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
-        @onerror
-    */
-
-    virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getValue() throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XWindow
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
     virtual void SAL_CALL setPosSize(
         sal_Int32   nX      ,
         sal_Int32   nY      ,
         sal_Int32   nWidth  ,
         sal_Int32   nHeight ,
         sal_Int16   nFlags
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XControl
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
     virtual sal_Bool SAL_CALL setModel(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
+        const css::uno::Reference< css::awt::XControlModel >& xModel
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  BaseControl
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    static const ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
-
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
+    static const css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
 
     static const OUString impl_getStaticImplementationName();
 
-//  protected methods
-
 protected:
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
     virtual void impl_paint(
         sal_Int32 nX ,
         sal_Int32 nY ,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics
+        const css::uno::Reference< css::awt::XGraphics >& xGraphics
     ) override;
 
-    /**_________________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
     void impl_recalcRange();
 
-//  private variables
-
 private:
 
-    bool        m_bHorizontal;   // orientation for steps            [true=horizontal/false=vertikal]
-    ::com::sun::star::awt::Size   m_aBlockSize;   // width and height of a block      [>=0,0]
+    bool            m_bHorizontal;   // orientation for steps            [true=horizontal/false=vertikal]
+    css::awt::Size  m_aBlockSize;   // width and height of a block      [>=0,0]
     sal_Int32       m_nForegroundColor;   //                                  (alpha,r,g,b)
     sal_Int32       m_nBackgroundColor;   //                                  (alpha,r,g,b)
     sal_Int32       m_nMinRange;   // lowest value  =   0%             [long, <_nMaxRange]
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 6f21b7111f67..2879b920d67c 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -94,45 +94,15 @@ struct IMPL_TextlistItem
 
 //  class declaration
 
-class ProgressMonitor   : public ::com::sun::star::awt::XLayoutConstrains
-                        , public ::com::sun::star::awt::XButton
-                        , public ::com::sun::star::awt::XProgressMonitor
+class ProgressMonitor   : public css::awt::XLayoutConstrains
+                        , public css::awt::XButton
+                        , public css::awt::XProgressMonitor
                         , public BaseContainerControl
 {
 
-//  public methods
-
 public:
 
-    //  construct/destruct
-
-    /**_______________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
-
-    ProgressMonitor( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-
-    /**_______________________________________________________________________________________________________
-        @short
-        @descr
-
-        @seealso
-
-        @param
-
-        @return
-
-        @onerror
-    */
+    ProgressMonitor( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     virtual ~ProgressMonitor();
 
@@ -151,8 +121,8 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -182,15 +152,12 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XAggregation
 
-    /**_______________________________________________________________________________________________________
-    */
-
-    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType )
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XProgressMonitor
 
@@ -215,209 +182,125 @@ public:
         const OUString& sTopic ,
         const OUString& sText ,
         sal_Bool bbeforeProgress
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_______________________________________________________________________________________________________
-    */
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL removeText(
         const OUString& sTopic ,
         sal_Bool bbeforeProgress
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_______________________________________________________________________________________________________
-    */
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL updateText(
         const OUString&  sTopic ,
         const OUString&  sText ,
         sal_Bool bbeforeProgress
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XProgressBar
 
-    /**_______________________________________________________________________________________________________
-    */
-
-    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    /**_______________________________________________________________________________________________________
-    */
+    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_______________________________________________________________________________________________________
-    */
-
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_______________________________________________________________________________________________________
-    */
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL setRange( sal_Int32   nMin    ,
-                                    sal_Int32   nMax    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                                    sal_Int32   nMax    ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    /**_______________________________________________________________________________________________________
-    */
-
-    virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getValue() throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XButton
 
-    /**_______________________________________________________________________________________________________
-    */
-
     virtual void SAL_CALL addActionListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_______________________________________________________________________________________________________
-    */
+        const css::uno::Reference< css::awt::XActionListener >& xListener
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL removeActionListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_______________________________________________________________________________________________________
-    */
+        const css::uno::Reference< css::awt::XActionListener >& xListener
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual void SAL_CALL setLabel( const OUString& sLabel ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_______________________________________________________________________________________________________
-    */
+    virtual void SAL_CALL setLabel( const OUString& sLabel ) throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL setActionCommand( const OUString& sCommand )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XLayoutConstrains
 
-    /**_______________________________________________________________________________________________________
-    */
+    virtual css::awt::Size SAL_CALL getMinimumSize() throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getPreferredSize() throw( css::uno::RuntimeException, std::exception ) override;
 
-    /**_______________________________________________________________________________________________________
-    */
-
-    virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_______________________________________________________________________________________________________
-    */
-
-    virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize )
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XControl
 
-    /**_______________________________________________________________________________________________________
-    */
-
     virtual void SAL_CALL createPeer(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit     >& xToolkit ,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer  >& xParent
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::awt::XToolkit     >& xToolkit ,
+        const css::uno::Reference< css::awt::XWindowPeer  >& xParent
+    ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    /**_______________________________________________________________________________________________________
-    */
-
-    virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-    /**_______________________________________________________________________________________________________
-    */
+    virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel )
+        throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XComponent
 
-    /**_______________________________________________________________________________________________________
-    */
-
-    virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
 
     //  XWindow
 
-    /**_______________________________________________________________________________________________________
-    */
-
     virtual void SAL_CALL setPosSize(   sal_Int32   nX      ,
                                         sal_Int32   nY      ,
                                         sal_Int32   nWidth  ,
                                         sal_Int32   nHeight ,
-                                        sal_Int16   nFlags  ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                                        sal_Int16   nFlags  ) throw( css::uno::RuntimeException, std::exception ) override;
 
     //  BaseControl
 
-    /**_______________________________________________________________________________________________________
-    */
-
-    static const ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
-
-    /**_______________________________________________________________________________________________________
-    */
+    static const css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
 
     static const OUString impl_getStaticImplementationName();
 
-//  protected methods
-
 protected:
 
-    /**_______________________________________________________________________________________________________
-    */
-
     virtual void impl_paint( sal_Int32 nX ,
                              sal_Int32 nY ,
-                             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics ) override;
-
-// private methods
+                             const css::uno::Reference< css::awt::XGraphics >& xGraphics ) override;
 
 private:
     using BaseControl::impl_recalcLayout;
-    /**_______________________________________________________________________________________________________
-    */
 
     void impl_recalcLayout();
 
-    /**_______________________________________________________________________________________________________
-    */
-
     void impl_rebuildFixedText();
 
-    /**_______________________________________________________________________________________________________
-    */
-
     void impl_cleanMemory();
 
-    /**_______________________________________________________________________________________________________
-    */
-
     IMPL_TextlistItem* impl_searchTopic( const OUString& sTopic , bool bbeforeProgress );
 
 // debug methods
 
 private:
 
-    /**_______________________________________________________________________________________________________
-    */
-
     static bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText, bool bbeforeProgress );    // addText, updateText
     static bool impl_debug_checkParameter( const OUString& rTopic, bool bbeforeProgress );                              // removeText
 
 // private variables
 
 private:
-    ::std::vector < IMPL_TextlistItem* >        maTextlist_Top;         // Elements before progress
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText >   m_xTopic_Top;   // (used, if parameter "beforeProgress"=true in "addText, updateText, removeText")
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText >   m_xText_Top;
+    ::std::vector < IMPL_TextlistItem* >          maTextlist_Top;         // Elements before progress
+    css::uno::Reference< css::awt::XFixedText >   m_xTopic_Top;   // (used, if parameter "beforeProgress"=true in "addText, updateText, removeText")
+    css::uno::Reference< css::awt::XFixedText >   m_xText_Top;
 
-    ::std::vector < IMPL_TextlistItem* >        maTextlist_Bottom;      // Elements below of progress
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText >   m_xTopic_Bottom;   // (used, if parameter "beforeProgress"=false in "addText, updateText, removeText")
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText >   m_xText_Bottom;
+    ::std::vector < IMPL_TextlistItem* >          maTextlist_Bottom;      // Elements below of progress
+    css::uno::Reference< css::awt::XFixedText >   m_xTopic_Bottom;   // (used, if parameter "beforeProgress"=false in "addText, updateText, removeText")
+    css::uno::Reference< css::awt::XFixedText >   m_xText_Bottom;
 
-    rtl::Reference<ProgressBar> m_xProgressBar;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton >      m_xButton;
-    ::com::sun::star::awt::Rectangle                          m_a3DLine;
+    rtl::Reference<ProgressBar>                   m_xProgressBar;
+    css::uno::Reference< css::awt::XButton >      m_xButton;
+    css::awt::Rectangle                           m_a3DLine;
 
 };  // class ProgressMonitor
 
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index 5570624fed56..a2a6c6d1bee9 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -52,44 +52,14 @@ class ProgressBar;
 
 //  class declaration
 
-class StatusIndicator   : public ::com::sun::star::awt::XLayoutConstrains
-                        , public ::com::sun::star::task::XStatusIndicator
+class StatusIndicator   : public css::awt::XLayoutConstrains
+                        , public css::task::XStatusIndicator
                         , public BaseContainerControl
 {
 
-    //  public methods
-
     public:
 
-        //  construct/destruct
-
-        /**_______________________________________________________________________________________________________
-            @short
-            @descr
-
-            @seealso
-
-            @param
-
-            @return
-
-            @onerror
-        */
-
-        StatusIndicator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-
-        /**_______________________________________________________________________________________________________
-            @short
-            @descr
-
-            @seealso
-
-            @param
-
-            @return
-
-            @onerror
-        */
+        StatusIndicator( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
         virtual ~StatusIndicator();
 
@@ -108,8 +78,8 @@ class StatusIndicator   : public ::com::sun::star::awt::XLayoutConstrains
             @onerror    A RuntimeException is thrown.
         */
 
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+            throw( css::uno::RuntimeException, std::exception ) override;
 
         /**_______________________________________________________________________________________________________
             @short      increment refcount
@@ -139,155 +109,87 @@ class StatusIndicator   : public ::com::sun::star::awt::XLayoutConstrains
             @onerror    A RuntimeException is thrown.
         */
 
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
-            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+            throw( css::uno::RuntimeException, std::exception ) override;
 
         //  XAggregation
 
-        /**_______________________________________________________________________________________________________
-        */
-
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType )
-            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType )
+            throw( css::uno::RuntimeException, std::exception ) override;
 
         //  XStatusIndicator
 
-        /*-****************************************************************************************************
-        *//*-*****************************************************************************************************/
-
         virtual void SAL_CALL start(
             const OUString&  sText   ,
             sal_Int32 nRange
-        ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-        /*-****************************************************************************************************
-        *//*-*****************************************************************************************************/
-
-        virtual void SAL_CALL end() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-        /*-****************************************************************************************************
-        *//*-*****************************************************************************************************/
+        ) throw( css::uno::RuntimeException, std::exception ) override;
 
-        virtual void SAL_CALL reset() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL end() throw( css::uno::RuntimeException, std::exception ) override;
 
-        /*-****************************************************************************************************
-        *//*-*****************************************************************************************************/
+        virtual void SAL_CALL reset() throw( css::uno::RuntimeException, std::exception ) override;
 
-        virtual void SAL_CALL setText( const OUString& sText ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setText( const OUString& sText ) throw( css::uno::RuntimeException, std::exception ) override;
 
-        /*-****************************************************************************************************
-        *//*-*****************************************************************************************************/
-
-        virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override;
 
         //  XLayoutConstrains
 
-        /**_______________________________________________________________________________________________________
-        */
+        virtual css::awt::Size SAL_CALL getMinimumSize() throw( css::uno::RuntimeException, std::exception ) override;
 
-        virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual css::awt::Size SAL_CALL getPreferredSize() throw( css::uno::RuntimeException, std::exception ) override;
 
-        /**_______________________________________________________________________________________________________
-        */
-
-        virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-        /**_______________________________________________________________________________________________________
-        */
-
-        virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize )
-            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize )
+            throw( css::uno::RuntimeException, std::exception ) override;
 
         //  XControl
 
-        /**_______________________________________________________________________________________________________
-        */
-
         virtual void SAL_CALL createPeer(
-            const   ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >&    xToolkit    ,
-            const   ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent
-        ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+            const   css::uno::Reference< css::awt::XToolkit >&    xToolkit    ,
+            const   css::uno::Reference< css::awt::XWindowPeer >& xParent
+        ) throw( css::uno::RuntimeException, std::exception ) override;
 
-        /**_______________________________________________________________________________________________________
-        */
+        virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel )
+            throw( css::uno::RuntimeException, std::exception ) override;
 
-        virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel )
-            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-        /**_______________________________________________________________________________________________________
-        */
-
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
-            throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
+            throw( css::uno::RuntimeException, std::exception ) override;
 
         //  XComponent
 
-        /**_______________________________________________________________________________________________________
-        */
-
-        virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
 
         //  XWindow
 
-        /**_______________________________________________________________________________________________________
-        */
-
         virtual void SAL_CALL setPosSize(   sal_Int32   nX      ,
                                             sal_Int32   nY      ,
                                             sal_Int32   nWidth  ,
                                             sal_Int32   nHeight ,
-                                            sal_Int16   nFlags  ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                                            sal_Int16   nFlags  ) throw( css::uno::RuntimeException, std::exception ) override;
 
         //  BaseControl
 
-        /**_______________________________________________________________________________________________________
-        */
-
-        static const ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
-
-        /**_______________________________________________________________________________________________________
-        */
+        static const css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
 
         static const OUString impl_getStaticImplementationName();
 
-//  protected methods
-
 protected:
 
-        /**_______________________________________________________________________________________________________
-        */
-
-        virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer
+        virtual css::awt::WindowDescriptor* impl_getWindowDescriptor(
+            const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer
         ) override;
 
-        /**_______________________________________________________________________________________________________
-        */
-
         virtual void impl_paint (
             sal_Int32 nX,
             sal_Int32 nY,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > & rGraphics
+            const css::uno::Reference< css::awt::XGraphics > & rGraphics
         ) override;
 
-        /**_______________________________________________________________________________________________________
-        */
-
-        virtual void impl_recalcLayout( const ::com::sun::star::awt::WindowEvent& aEvent ) override;
-
-// debug methods
-
-private:
-
-    /**_______________________________________________________________________________________________________
-    */
-
-// private variables
+        virtual void impl_recalcLayout( const css::awt::WindowEvent& aEvent ) override;
 
 private:
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText >       m_xText;
-    rtl::Reference<ProgressBar> m_xProgressBar;
+    css::uno::Reference< css::awt::XFixedText >   m_xText;
+    rtl::Reference<ProgressBar>                   m_xProgressBar;
 
 };  // class StatusIndicator