Clean up UnoControls/source/controls/ further

...and create ProgressBar directly in ProgressMonitor/StatusIndicator, instead
of going via service manager.

Change-Id: I798e0c415c113cfc65d70ed17cb16aafded41a6d

UnoControls/source/controls/progressbar.cxx

@@ -339,9 +339,8 @@ Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeExcept
 
 const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
 {
-    MutexGuard aGuard( Mutex::getGlobalMutex() );
     Sequence< OUString > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = SERVICENAME_PROGRESSBAR;
+    seqServiceNames[0] = "com.sun.star.awt.XProgressBar";
     return seqServiceNames ;
 }
 
@@ -351,7 +350,7 @@ const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
 
 const OUString ProgressBar::impl_getStaticImplementationName()
 {
-    return OUString(IMPLEMENTATIONNAME_PROGRESSBAR );
+    return OUString("stardiv.UnoControls.ProgressBar");
 }
 
 //____________________________________________________________________________________________________________

UnoControls/source/inc/progressbar.hxx

@@ -31,8 +31,6 @@
 
 namespace unocontrols{
 
-#define SERVICENAME_PROGRESSBAR             "com.sun.star.awt.XProgressBar"
-#define IMPLEMENTATIONNAME_PROGRESSBAR      "stardiv.UnoControls.ProgressBar"
 #define PROGRESSBAR_FREESPACE               4
 #define PROGRESSBAR_DEFAULT_HORIZONTAL      sal_True
 #define PROGRESSBAR_DEFAULT_BLOCKDIMENSION  Size(1,1)

UnoControls/source/inc/progressmonitor.hxx

@@ -57,6 +57,7 @@
 #include <com/sun/star/awt/XCheckBox.hpp>
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
 #include <com/sun/star/awt/XProgressBar.hpp>
+#include <rtl/ref.hxx>
 
 #include <vector>
 
@@ -64,8 +65,8 @@
 
 namespace unocontrols{
 
-#define SERVICENAME_PROGRESSMONITOR                     "com.sun.star.awt.XProgressMonitor"
-#define IMPLEMENTATIONNAME_PROGRESSMONITOR              "stardiv.UnoControls.ProgressMonitor"
+class ProgressBar;
+
 #define PROGRESSMONITOR_FREEBORDER                      10                                                      // border around and between the controls
 #define FIXEDTEXT_SERVICENAME                           "com.sun.star.awt.UnoControlFixedText"
 #define BUTTON_SERVICENAME                              "com.sun.star.awt.UnoControlButton"
@@ -758,7 +759,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText >   m_xTopic_Bottom     ;   // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText >   m_xText_Bottom      ;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XProgressBar > m_xProgressBar      ;
+    rtl::Reference<ProgressBar> m_xProgressBar;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton >      m_xButton           ;
     ::com::sun::star::awt::Rectangle                          m_a3DLine           ;
 

UnoControls/source/inc/statusindicator.hxx

@@ -29,13 +29,14 @@
 #include <com/sun/star/awt/XToolkit.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <rtl/ref.hxx>
 
 #include "basecontainercontrol.hxx"
 
 namespace unocontrols{
 
-#define SERVICENAME_STATUSINDICATOR             "com.sun.star.task.XStatusIndicator"
-#define IMPLEMENTATIONNAME_STATUSINDICATOR      "stardiv.UnoControls.StatusIndicator"
+class ProgressBar;
+
 #define STATUSINDICATOR_FREEBORDER              5                                                       // border around and between the controls
 #define FIXEDTEXT_SERVICENAME                   "com.sun.star.awt.UnoControlFixedText"
 #define FIXEDTEXT_MODELNAME                     "com.sun.star.awt.UnoControlFixedTextModel"
@@ -538,7 +539,7 @@ private:
 private:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText >       m_xText         ;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XProgressBar >     m_xProgressBar  ;
+    rtl::Reference<ProgressBar> m_xProgressBar;
 
 };  // class StatusIndicator