loplugin:stringliteraldefine in basctl

Change-Id: Id9f1d2932b5f602602d0229b8dc9794c01f5cbb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125277
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 53 insertions, 51 deletions

diff --git a/basctl/inc/bitmaps.hlst b/basctl/inc/bitmaps.hlst
index 11d35b289d58..b316a2450a39 100644
--- a/basctl/inc/bitmaps.hlst
+++ b/basctl/inc/bitmaps.hlst
@@ -9,19 +9,19 @@
 
 #pragma once
 
-#define RID_BMP_BRKENABLED      "res/im30838.png"
-#define RID_BMP_BRKDISABLED     "res/im30839.png"
-#define RID_BMP_STEPMARKER      "res/im30840.png"
-#define RID_BMP_ERRORMARKER     "res/im30841.png"
-#define RID_BMP_LOCKED          "res/lock.png"
-#define RID_BMP_INSTALLATION    "res/harddisk_16.png"
-#define RID_BMP_DOCUMENT        "res/im30826.png"
-#define RID_BMP_MODLIB          "res/im30820.png"
-#define RID_BMP_MODLIBNOTLOADED "res/im30827.png"
-#define RID_BMP_MODULE          "res/im30821.png"
-#define RID_BMP_MACRO           "res/im30822.png"
-#define RID_BMP_DLGLIB          "res/dialogfolder_16.png"
-#define RID_BMP_DLGLIBNOTLOADED "res/dialogfoldernot_16.png"
-#define RID_BMP_DIALOG          "res/im30823.png"
+inline constexpr OUStringLiteral RID_BMP_BRKENABLED = u"res/im30838.png";
+inline constexpr OUStringLiteral RID_BMP_BRKDISABLED = u"res/im30839.png";
+inline constexpr OUStringLiteral RID_BMP_STEPMARKER = u"res/im30840.png";
+inline constexpr OUStringLiteral RID_BMP_ERRORMARKER = u"res/im30841.png";
+inline constexpr OUStringLiteral RID_BMP_LOCKED = u"res/lock.png";
+inline constexpr OUStringLiteral RID_BMP_INSTALLATION = u"res/harddisk_16.png";
+inline constexpr OUStringLiteral RID_BMP_DOCUMENT = u"res/im30826.png";
+inline constexpr OUStringLiteral RID_BMP_MODLIB = u"res/im30820.png";
+inline constexpr OUStringLiteral RID_BMP_MODLIBNOTLOADED = u"res/im30827.png";
+inline constexpr OUStringLiteral RID_BMP_MODULE = u"res/im30821.png";
+inline constexpr OUStringLiteral RID_BMP_MACRO = u"res/im30822.png";
+inline constexpr OUStringLiteral RID_BMP_DLGLIB = u"res/dialogfolder_16.png";
+inline constexpr OUStringLiteral RID_BMP_DLGLIBNOTLOADED = u"res/dialogfoldernot_16.png";
+inline constexpr OUStringLiteral RID_BMP_DIALOG = u"res/im30823.png";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/basctl/inc/helpids.h b/basctl/inc/helpids.h
index 13e59eb7ef88..28b855ffb602 100644
--- a/basctl/inc/helpids.h
+++ b/basctl/inc/helpids.h
@@ -18,20 +18,22 @@
  */
 #pragma once
 
-#define HID_BASICIDE_OBJECTCAT                            "BASCTL_HID_BASICIDE_OBJECTCAT"
+#include <rtl/string.hxx>
 
-#define HID_BASICIDE_REMOVEWATCH                          "BASCTL_HID_BASICIDE_REMOVEWATCH"
+inline constexpr OStringLiteral HID_BASICIDE_OBJECTCAT = "BASCTL_HID_BASICIDE_OBJECTCAT";
 
