loplugin:stringliteraldefine in sw

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

5 files changed, 115 insertions, 114 deletions

diff --git a/sw/inc/bitmaps.hlst b/sw/inc/bitmaps.hlst
index 2a7495d70896..f2b9f5ab6f9b 100644
--- a/sw/inc/bitmaps.hlst
+++ b/sw/inc/bitmaps.hlst
@@ -6,52 +6,52 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+#pragma once
 
-#ifndef INCLUDED_SW_INC_BITMAPS_HRC
-#define INCLUDED_SW_INC_BITMAPS_HRC
+#include <rtl/ustring.hxx>
 
-#define BMP_PAGE_SHADOW_MASK                    "sw/res/page-shadow-mask.png"
+inline constexpr OUStringLiteral BMP_PAGE_SHADOW_MASK = u"sw/res/page-shadow-mask.png";
 
-#define BMP_STYLES_FAMILY_PARA                  "sw/res/sf01.png"
-#define BMP_STYLES_FAMILY_CHAR                  "sw/res/sf02.png"
-#define BMP_STYLES_FAMILY_FRAME                 "sw/res/sf03.png"
-#define BMP_STYLES_FAMILY_PAGE                  "sw/res/sf04.png"
-#define BMP_STYLES_FAMILY_LIST                  "sw/res/sf05.png"
-#define BMP_STYLES_FAMILY_TABLE                 "sw/res/sf06.png"
-#define RID_GRAPHIC_REPLACEBMP                  "res/grafikei.png"
-#define RID_GRAPHIC_ERRORBMP                    "res/grafikde.png"
+inline constexpr OUStringLiteral BMP_STYLES_FAMILY_PARA = u"sw/res/sf01.png";
+inline constexpr OUStringLiteral BMP_STYLES_FAMILY_CHAR = u"sw/res/sf02.png";
+inline constexpr OUStringLiteral BMP_STYLES_FAMILY_FRAME = u"sw/res/sf03.png";
+inline constexpr OUStringLiteral BMP_STYLES_FAMILY_PAGE = u"sw/res/sf04.png";
+inline constexpr OUStringLiteral BMP_STYLES_FAMILY_LIST = u"sw/res/sf05.png";
+inline constexpr OUStringLiteral BMP_STYLES_FAMILY_TABLE = u"sw/res/sf06.png";
+inline constexpr OUStringLiteral RID_GRAPHIC_REPLACEBMP = u"res/grafikei.png";
+inline constexpr OUStringLiteral RID_GRAPHIC_ERRORBMP = u"res/grafikde.png";
 
-#define BMP_REDLINE_INSERTED                    "sw/res/redline_inserted.png"
-#define BMP_REDLINE_DELETED                     "sw/res/redline_deleted.png"
-#define BMP_REDLINE_FORMATTED                   "sw/res/redline_formatted.png"
-#define BMP_REDLINE_TABLECHG                    "sw/res/redline_tablechg.png"
-#define BMP_REDLINE_FMTCOLLSET                  "sw/res/redline_fmtcollset.png"
-#define BMP_REDLINE_MOVED_INSERTION             "cmd/sc_paste.png"
-#define BMP_REDLINE_MOVED_DELETION              "cmd/sc_cut.png"
+inline constexpr OUStringLiteral BMP_REDLINE_INSERTED = u"sw/res/redline_inserted.png";
+inline constexpr OUStringLiteral BMP_REDLINE_DELETED = u"sw/res/redline_deleted.png";
+inline constexpr OUStringLiteral BMP_REDLINE_FORMATTED = u"sw/res/redline_formatted.png";
+inline constexpr OUStringLiteral BMP_REDLINE_TABLECHG = u"sw/res/redline_tablechg.png";
+inline constexpr OUStringLiteral BMP_REDLINE_FMTCOLLSET = u"sw/res/redline_fmtcollset.png";
+inline constexpr OUStringLiteral BMP_REDLINE_MOVED_INSERTION = u"cmd/sc_paste.png";
+inline constexpr OUStringLiteral BMP_REDLINE_MOVED_DELETION = u"cmd/sc_cut.png";
 
 #define RID_BMP_COLLAPSE                        "res/sx18002.png"
 #define RID_BMP_EXPAND                          "res/sx18003.png"
