ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:duplicate-defines in UnoControls

Browse Source 
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@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-09-30 13:12:43 +02:00
parent 5d5ec2a1ff
commit 8e2e03b1c3
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnoControls/source/controls/progressmonitor.cxx
+9
View File
@@ -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 )
UnoControls/source/controls/statusindicator.cxx
+5
View File
@@ -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
UnoControls/source/inc/progressmonitor.hxx
-8
View File
@@ -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
UnoControls/source/inc/statusindicator.hxx
-4
View File
@@ -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