-#define HID_BASICIDE_MODULWINDOW                          "BASCTL_HID_BASICIDE_MODULWINDOW"
-#define HID_BASICIDE_DIALOGWINDOW                         "BASCTL_HID_BASICIDE_DIALOGWINDOW"
+inline constexpr OStringLiteral HID_BASICIDE_REMOVEWATCH = "BASCTL_HID_BASICIDE_REMOVEWATCH";
 
-#define HID_BASICIDE_EDITORWINDOW                         "BASCTL_HID_BASICIDE_EDITORWINDOW"
-#define HID_BASICIDE_BREAKPOINTWINDOW                     "BASCTL_HID_BASICIDE_BREAKPOINTWINDOW"
-#define HID_BASICIDE_WATCHWINDOW                          "BASCTL_HID_BASICIDE_WATCHWINDOW"
-#define HID_BASICIDE_STACKWINDOW                          "BASCTL_HID_BASICIDE_STACKWINDOW"
-#define HID_BASICIDE_TABBAR                               "BASCTL_HID_BASICIDE_TABBAR"
-#define HID_BASICIDE_WATCHWINDOW_EDIT                     "BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT"
-#define HID_BASICIDE_WATCHWINDOW_LIST                     "BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"
-#define HID_BASICIDE_STACKWINDOW_LIST                     "BASCTL_HID_BASICIDE_STACKWINDOW_LIST"
+inline constexpr OStringLiteral HID_BASICIDE_MODULWINDOW = "BASCTL_HID_BASICIDE_MODULWINDOW";
+inline constexpr OStringLiteral HID_BASICIDE_DIALOGWINDOW = "BASCTL_HID_BASICIDE_DIALOGWINDOW";
+
+inline constexpr OStringLiteral HID_BASICIDE_EDITORWINDOW = "BASCTL_HID_BASICIDE_EDITORWINDOW";
+inline constexpr OStringLiteral HID_BASICIDE_BREAKPOINTWINDOW = "BASCTL_HID_BASICIDE_BREAKPOINTWINDOW";
+inline constexpr OStringLiteral HID_BASICIDE_WATCHWINDOW = "BASCTL_HID_BASICIDE_WATCHWINDOW";
+inline constexpr OStringLiteral HID_BASICIDE_STACKWINDOW = "BASCTL_HID_BASICIDE_STACKWINDOW";
+inline constexpr OStringLiteral HID_BASICIDE_TABBAR = "BASCTL_HID_BASICIDE_TABBAR";
+inline constexpr OStringLiteral HID_BASICIDE_WATCHWINDOW_EDIT = "BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT";
+inline constexpr OStringLiteral HID_BASICIDE_WATCHWINDOW_LIST = "BASCTL_HID_BASICIDE_WATCHWINDOW_LIST";
+inline constexpr OStringLiteral HID_BASICIDE_STACKWINDOW_LIST = "BASCTL_HID_BASICIDE_STACKWINDOW_LIST";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/inc/strings.hxx b/basctl/inc/strings.hxx
index fc04eae43dc1..335eecb0bf00 100644
--- a/basctl/inc/strings.hxx
+++ b/basctl/inc/strings.hxx
@@ -11,30 +11,30 @@
 
 // Dialog Controls ---------------------------------------------------------------
 