-#define RID_BMP_DB                              "sw/res/sx01.png"
-#define RID_BMP_DBTABLE                         "sw/res/sx02.png"
-#define RID_BMP_DBQUERY                         "sw/res/sx03.png"
-#define RID_BMP_VIEWLAYOUT_AUTOMATIC            "sw/res/twopages_10x24.png"
-#define RID_BMP_VIEWLAYOUT_AUTOMATIC_ACTIVE     "sw/res/twopages_a_10x24.png"
-#define RID_BMP_VIEWLAYOUT_BOOKMODE             "sw/res/doublepage_10x22.png"
-#define RID_BMP_VIEWLAYOUT_BOOKMODE_ACTIVE      "sw/res/doublepage_a_10x22.png"
-#define RID_BMP_VIEWLAYOUT_SINGLECOLUMN         "sw/res/emptypage_10x14.png"
-#define RID_BMP_VIEWLAYOUT_SINGLECOLUMN_ACTIVE  "sw/res/emptypage_a_10x14.png"
-#define RID_BMP_PAGE_BREAK                      "sw/res/page_break.png"
+inline constexpr OUStringLiteral RID_BMP_DB = u"sw/res/sx01.png";
+inline constexpr OUStringLiteral RID_BMP_DBTABLE = u"sw/res/sx02.png";
+inline constexpr OUStringLiteral RID_BMP_DBQUERY = u"sw/res/sx03.png";
+inline constexpr OUStringLiteral RID_BMP_VIEWLAYOUT_AUTOMATIC = u"sw/res/twopages_10x24.png";
+inline constexpr OUStringLiteral RID_BMP_VIEWLAYOUT_AUTOMATIC_ACTIVE = u"sw/res/twopages_a_10x24.png";
+inline constexpr OUStringLiteral RID_BMP_VIEWLAYOUT_BOOKMODE = u"sw/res/doublepage_10x22.png";
+inline constexpr OUStringLiteral RID_BMP_VIEWLAYOUT_BOOKMODE_ACTIVE = u"sw/res/doublepage_a_10x22.png";
+inline constexpr OUStringLiteral RID_BMP_VIEWLAYOUT_SINGLECOLUMN = u"sw/res/emptypage_10x14.png";
+inline constexpr OUStringLiteral RID_BMP_VIEWLAYOUT_SINGLECOLUMN_ACTIVE = u"sw/res/emptypage_a_10x14.png";
+inline constexpr OUStringLiteral RID_BMP_PAGE_BREAK = u"sw/res/page_break.png";
 
-#define RID_BMP_FORMULA_CALC                    "sw/res/sc20556.png"
-#define RID_BMP_FORMULA_CANCEL                  "sw/res/sc20557.png"
-#define RID_BMP_FORMULA_APPLY                   "sw/res/sc20558.png"
+inline constexpr OUStringLiteral RID_BMP_FORMULA_CALC = u"sw/res/sc20556.png";
+inline constexpr OUStringLiteral RID_BMP_FORMULA_CANCEL = u"sw/res/sc20557.png";
+inline constexpr OUStringLiteral RID_BMP_FORMULA_APPLY = u"sw/res/sc20558.png";
 
-#define RID_BMP_HIDE                            "sw/res/re01.png"
-#define RID_BMP_NO_HIDE                         "sw/res/re02.png"
-#define RID_BMP_PROT_HIDE                       "sw/res/re03.png"
-#define RID_BMP_PROT_NO_HIDE                    "sw/res/re04.png"
+inline constexpr OUStringLiteral RID_BMP_HIDE = u"sw/res/re01.png";
+inline constexpr OUStringLiteral RID_BMP_NO_HIDE = u"sw/res/re02.png";
+inline constexpr OUStringLiteral RID_BMP_PROT_HIDE = u"sw/res/re03.png";
+inline constexpr OUStringLiteral RID_BMP_PROT_NO_HIDE = u"sw/res/re04.png";
 
-#define BMP_INFO_16                             "res/info_16.png"
+inline constexpr OUStringLiteral BMP_INFO_16 = u"res/info_16.png";
 
 #define RID_BMP_RIBBAR_NEXT                     "sw/res/sr20000.png"
 #define RID_BMP_RIBBAR_PREV                     "sw/res/sr20001.png"
@@ -77,38 +77,36 @@
 #define RID_BMP_RIBBAR_FIELD                    "sw/res/sc20244.png"
 #define RID_BMP_RIBBAR_FIELD_BYTYPE             "sw/res/sc20244.png"
 
-#define RID_BMP_NAVI_OUTLINE                    "sw/res/nc20000.png"
-#define RID_BMP_NAVI_TABLE                      "sw/res/nc20001.png"
-#define RID_BMP_NAVI_FRAME                      "sw/res/nc20002.png"
-#define RID_BMP_NAVI_GRAPHIC                    "sw/res/nc20003.png"
-#define RID_BMP_NAVI_OLE                        "sw/res/nc20004.png"
-#define RID_BMP_NAVI_BOOKMARK                   "sw/res/nc20005.png"
-#define RID_BMP_NAVI_REGION                     "sw/res/nc20006.png"
-#define RID_BMP_NAVI_URLFIELD                   "sw/res/nc20007.png"
-#define RID_BMP_NAVI_REFERENCE                  "sw/res/nc20008.png"
-#define RID_BMP_NAVI_INDEX                      "sw/res/nc20009.png"
-#define RID_BMP_NAVI_POSTIT                     "sw/res/nc20010.png"
-#define RID_BMP_NAVI_DRAWOBJECT                 "sw/res/nc20011.png"
-#define RID_BMP_NAVI_TEXTFIELD                  "sw/res/nc20005.png"
-#define RID_BMP_NAVI_FOOTNOTE                   "sw/res/nc20000.png"
-#define RID_BMP_DROP_REGION                     "sw/res/sc20235.png"
-#define RID_BMP_DROP_LINK                       "sw/res/sc20238.png"
-#define RID_BMP_DROP_COPY                       "sw/res/sc20239.png"
+inline constexpr OUStringLiteral RID_BMP_NAVI_OUTLINE = u"sw/res/nc20000.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_TABLE = u"sw/res/nc20001.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_FRAME = u"sw/res/nc20002.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_GRAPHIC = u"sw/res/nc20003.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_OLE = u"sw/res/nc20004.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_BOOKMARK = u"sw/res/nc20005.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_REGION = u"sw/res/nc20006.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_URLFIELD = u"sw/res/nc20007.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_REFERENCE = u"sw/res/nc20008.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_INDEX = u"sw/res/nc20009.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_POSTIT = u"sw/res/nc20010.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_DRAWOBJECT = u"sw/res/nc20011.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_TEXTFIELD = u"sw/res/nc20005.png";
+inline constexpr OUStringLiteral RID_BMP_NAVI_FOOTNOTE = u"sw/res/nc20000.png";
+inline constexpr OUStringLiteral RID_BMP_DROP_REGION = u"sw/res/sc20235.png";
+inline constexpr OUStringLiteral RID_BMP_DROP_LINK = u"sw/res/sc20238.png";
+inline constexpr OUStringLiteral RID_BMP_DROP_COPY = u"sw/res/sc20239.png";
 
-#define RID_BMP_WRAP_RIGHT                      "sw/res/wr03.png"
-#define RID_BMP_WRAP_CONTOUR_RIGHT              "sw/res/wr09.png"
-#define RID_BMP_WRAP_LEFT                       "sw/res/wr02.png"
-#define RID_BMP_WRAP_CONTOUR_LEFT               "sw/res/wr08.png"
-#define RID_BMP_WRAP_NONE                       "sw/res/wr01.png"
-#define RID_BMP_WRAP_CONTOUR_NONE               "sw/res/wr07.png"
-#define RID_BMP_WRAP_IDEAL                      "sw/res/wr06.png"
-#define RID_BMP_WRAP_CONTOUR_IDEAL              "sw/res/wr011.png"
-#define RID_BMP_WRAP_THROUGH                    "sw/res/wr05.png"
-#define RID_BMP_WRAP_PARALLEL                   "sw/res/wr04.png"
-#define RID_BMP_WRAP_CONTOUR_PARALLEL           "sw/res/wr010.png"
+inline constexpr OUStringLiteral RID_BMP_WRAP_RIGHT = u"sw/res/wr03.png";
+inline constexpr OUStringLiteral RID_BMP_WRAP_CONTOUR_RIGHT = u"sw/res/wr09.png";
+inline constexpr OUStringLiteral RID_BMP_WRAP_LEFT = u"sw/res/wr02.png";
+inline constexpr OUStringLiteral RID_BMP_WRAP_CONTOUR_LEFT = u"sw/res/wr08.png";
+inline constexpr OUStringLiteral RID_BMP_WRAP_NONE = u"sw/res/wr01.png";
+inline constexpr OUStringLiteral RID_BMP_WRAP_CONTOUR_NONE = u"sw/res/wr07.png";
+inline constexpr OUStringLiteral RID_BMP_WRAP_IDEAL = u"sw/res/wr06.png";
+inline constexpr OUStringLiteral RID_BMP_WRAP_CONTOUR_IDEAL = u"sw/res/wr011.png";
+inline constexpr OUStringLiteral RID_BMP_WRAP_THROUGH = u"sw/res/wr05.png";
+inline constexpr OUStringLiteral RID_BMP_WRAP_PARALLEL = u"sw/res/wr04.png";
+inline constexpr OUStringLiteral RID_BMP_WRAP_CONTOUR_PARALLEL = u"sw/res/wr010.png";
 
-#define RID_BMP_PREVIEW_FALLBACK                "sw/res/image-example.png"
-
-#endif
+inline constexpr OUStringLiteral RID_BMP_PREVIEW_FALLBACK = u"sw/res/image-example.png";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sw/inc/helpids.h b/sw/inc/helpids.h
index 8995d9f11d3d..779de6628c30 100644
--- a/sw/inc/helpids.h
+++ b/sw/inc/helpids.h
@@ -20,7 +20,9 @@
 #ifndef INCLUDED_SW_INC_HELPIDS_H
 #define INCLUDED_SW_INC_HELPIDS_H
 
-#define HID_EDIT_WIN                                            "SW_HID_EDIT_WIN"
+#include <rtl/string.hxx>
+
+inline constexpr OStringLiteral HID_EDIT_WIN = "SW_HID_EDIT_WIN";
 
 #define HID_NAVI_DRAG_HYP                                       "SW_HID_NAVI_DRAG_HYP"
 #define HID_NAVI_DRAG_LINK                                      "SW_HID_NAVI_DRAG_LINK"
@@ -28,17 +30,17 @@
 #define HID_NAVI_OUTLINES                                       "SW_HID_NAVI_OUTLINES"
 
 
-#define HID_PAGEPREVIEW                                         "SW_HID_PAGEPREVIEW"
-#define HID_SOURCE_EDITWIN                                      "SW_HID_SOURCE_EDITWIN"
+inline constexpr OStringLiteral HID_PAGEPREVIEW = "SW_HID_PAGEPREVIEW";
+inline constexpr OStringLiteral HID_SOURCE_EDITWIN = "SW_HID_SOURCE_EDITWIN";
 
 // Dialog Help-IDs
 
-#define HID_NAVIGATOR_TREELIST                                  "SW_HID_NAVIGATOR_TREELIST"
-#define HID_NAVIGATOR_TOOLBOX                                   "SW_HID_NAVIGATOR_TOOLBOX"
-#define HID_NAVIGATOR_LISTBOX                                   "SW_HID_NAVIGATOR_LISTBOX"
+inline constexpr OStringLiteral HID_NAVIGATOR_TREELIST = "SW_HID_NAVIGATOR_TREELIST";
+inline constexpr OStringLiteral HID_NAVIGATOR_TOOLBOX = "SW_HID_NAVIGATOR_TOOLBOX";
+inline constexpr OStringLiteral HID_NAVIGATOR_LISTBOX = "SW_HID_NAVIGATOR_LISTBOX";
 #define HID_NAVI_VS                                             "SW_HID_NAVI_VS"
-#define HID_NAVIGATOR_GLOBAL_TOOLBOX                            "SW_HID_NAVIGATOR_GLOBAL_TOOLBOX"
-#define HID_NAVIGATOR_GLOB_TREELIST                             "SW_HID_NAVIGATOR_GLOB_TREELIST"
+inline constexpr OStringLiteral HID_NAVIGATOR_GLOBAL_TOOLBOX = "SW_HID_NAVIGATOR_GLOBAL_TOOLBOX";
+inline constexpr OStringLiteral HID_NAVIGATOR_GLOB_TREELIST = "SW_HID_NAVIGATOR_GLOB_TREELIST";
 #define HID_GLBLTREE_UPDATE                                     "SW_HID_GLBLTREE_UPDATE"
 #define HID_GLBLTREE_INSERT                                     "SW_HID_GLBLTREE_INSERT"
 #define HID_GLBLTREE_EDIT                                       "SW_HID_GLBLTREE_EDIT"
@@ -57,14 +59,14 @@
 
 // TabPage Help-IDs
 
-#define HID_REDLINE_CTRL                                        "SW_HID_REDLINE_CTRL"
+inline constexpr OStringLiteral HID_REDLINE_CTRL = "SW_HID_REDLINE_CTRL";
 
-#define HID_LINGU_AUTOCORR                                      "SW_HID_LINGU_AUTOCORR"
-#define HID_LINGU_REPLACE                                       "SW_HID_LINGU_REPLACE"
-#define HID_LINGU_IGNORE_SELECTION                              "SW_HID_LINGU_IGNORE_SELECTION"    // grammar check context menu
+inline constexpr OStringLiteral HID_LINGU_AUTOCORR = "SW_HID_LINGU_AUTOCORR";
+inline constexpr OStringLiteral HID_LINGU_REPLACE = "SW_HID_LINGU_REPLACE";
+inline constexpr OStringLiteral HID_LINGU_IGNORE_SELECTION = "SW_HID_LINGU_IGNORE_SELECTION";    // grammar check context menu
 
 // More Help-IDs
-#define HID_EDIT_FORMULA                                        "SW_HID_EDIT_FORMULA"
+inline constexpr OStringLiteral HID_EDIT_FORMULA = "SW_HID_EDIT_FORMULA";
 
 #define HID_AUTH_FIELD_IDENTIFIER                               "SW_HID_AUTH_FIELD_IDENTIFIER"
 #define HID_AUTH_FIELD_AUTHORITY_TYPE                           "SW_HID_AUTH_FIELD_AUTHORITY_TYPE"
@@ -99,11 +101,11 @@
 #define HID_AUTH_FIELD_ISBN                                     "SW_HID_AUTH_FIELD_ISBN"
 #define HID_AUTH_FIELD_LOCAL_URL                                "SW_HID_AUTH_FIELD_LOCAL_URL"
 
-#define HID_BUSINESS_FMT_PAGE                                   "SW_HID_BUSINESS_FMT_PAGE"
-#define HID_BUSINESS_FMT_PAGE_CONT                              "SW_HID_BUSINESS_FMT_PAGE_CONT"
-#define HID_BUSINESS_FMT_PAGE_SHEET                             "SW_HID_BUSINESS_FMT_PAGE_SHEET"
-#define HID_BUSINESS_FMT_PAGE_BRAND                             "SW_HID_BUSINESS_FMT_PAGE_BRAND"
-#define HID_BUSINESS_FMT_PAGE_TYPE                              "SW_HID_BUSINESS_FMT_PAGE_TYPE"
+inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE = "SW_HID_BUSINESS_FMT_PAGE";
+inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_CONT = "SW_HID_BUSINESS_FMT_PAGE_CONT";
+inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_SHEET = "SW_HID_BUSINESS_FMT_PAGE_SHEET";
+inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_BRAND = "SW_HID_BUSINESS_FMT_PAGE_BRAND";
+inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_TYPE = "SW_HID_BUSINESS_FMT_PAGE_TYPE";
 #define HID_SEND_MASTER_CTRL_PUSHBUTTON_OK                      "SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK"
 #define HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL                  "SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL"
 #define HID_SEND_MASTER_CTRL_LISTBOX_FILTER                     "SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER"
@@ -120,7 +122,7 @@
 #define HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION               "SW_HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION"
 #define HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE                     "SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE"
 
-#define HID_PVIEW_ZOOM_LB                                       "SW_HID_PVIEW_ZOOM_LB"
+inline constexpr OStringLiteral HID_PVIEW_ZOOM_LB = "SW_HID_PVIEW_ZOOM_LB";
 
 #define HID_NID_TBL                                             "SW_HID_NID_TBL"
 #define HID_NID_FRM                                             "SW_HID_NID_FRM"
@@ -142,18 +144,18 @@
 #define HID_NID_TABLE_FORMULA                                   "SW_HID_NID_TABLE_FORMULA"
 #define HID_NID_TABLE_FORMULA_ERROR                             "SW_HID_NID_TABLE_FORMULA_ERROR"
 #define HID_NID_NEXT                                            "SW_HID_NID_NEXT"
-#define HID_MM_NEXT_PAGE                                        "SW_HID_MM_NEXT_PAGE"
-#define HID_MM_PREV_PAGE                                        "SW_HID_MM_PREV_PAGE"
-#define HID_MM_ADDBLOCK_ELEMENTS                                "SW_HID_MM_ADDBLOCK_ELEMENTS"
-#define HID_MM_ADDBLOCK_INSERT                                  "SW_HID_MM_ADDBLOCK_INSERT"
-#define HID_MM_ADDBLOCK_REMOVE                                  "SW_HID_MM_ADDBLOCK_REMOVE"
-#define HID_MM_ADDBLOCK_DRAG                                    "SW_HID_MM_ADDBLOCK_DRAG"
-#define HID_MM_ADDBLOCK_PREVIEW                                 "SW_HID_MM_ADDBLOCK_PREVIEW"
-#define HID_MM_ADDBLOCK_MOVEBUTTONS                             "SW_HID_MM_ADDBLOCK_MOVEBUTTONS"
-
-#define HID_TBX_FORMULA_CALC                                    "SW_HID_TBX_FORMULA_CALC"
-#define HID_TBX_FORMULA_CANCEL                                  "SW_HID_TBX_FORMULA_CANCEL"
-#define HID_TBX_FORMULA_APPLY                                   "SW_HID_TBX_FORMULA_APPLY"
+inline constexpr OStringLiteral HID_MM_NEXT_PAGE = "SW_HID_MM_NEXT_PAGE";
+inline constexpr OStringLiteral HID_MM_PREV_PAGE = "SW_HID_MM_PREV_PAGE";
+inline constexpr OStringLiteral HID_MM_ADDBLOCK_ELEMENTS = "SW_HID_MM_ADDBLOCK_ELEMENTS";
+inline constexpr OStringLiteral HID_MM_ADDBLOCK_INSERT = "SW_HID_MM_ADDBLOCK_INSERT";
+inline constexpr OStringLiteral HID_MM_ADDBLOCK_REMOVE = "SW_HID_MM_ADDBLOCK_REMOVE";
+inline constexpr OStringLiteral HID_MM_ADDBLOCK_DRAG = "SW_HID_MM_ADDBLOCK_DRAG";
+inline constexpr OStringLiteral HID_MM_ADDBLOCK_PREVIEW = "SW_HID_MM_ADDBLOCK_PREVIEW";
+inline constexpr OStringLiteral HID_MM_ADDBLOCK_MOVEBUTTONS = "SW_HID_MM_ADDBLOCK_MOVEBUTTONS";
+
+inline constexpr OStringLiteral HID_TBX_FORMULA_CALC = "SW_HID_TBX_FORMULA_CALC";
+inline constexpr OStringLiteral HID_TBX_FORMULA_CANCEL = "SW_HID_TBX_FORMULA_CANCEL";
+inline constexpr OStringLiteral HID_TBX_FORMULA_APPLY = "SW_HID_TBX_FORMULA_APPLY";
 
 #endif
 
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 1642c094ca27..a14b1a9e2779 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_INC_HINTIDS_HXX
 
 #include <sal/types.h>
+#include <rtl/ustring.hxx>
 #include <svx/xdef.hxx>
 #include "swdllapi.h"
 #include <svl/typedwhich.hxx>
@@ -179,8 +180,8 @@ class SfxVoidItem;
 #define CH_TXT_ATR_FIELDSTART u'\x0007'
 #define CH_TXT_ATR_FIELDSEP u'\x0003'
 #define CH_TXT_ATR_FIELDEND u'\x0008'
-#define CH_TXT_ATR_SUBST_FIELDSTART ("[")
-#define CH_TXT_ATR_SUBST_FIELDEND ("]")
+inline constexpr OUStringLiteral CH_TXT_ATR_SUBST_FIELDSTART = u"[";
+inline constexpr OUStringLiteral CH_TXT_ATR_SUBST_FIELDEND = u"]";
 
 // a non-visible dummy character to track deleted tables,
 // table rows, and images anchored to characters
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 9069b01ffda0..78c72ba88e74 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -28,22 +28,22 @@
 #include <tools/solar.h>
 #include "swdllapi.h"
 
-#define FILTER_RTF      "RTF"       ///< RTF filter
-#define sRtfWH          "WH_RTF"
-#define FILTER_TEXT     u"TEXT"      ///< text filter with default codeset
-#define FILTER_BAS      "BAS"       ///< StarBasic (identical to ANSI)
-#define FILTER_WW8      "CWW8"      ///< WinWord 97 filter
-#define FILTER_TEXT_DLG "TEXT_DLG"  ///< text filter with encoding dialog
-#define FILTER_XML      u"CXML"      ///< XML filter
+inline constexpr OUStringLiteral FILTER_RTF = u"RTF";       ///< RTF filter
+inline constexpr OUStringLiteral sRtfWH = u"WH_RTF";
+inline constexpr OUStringLiteral FILTER_TEXT = u"TEXT"; ///< text filter with default codeset
+inline constexpr OUStringLiteral FILTER_BAS = u"BAS";       ///< StarBasic (identical to ANSI)
+inline constexpr OUStringLiteral FILTER_WW8 = u"CWW8";      ///< WinWord 97 filter
+inline constexpr OUStringLiteral FILTER_TEXT_DLG = u"TEXT_DLG";  ///< text filter with encoding dialog
+inline constexpr OUStringLiteral FILTER_XML = u"CXML";      ///< XML filter
 #define FILTER_XMLV     "CXMLV"     ///< XML filter
 #define FILTER_XMLVW    "CXMLVWEB"  ///< XML filter
-#define FILTER_DOCX     "OXML"
-#define sHTML           "HTML"
-#define sWW5            "WW6"
-#define sWW6            "CWW6"
+inline constexpr OUStringLiteral FILTER_DOCX = u"OXML";
+inline constexpr OUStringLiteral sHTML = u"HTML";
+inline constexpr OUStringLiteral sWW5 = u"WW6";
+inline constexpr OUStringLiteral sWW6 = u"CWW6";
 
-#define sSWRITER        "swriter"
-#define sSWRITERWEB     "swriter/web"
+inline constexpr OUStringLiteral sSWRITER = u"swriter";
+inline constexpr OUStringLiteral sSWRITERWEB = u"swriter/web";
 
 class SfxFilter;
 class SfxFilterContainer;
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index d89bad341f7a..39cffc34f4b9 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -116,7 +116,7 @@ std::unique_ptr<weld::TreeIter> SwChangeDBDlg::Insert(const OUString& rDBName)
     OUString sUserData = rDBName.getToken(0, DB_DELIM, nIdx);
     sal_Int32 nCommandType = sUserData.toInt32();
 
-    OUString rToInsert ( nCommandType ? std::u16string_view(u"" RID_BMP_DBQUERY) : std::u16string_view(u"" RID_BMP_DBTABLE) );
+    const OUString & rToInsert ( nCommandType ? RID_BMP_DBQUERY : RID_BMP_DBTABLE );
 
     std::unique_ptr<weld::TreeIter> xIter(m_xUsedDBTLB->make_iterator());
     if (m_xUsedDBTLB->get_iter_first(*xIter))