[Libreoffice-commits] core.git: UnoControls/source

[Noel Grandin (via logerrit)]

 UnoControls/source/controls/progressmonitor.cxx |    9 +++++++++
 UnoControls/source/controls/statusindicator.cxx |    5 +++++
 UnoControls/source/inc/progressmonitor.hxx      |    8 --------
 UnoControls/source/inc/statusindicator.hxx      |    4 ----
 4 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 8e2e03b1c36375735c4fcfa44ba762d0cbc4ef29
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Sep 30 09:48:30 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Sep 30 13:12:43 2019 +0200

    loplugin:duplicate-defines in UnoControls
    
    these are only used by internal code, so move inside the relevant .cxx
    file
    
    Change-Id: If7cdf17a49ff3089ad2100961092dd2747523a8d
    Reviewed-on: https://gerrit.libreoffice.org/79830
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index f973bc89c072..76633befd14d 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -39,6 +39,15 @@ using namespace ::com::sun::star::awt;
 using ::std::vector;
 using ::std::find;
 
+#define FIXEDTEXT_SERVICENAME                   "com.sun.star.awt.UnoControlFixedText"
+#define FIXEDTEXT_MODELNAME                     "com.sun.star.awt.UnoControlFixedTextModel"
+#define CONTROLNAME_TEXT                        "Text"   // identifier the control in container
+#define CONTROLNAME_PROGRESSBAR                 "ProgressBar"
+#define BUTTON_SERVICENAME                      "com.sun.star.awt.UnoControlButton"
+#define CONTROLNAME_BUTTON                      "Button"
+#define BUTTON_MODELNAME                        "com.sun.star.awt.UnoControlButtonModel"
+#define DEFAULT_BUTTONLABEL                     "Abbrechen"
+
 namespace unocontrols {
 
 ProgressMonitor::ProgressMonitor( const css::uno::Reference< XComponentContext >& rxContext )
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 7ac0cd9a4b40..033c787d01c2 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -34,6 +34,11 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::task;
 
+#define FIXEDTEXT_SERVICENAME                   "com.sun.star.awt.UnoControlFixedText"
+#define FIXEDTEXT_MODELNAME                     "com.sun.star.awt.UnoControlFixedTextModel"
+#define CONTROLNAME_TEXT                        "Text" // identifier the control in container
+#define CONTROLNAME_PROGRESSBAR                 "ProgressBar" //              -||-
+
 namespace unocontrols {
 
 //  construct/destruct
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 38ad0adcc3ae..339b6e6cb6cc 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -38,14 +38,6 @@ namespace unocontrols {
 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"
-#define FIXEDTEXT_MODELNAME                             "com.sun.star.awt.UnoControlFixedTextModel"
-#define BUTTON_MODELNAME                                "com.sun.star.awt.UnoControlButtonModel"
-#define CONTROLNAME_TEXT                                "Text"                                                  // identifier the control in container
-#define CONTROLNAME_BUTTON                              "Button"                                                //              -||-
-#define CONTROLNAME_PROGRESSBAR                         "ProgressBar"                                           //              -||-
-#define DEFAULT_BUTTONLABEL                             "Abbrechen"
 #define PROGRESSMONITOR_DEFAULT_TOPIC                   ""
 #define PROGRESSMONITOR_DEFAULT_TEXT                    ""
 #define PROGRESSMONITOR_LINECOLOR_BRIGHT                sal_Int32(Color( 0x00, 0xFF, 0xFF, 0xFF ))             // white
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index 884034c1747b..daff3e169b47 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -37,10 +37,6 @@ namespace unocontrols {
 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"
-#define CONTROLNAME_TEXT                        "Text"                                                  // identifier the control in container
-#define CONTROLNAME_PROGRESSBAR                 "ProgressBar"                                           //              -||-
 #define STATUSINDICATOR_BACKGROUNDCOLOR         sal_Int32(Color( 0x00, 0xC0, 0xC0, 0xC0 ))              // lightgray
 #define STATUSINDICATOR_LINECOLOR_BRIGHT        sal_Int32(Color( 0x00, 0xFF, 0xFF, 0xFF ))              // white
 #define STATUSINDICATOR_LINECOLOR_SHADOW        sal_Int32(Color( 0x00, 0x00, 0x00, 0x00 ))              // black