-#define RID_STR_CLASS_CONTROL           "Control"
-#define RID_STR_CLASS_DIALOG            "Dialog"
-#define RID_STR_CLASS_BUTTON            "CommandButton"
-#define RID_STR_CLASS_RADIOBUTTON       "OptionButton"
-#define RID_STR_CLASS_CHECKBOX          "CheckBox"
-#define RID_STR_CLASS_LISTBOX           "ListBox"
-#define RID_STR_CLASS_COMBOBOX          "ComboBox"
-#define RID_STR_CLASS_GROUPBOX          "FrameControl"
-#define RID_STR_CLASS_EDIT              "TextField"
-#define RID_STR_CLASS_FIXEDTEXT         "Label"
-#define RID_STR_CLASS_IMAGECONTROL      "ImageControl"
-#define RID_STR_CLASS_PROGRESSBAR       "ProgressBar"
-#define RID_STR_CLASS_SCROLLBAR         "ScrollBar"
-#define RID_STR_CLASS_FIXEDLINE         "FixedLine"
-#define RID_STR_CLASS_DATEFIELD         "DateField"
-#define RID_STR_CLASS_TIMEFIELD         "TimeField"
-#define RID_STR_CLASS_NUMERICFIELD      "NumericField"
-#define RID_STR_CLASS_CURRENCYFIELD     "CurrencyField"
-#define RID_STR_CLASS_FORMATTEDFIELD    "FormattedField"
-#define RID_STR_CLASS_PATTERNFIELD      "PatternField"
-#define RID_STR_CLASS_FILECONTROL       "FileControl"
-#define RID_STR_CLASS_TREECONTROL       "TreeControl"
-#define RID_STR_CLASS_GRIDCONTROL       "GridControl"
-#define RID_STR_CLASS_SPINCONTROL       "SpinButton"
-#define RID_STR_CLASS_HYPERLINKCONTROL  "HyperlinkControl"
+inline constexpr OUStringLiteral RID_STR_CLASS_CONTROL = u"Control";
+inline constexpr OUStringLiteral RID_STR_CLASS_DIALOG = u"Dialog";
+inline constexpr OUStringLiteral RID_STR_CLASS_BUTTON = u"CommandButton";
+inline constexpr OUStringLiteral RID_STR_CLASS_RADIOBUTTON = u"OptionButton";
+inline constexpr OUStringLiteral RID_STR_CLASS_CHECKBOX = u"CheckBox";
+inline constexpr OUStringLiteral RID_STR_CLASS_LISTBOX = u"ListBox";
+inline constexpr OUStringLiteral RID_STR_CLASS_COMBOBOX = u"ComboBox";
+inline constexpr OUStringLiteral RID_STR_CLASS_GROUPBOX = u"FrameControl";
+inline constexpr OUStringLiteral RID_STR_CLASS_EDIT = u"TextField";
+inline constexpr OUStringLiteral RID_STR_CLASS_FIXEDTEXT = u"Label";
+inline constexpr OUStringLiteral RID_STR_CLASS_IMAGECONTROL = u"ImageControl";
+inline constexpr OUStringLiteral RID_STR_CLASS_PROGRESSBAR = u"ProgressBar";
+inline constexpr OUStringLiteral RID_STR_CLASS_SCROLLBAR = u"ScrollBar";
+inline constexpr OUStringLiteral RID_STR_CLASS_FIXEDLINE = u"FixedLine";
+inline constexpr OUStringLiteral RID_STR_CLASS_DATEFIELD = u"DateField";
+inline constexpr OUStringLiteral RID_STR_CLASS_TIMEFIELD = u"TimeField";
+inline constexpr OUStringLiteral RID_STR_CLASS_NUMERICFIELD = u"NumericField";
+inline constexpr OUStringLiteral RID_STR_CLASS_CURRENCYFIELD = u"CurrencyField";
+inline constexpr OUStringLiteral RID_STR_CLASS_FORMATTEDFIELD = u"FormattedField";
+inline constexpr OUStringLiteral RID_STR_CLASS_PATTERNFIELD = u"PatternField";
+inline constexpr OUStringLiteral RID_STR_CLASS_FILECONTROL = u"FileControl";
+inline constexpr OUStringLiteral RID_STR_CLASS_TREECONTROL = u"TreeControl";
+inline constexpr OUStringLiteral RID_STR_CLASS_GRIDCONTROL = u"GridControl";
+inline constexpr OUStringLiteral RID_STR_CLASS_SPINCONTROL = u"SpinButton";
+inline constexpr OUStringLiteral RID_STR_CLASS_HYPERLINKCONTROL = u"HyperlinkControl";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */