loplugin:stringliteraldefine in svx

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

4 files changed, 209 insertions, 207 deletions

diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 93d6dd8ff562..9b69342bc5a7 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -37,25 +37,25 @@
 #define RECOVERY_CMDPART_DO_RECOVERY                "/doAutoRecovery"
 #define RECOVERY_CMDPART_DO_BRINGTOFRONT            "/doBringToFront"
 
-#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE      "vnd.sun.star.autorecovery:/doPrepareEmergencySave"
-#define RECOVERY_CMD_DO_EMERGENCY_SAVE              "vnd.sun.star.autorecovery:/doEmergencySave"
-#define RECOVERY_CMD_DO_RECOVERY                    "vnd.sun.star.autorecovery:/doAutoRecovery"
-#define RECOVERY_CMD_DO_ENTRY_BACKUP                "vnd.sun.star.autorecovery:/doEntryBackup"
-#define RECOVERY_CMD_DO_ENTRY_CLEANUP               "vnd.sun.star.autorecovery:/doEntryCleanUp"
-
-#define PROP_STATUSINDICATOR                        "StatusIndicator"
-#define PROP_DISPATCHASYNCHRON                      "DispatchAsynchron"
-#define PROP_SAVEPATH                               "SavePath"
-#define PROP_ENTRYID                                "EntryID"
-
-#define STATEPROP_ID                                "ID"
-#define STATEPROP_STATE                             "DocumentState"
-#define STATEPROP_ORGURL                            "OriginalURL"
-#define STATEPROP_TEMPURL                           "TempURL"
-#define STATEPROP_FACTORYURL                        "FactoryURL"
-#define STATEPROP_TEMPLATEURL                       "TemplateURL"
-#define STATEPROP_TITLE                             "Title"
-#define STATEPROP_MODULE                            "Module"
+inline constexpr OUStringLiteral RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE = u"vnd.sun.star.autorecovery:/doPrepareEmergencySave";
+inline constexpr OUStringLiteral RECOVERY_CMD_DO_EMERGENCY_SAVE = u"vnd.sun.star.autorecovery:/doEmergencySave";
+inline constexpr OUStringLiteral RECOVERY_CMD_DO_RECOVERY = u"vnd.sun.star.autorecovery:/doAutoRecovery";
+inline constexpr OUStringLiteral RECOVERY_CMD_DO_ENTRY_BACKUP = u"vnd.sun.star.autorecovery:/doEntryBackup";
+inline constexpr OUStringLiteral RECOVERY_CMD_DO_ENTRY_CLEANUP = u"vnd.sun.star.autorecovery:/doEntryCleanUp";
+
+inline constexpr OUStringLiteral PROP_STATUSINDICATOR = u"StatusIndicator";
+inline constexpr OUStringLiteral PROP_DISPATCHASYNCHRON = u"DispatchAsynchron";
+inline constexpr OUStringLiteral PROP_SAVEPATH = u"SavePath";
+inline constexpr OUStringLiteral PROP_ENTRYID = u"EntryID";
+
+inline constexpr OUStringLiteral STATEPROP_ID = u"ID";
+inline constexpr OUStringLiteral STATEPROP_STATE = u"DocumentState";
+inline constexpr OUStringLiteral STATEPROP_ORGURL = u"OriginalURL";
+inline constexpr OUStringLiteral STATEPROP_TEMPURL = u"TempURL";
+inline constexpr OUStringLiteral STATEPROP_FACTORYURL = u"FactoryURL";
+inline constexpr OUStringLiteral STATEPROP_TEMPLATEURL = u"TemplateURL";
+inline constexpr OUStringLiteral STATEPROP_TITLE = u"Title";
+inline constexpr OUStringLiteral STATEPROP_MODULE = u"Module";
 
 #define RECOVERY_OPERATIONSTATE_START               "start"
 #define RECOVERY_OPERATIONSTATE_STOP                "stop"
diff --git a/svx/source/inc/fmprop.hxx b/svx/source/inc/fmprop.hxx
index 0ea06e09f826..a6125f2ffe2b 100644
--- a/svx/source/inc/fmprop.hxx
+++ b/svx/source/inc/fmprop.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMPROP_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMPROP_HXX
 
+#include <rtl/ustring.hxx>
+
 // PropertyIds, which have an assignment to a PropertyName, could continue
 // to be WhichIds in the future -> Itemset
 #define FM_ATTR_START           0
@@ -26,125 +28,125 @@
 #define FM_ATTR_FILTER          ( FM_ATTR_START + 1 )
 #define FM_ATTR_FORM_OPERATIONS ( FM_ATTR_START + 2 )
 
-#define FM_PROP_NAME                         "Name"
-#define FM_PROP_CLASSID                      "ClassId"
-#define FM_PROP_ALIGN                        "Align"
-#define FM_PROP_ROWCOUNT                     "RowCount"
-#define FM_PROP_ROWCOUNTFINAL                "IsRowCountFinal"
-#define FM_PROP_FETCHSIZE                    "FetchSize"
-#define FM_PROP_VALUE                        "Value"
-#define FM_PROP_VALUEMIN                     "ValueMin"
-#define FM_PROP_VALUEMAX                     "ValueMax"
-#define FM_PROP_VALUESTEP                    "ValueStep"
-#define FM_PROP_TEXT                         "Text"
-#define FM_PROP_LABEL                        "Label"
-#define FM_PROP_NAVIGATION                   "NavigationBarMode"
-#define FM_PROP_CYCLE                        "Cycle"
-#define FM_PROP_CONTROLSOURCE                "DataField"
-#define FM_PROP_ENABLED                      "Enabled"
-#define FM_PROP_SPIN                         "Spin"
-#define FM_PROP_READONLY                     "ReadOnly"
-#define FM_PROP_FILTER                       "Filter"
-#define FM_PROP_AUTOINCREMENT                "IsAutoIncrement"
-#define FM_PROP_WIDTH                        "Width"
-#define FM_PROP_SEARCHABLE                   "IsSearchable"
-#define FM_PROP_MULTILINE                    "MultiLine"
-#define FM_PROP_TARGET_URL                   "TargetURL"
-#define FM_PROP_DEFAULTCONTROL               "DefaultControl"
-#define FM_PROP_MAXTEXTLEN                   "MaxTextLen"
-#define FM_PROP_DATE                         "Date"
-#define FM_PROP_TIME                         "Time"
-#define FM_PROP_STATE                        "State"
-#define FM_PROP_TRISTATE                     "TriState"
-#define FM_PROP_STRINGITEMLIST               "StringItemList"
-#define FM_PROP_DEFAULT_TEXT                 "DefaultText"
-#define FM_PROP_DEFAULTCHECKED               "DefaultState"
-#define FM_PROP_DEFAULT_DATE                 "DefaultDate"
-#define FM_PROP_DEFAULT_TIME                 "DefaultTime"
-#define FM_PROP_DEFAULT_VALUE                "DefaultValue"
-#define FM_PROP_FORMATKEY                    "FormatKey"
-#define FM_PROP_FORMATSSUPPLIER              "FormatsSupplier"
-#define FM_PROP_LISTSOURCETYPE               "ListSourceType"
-#define FM_PROP_LISTSOURCE                   "ListSource"
-#define FM_PROP_SELECT_SEQ                   "SelectedItems"
-#define FM_PROP_VALUE_SEQ                    "ValueItemList"
-#define FM_PROP_DEFAULT_SELECT_SEQ           "DefaultSelection"
-#define FM_PROP_DECIMAL_ACCURACY             "DecimalAccuracy"
-#define FM_PROP_EDITMASK                     "EditMask"
-#define FM_PROP_ISREADONLY                   "IsReadOnly"
-#define FM_PROP_FIELDTYPE                    "Type"
-#define FM_PROP_REFVALUE                     "RefValue"
-#define FM_PROP_STRICTFORMAT                 "StrictFormat"
-#define FM_PROP_DATASOURCE                   "DataSourceName"
-#define FM_PROP_LITERALMASK                  "LiteralMask"
-#define FM_PROP_SHOWTHOUSANDSEP              "ShowThousandsSeparator"
-#define FM_PROP_CURRENCYSYMBOL               "CurrencySymbol"
-#define FM_PROP_DATEFORMAT                   "DateFormat"
-#define FM_PROP_DATEMIN                      "DateMin"
-#define FM_PROP_DATEMAX                      "DateMax"
-#define FM_PROP_DATE_SHOW_CENTURY            "DateShowCentury"
-#define FM_PROP_TIMEFORMAT                   "TimeFormat"
-#define FM_PROP_TIMEMIN                      "TimeMin"
-#define FM_PROP_TIMEMAX                      "TimeMax"
-#define FM_PROP_LINECOUNT                    "LineCount"
-#define FM_PROP_BOUNDCOLUMN                  "BoundColumn"
+inline constexpr OUStringLiteral FM_PROP_NAME = u"Name";
+inline constexpr OUStringLiteral FM_PROP_CLASSID = u"ClassId";
+inline constexpr OUStringLiteral FM_PROP_ALIGN = u"Align";
+inline constexpr OUStringLiteral FM_PROP_ROWCOUNT = u"RowCount";
+inline constexpr OUStringLiteral FM_PROP_ROWCOUNTFINAL = u"IsRowCountFinal";
+inline constexpr OUStringLiteral FM_PROP_FETCHSIZE = u"FetchSize";
+inline constexpr OUStringLiteral FM_PROP_VALUE = u"Value";
+inline constexpr OUStringLiteral FM_PROP_VALUEMIN = u"ValueMin";
+inline constexpr OUStringLiteral FM_PROP_VALUEMAX = u"ValueMax";
+inline constexpr OUStringLiteral FM_PROP_VALUESTEP = u"ValueStep";
+inline constexpr OUStringLiteral FM_PROP_TEXT = u"Text";
+inline constexpr OUStringLiteral FM_PROP_LABEL = u"Label";
+inline constexpr OUStringLiteral FM_PROP_NAVIGATION = u"NavigationBarMode";
+inline constexpr OUStringLiteral FM_PROP_CYCLE = u"Cycle";
+inline constexpr OUStringLiteral FM_PROP_CONTROLSOURCE = u"DataField";
+inline constexpr OUStringLiteral FM_PROP_ENABLED = u"Enabled";
+inline constexpr OUStringLiteral FM_PROP_SPIN = u"Spin";
+inline constexpr OUStringLiteral FM_PROP_READONLY = u"ReadOnly";
+inline constexpr OUStringLiteral FM_PROP_FILTER = u"Filter";
+inline constexpr OUStringLiteral FM_PROP_AUTOINCREMENT = u"IsAutoIncrement";
+inline constexpr OUStringLiteral FM_PROP_WIDTH = u"Width";
+inline constexpr OUStringLiteral FM_PROP_SEARCHABLE = u"IsSearchable";
+inline constexpr OUStringLiteral FM_PROP_MULTILINE = u"MultiLine";
+inline constexpr OUStringLiteral FM_PROP_TARGET_URL = u"TargetURL";
+inline constexpr OUStringLiteral FM_PROP_DEFAULTCONTROL = u"DefaultControl";
+inline constexpr OUStringLiteral FM_PROP_MAXTEXTLEN = u"MaxTextLen";
+inline constexpr OUStringLiteral FM_PROP_DATE = u"Date";
+inline constexpr OUStringLiteral FM_PROP_TIME = u"Time";
+inline constexpr OUStringLiteral FM_PROP_STATE = u"State";
+inline constexpr OUStringLiteral FM_PROP_TRISTATE = u"TriState";
+inline constexpr OUStringLiteral FM_PROP_STRINGITEMLIST = u"StringItemList";
+inline constexpr OUStringLiteral FM_PROP_DEFAULT_TEXT = u"DefaultText";
+inline constexpr OUStringLiteral FM_PROP_DEFAULTCHECKED = u"DefaultState";
+inline constexpr OUStringLiteral FM_PROP_DEFAULT_DATE = u"DefaultDate";
+inline constexpr OUStringLiteral FM_PROP_DEFAULT_TIME = u"DefaultTime";
+inline constexpr OUStringLiteral FM_PROP_DEFAULT_VALUE = u"DefaultValue";
+inline constexpr OUStringLiteral FM_PROP_FORMATKEY = u"FormatKey";
+inline constexpr OUStringLiteral FM_PROP_FORMATSSUPPLIER = u"FormatsSupplier";
+inline constexpr OUStringLiteral FM_PROP_LISTSOURCETYPE = u"ListSourceType";
+inline constexpr OUStringLiteral FM_PROP_LISTSOURCE = u"ListSource";
+inline constexpr OUStringLiteral FM_PROP_SELECT_SEQ = u"SelectedItems";
+inline constexpr OUStringLiteral FM_PROP_VALUE_SEQ = u"ValueItemList";
+inline constexpr OUStringLiteral FM_PROP_DEFAULT_SELECT_SEQ = u"DefaultSelection";
+inline constexpr OUStringLiteral FM_PROP_DECIMAL_ACCURACY = u"DecimalAccuracy";
+inline constexpr OUStringLiteral FM_PROP_EDITMASK = u"EditMask";
+inline constexpr OUStringLiteral FM_PROP_ISREADONLY = u"IsReadOnly";
+inline constexpr OUStringLiteral FM_PROP_FIELDTYPE = u"Type";
+inline constexpr OUStringLiteral FM_PROP_REFVALUE = u"RefValue";
+inline constexpr OUStringLiteral FM_PROP_STRICTFORMAT = u"StrictFormat";
+inline constexpr OUStringLiteral FM_PROP_DATASOURCE = u"DataSourceName";
+inline constexpr OUStringLiteral FM_PROP_LITERALMASK = u"LiteralMask";
+inline constexpr OUStringLiteral FM_PROP_SHOWTHOUSANDSEP = u"ShowThousandsSeparator";
+inline constexpr OUStringLiteral FM_PROP_CURRENCYSYMBOL = u"CurrencySymbol";
+inline constexpr OUStringLiteral FM_PROP_DATEFORMAT = u"DateFormat";
+inline constexpr OUStringLiteral FM_PROP_DATEMIN = u"DateMin";
+inline constexpr OUStringLiteral FM_PROP_DATEMAX = u"DateMax";
+inline constexpr OUStringLiteral FM_PROP_DATE_SHOW_CENTURY = u"DateShowCentury";
+inline constexpr OUStringLiteral FM_PROP_TIMEFORMAT = u"TimeFormat";
+inline constexpr OUStringLiteral FM_PROP_TIMEMIN = u"TimeMin";
+inline constexpr OUStringLiteral FM_PROP_TIMEMAX = u"TimeMax";
+inline constexpr OUStringLiteral FM_PROP_LINECOUNT = u"LineCount";
+inline constexpr OUStringLiteral FM_PROP_BOUNDCOLUMN = u"BoundColumn";
 #define FM_PROP_HASNAVIGATION                "HasNavigationBar"
-#define FM_PROP_FONT                         "FontDescriptor"
+inline constexpr OUStringLiteral FM_PROP_FONT = u"FontDescriptor";
 #define FM_PROP_BACKGROUNDCOLOR              "BackgroundColor"
 #define FM_PROP_TEXTCOLOR                    "TextColor"
-#define FM_PROP_BORDER                       "Border"
-#define FM_PROP_DROPDOWN                     "Dropdown"
-#define FM_PROP_ROWHEIGHT                    "RowHeight"
-#define FM_PROP_HELPTEXT                     "HelpText"
+inline constexpr OUStringLiteral FM_PROP_BORDER = u"Border";
+inline constexpr OUStringLiteral FM_PROP_DROPDOWN = u"Dropdown";
+inline constexpr OUStringLiteral FM_PROP_ROWHEIGHT = u"RowHeight";
+inline constexpr OUStringLiteral FM_PROP_HELPTEXT = u"HelpText";
 #define FM_PROP_HELPURL                      "HelpURL"
 #define FM_PROP_RECORDMARKER                 "HasRecordMarker"
-#define FM_PROP_BOUNDFIELD                   "BoundField"
-#define FM_PROP_EFFECTIVE_VALUE              "EffectiveValue"
-#define FM_PROP_EFFECTIVE_DEFAULT            "EffectiveDefault"
-#define FM_PROP_EFFECTIVE_MIN                "EffectiveMin"
-#define FM_PROP_EFFECTIVE_MAX                "EffectiveMax"
-#define FM_PROP_HIDDEN                       "Hidden"
-#define FM_PROP_FILTERPROPOSAL               "UseFilterValueProposal"
-#define FM_PROP_FIELDSOURCE                  "FieldSource"
-#define FM_PROP_TABLENAME                    "TableName"
-#define FM_PROP_CONTROLLABEL                 "LabelControl"
-#define FM_PROP_CURSORCOLOR                  "CursorColor"
-#define FM_PROP_ALWAYSSHOWCURSOR             "AlwaysShowCursor"
-#define FM_PROP_DISPLAYSYNCHRON              "DisplayIsSynchron"
-#define FM_PROP_ISMODIFIED                   "IsModified"
-#define FM_PROP_ISNEW                        "IsNew"
-#define FM_PROP_PRIVILEGES                   "Privileges"
-#define FM_PROP_COMMAND                      "Command"
-#define FM_PROP_COMMANDTYPE                  "CommandType"
-#define FM_PROP_RESULTSET_CONCURRENCY        "ResultSetConcurrency"
-#define FM_PROP_INSERTONLY                   "IgnoreResult"
-#define FM_PROP_RESULTSET_TYPE               "ResultSetType"
-#define FM_PROP_ESCAPE_PROCESSING            "EscapeProcessing"
-#define FM_PROP_APPLYFILTER                  "ApplyFilter"
-#define FM_PROP_ISNULLABLE                   "IsNullable"
-#define FM_PROP_ACTIVECOMMAND                "ActiveCommand"
-#define FM_PROP_ISCURRENCY                   "IsCurrency"
-#define FM_PROP_URL                          "URL"
-#define FM_PROP_ACTIVE_CONNECTION            "ActiveConnection"
-#define FM_PROP_CONTROLSOURCEPROPERTY        "DataFieldProperty"
-#define FM_PROP_REALNAME                     "RealName"
-#define FM_PROP_TEXTLINECOLOR                "TextLineColor"
+inline constexpr OUStringLiteral FM_PROP_BOUNDFIELD = u"BoundField";
+inline constexpr OUStringLiteral FM_PROP_EFFECTIVE_VALUE = u"EffectiveValue";
+inline constexpr OUStringLiteral FM_PROP_EFFECTIVE_DEFAULT = u"EffectiveDefault";
+inline constexpr OUStringLiteral FM_PROP_EFFECTIVE_MIN = u"EffectiveMin";
+inline constexpr OUStringLiteral FM_PROP_EFFECTIVE_MAX = u"EffectiveMax";
+inline constexpr OUStringLiteral FM_PROP_HIDDEN = u"Hidden";
+inline constexpr OUStringLiteral FM_PROP_FILTERPROPOSAL = u"UseFilterValueProposal";
+inline constexpr OUStringLiteral FM_PROP_FIELDSOURCE = u"FieldSource";
+inline constexpr OUStringLiteral FM_PROP_TABLENAME = u"TableName";
+inline constexpr OUStringLiteral FM_PROP_CONTROLLABEL = u"LabelControl";
+inline constexpr OUStringLiteral FM_PROP_CURSORCOLOR = u"CursorColor";
+inline constexpr OUStringLiteral FM_PROP_ALWAYSSHOWCURSOR = u"AlwaysShowCursor";
+inline constexpr OUStringLiteral FM_PROP_DISPLAYSYNCHRON = u"DisplayIsSynchron";
+inline constexpr OUStringLiteral FM_PROP_ISMODIFIED = u"IsModified";
+inline constexpr OUStringLiteral FM_PROP_ISNEW = u"IsNew";
+inline constexpr OUStringLiteral FM_PROP_PRIVILEGES = u"Privileges";
+inline constexpr OUStringLiteral FM_PROP_COMMAND = u"Command";
+inline constexpr OUStringLiteral FM_PROP_COMMANDTYPE = u"CommandType";
+inline constexpr OUStringLiteral FM_PROP_RESULTSET_CONCURRENCY = u"ResultSetConcurrency";
+inline constexpr OUStringLiteral FM_PROP_INSERTONLY = u"IgnoreResult";
+inline constexpr OUStringLiteral FM_PROP_RESULTSET_TYPE = u"ResultSetType";
+inline constexpr OUStringLiteral FM_PROP_ESCAPE_PROCESSING = u"EscapeProcessing";
+inline constexpr OUStringLiteral FM_PROP_APPLYFILTER = u"ApplyFilter";
+inline constexpr OUStringLiteral FM_PROP_ISNULLABLE = u"IsNullable";
+inline constexpr OUStringLiteral FM_PROP_ACTIVECOMMAND = u"ActiveCommand";
+inline constexpr OUStringLiteral FM_PROP_ISCURRENCY = u"IsCurrency";
+inline constexpr OUStringLiteral FM_PROP_URL = u"URL";
+inline constexpr OUStringLiteral FM_PROP_ACTIVE_CONNECTION = u"ActiveConnection";
+inline constexpr OUStringLiteral FM_PROP_CONTROLSOURCEPROPERTY = u"DataFieldProperty";
+inline constexpr OUStringLiteral FM_PROP_REALNAME = u"RealName";
+inline constexpr OUStringLiteral FM_PROP_TEXTLINECOLOR = u"TextLineColor";
 #define FM_PROP_FONTEMPHASISMARK             "FontEmphasisMark"
 #define FM_PROP_FONTRELIEF                   "FontRelief"
-#define FM_PROP_ORIENTATION                  "Orientation"
-#define FM_PROP_LINEENDFORMAT                "LineEndFormat"
-#define FM_PROP_VISUALEFFECT                 "VisualEffect"
-#define FM_PROP_BORDERCOLOR                  "BorderColor"
-#define FM_PROP_DYNAMIC_CONTROL_BORDER       "DynamicControlBorder"
-#define FM_PROP_CONTROL_BORDER_COLOR_FOCUS   "ControlBorderColorOnFocus"
-#define FM_PROP_CONTROL_BORDER_COLOR_MOUSE   "ControlBorderColorOnHover"
-#define FM_PROP_CONTROL_BORDER_COLOR_INVALID "ControlBorderColorOnInvalid"
-#define FM_PROP_BUTTON_TYPE                  "ButtonType"
-#define FM_PROP_FORM_OPERATIONS              "FormOperations"
-#define FM_PROP_INPUT_REQUIRED               "InputRequired"
-#define FM_PROP_WRITING_MODE                 "WritingMode"
-#define FM_PROP_MOUSE_WHEEL_BEHAVIOR         "MouseWheelBehavior"
-#define FM_PROP_DESCRIPTION                  "Description"
+inline constexpr OUStringLiteral FM_PROP_ORIENTATION = u"Orientation";
+inline constexpr OUStringLiteral FM_PROP_LINEENDFORMAT = u"LineEndFormat";
+inline constexpr OUStringLiteral FM_PROP_VISUALEFFECT = u"VisualEffect";
+inline constexpr OUStringLiteral FM_PROP_BORDERCOLOR = u"BorderColor";
+inline constexpr OUStringLiteral FM_PROP_DYNAMIC_CONTROL_BORDER = u"DynamicControlBorder";
+inline constexpr OUStringLiteral FM_PROP_CONTROL_BORDER_COLOR_FOCUS = u"ControlBorderColorOnFocus";
+inline constexpr OUStringLiteral FM_PROP_CONTROL_BORDER_COLOR_MOUSE = u"ControlBorderColorOnHover";
+inline constexpr OUStringLiteral FM_PROP_CONTROL_BORDER_COLOR_INVALID = u"ControlBorderColorOnInvalid";
+inline constexpr OUStringLiteral FM_PROP_BUTTON_TYPE = u"ButtonType";
+inline constexpr OUStringLiteral FM_PROP_FORM_OPERATIONS = u"FormOperations";
+inline constexpr OUStringLiteral FM_PROP_INPUT_REQUIRED = u"InputRequired";
+inline constexpr OUStringLiteral FM_PROP_WRITING_MODE = u"WritingMode";
+inline constexpr OUStringLiteral FM_PROP_MOUSE_WHEEL_BEHAVIOR = u"MouseWheelBehavior";
+inline constexpr OUStringLiteral FM_PROP_DESCRIPTION = u"Description";
 
 #endif
 
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index d575f86528a0..2b8ee7a7d388 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -26,55 +26,55 @@
 
 namespace com::sun::star::lang { class XMultiServiceFactory; }
 
-#define FM_COMPONENT_EDIT               "stardiv.one.form.component.Edit"
-#define FM_COMPONENT_TEXTFIELD          "stardiv.one.form.component.TextField"
-#define FM_COMPONENT_LISTBOX            "stardiv.one.form.component.ListBox"
-#define FM_COMPONENT_COMBOBOX           "stardiv.one.form.component.ComboBox"
-#define FM_COMPONENT_RADIOBUTTON        "stardiv.one.form.component.RadioButton"
-#define FM_COMPONENT_GROUPBOX           "stardiv.one.form.component.GroupBox"
-#define FM_COMPONENT_FIXEDTEXT          "stardiv.one.form.component.FixedText"
-#define FM_COMPONENT_COMMANDBUTTON      "stardiv.one.form.component.CommandButton"
-#define FM_COMPONENT_CHECKBOX           "stardiv.one.form.component.CheckBox"
-#define FM_COMPONENT_GRID               "stardiv.one.form.component.Grid"
-#define FM_COMPONENT_GRIDCONTROL        "stardiv.one.form.component.GridControl"
-#define FM_COMPONENT_IMAGEBUTTON        "stardiv.one.form.component.ImageButton"
-#define FM_COMPONENT_FILECONTROL        "stardiv.one.form.component.FileControl"
-#define FM_COMPONENT_TIMEFIELD          "stardiv.one.form.component.TimeField"
-#define FM_COMPONENT_DATEFIELD          "stardiv.one.form.component.DateField"
-#define FM_COMPONENT_NUMERICFIELD       "stardiv.one.form.component.NumericField"
-#define FM_COMPONENT_CURRENCYFIELD      "stardiv.one.form.component.CurrencyField"
-#define FM_COMPONENT_PATTERNFIELD       "stardiv.one.form.component.PatternField"
-#define FM_COMPONENT_FORMATTEDFIELD     "stardiv.one.form.component.FormattedField"
-#define FM_COMPONENT_HIDDEN             "stardiv.one.form.component.Hidden"
-#define FM_COMPONENT_HIDDENCONTROL      "stardiv.one.form.component.HiddenControl"
-#define FM_COMPONENT_IMAGECONTROL       "stardiv.one.form.component.ImageControl"
-#define FM_CONTROL_GRID                 "stardiv.one.form.control.Grid"
-#define FM_CONTROL_GRIDCONTROL          "stardiv.one.form.control.GridControl"
-#define SRV_SDB_CONNECTION              "com.sun.star.sdb.Connection"
-#define FM_SUN_COMPONENT_FORM           "com.sun.star.form.component.Form"
-#define FM_SUN_COMPONENT_TEXTFIELD      "com.sun.star.form.component.TextField"
-#define FM_SUN_COMPONENT_LISTBOX        "com.sun.star.form.component.ListBox"
-#define FM_SUN_COMPONENT_COMBOBOX       "com.sun.star.form.component.ComboBox"
-#define FM_SUN_COMPONENT_RADIOBUTTON    "com.sun.star.form.component.RadioButton"
-#define FM_SUN_COMPONENT_GROUPBOX       "com.sun.star.form.component.GroupBox"
-#define FM_SUN_COMPONENT_FIXEDTEXT      "com.sun.star.form.component.FixedText"
-#define FM_SUN_COMPONENT_COMMANDBUTTON  "com.sun.star.form.component.CommandButton"
-#define FM_SUN_COMPONENT_CHECKBOX       "com.sun.star.form.component.CheckBox"
-#define FM_SUN_COMPONENT_GRIDCONTROL    "com.sun.star.form.component.GridControl"
-#define FM_SUN_COMPONENT_IMAGEBUTTON    "com.sun.star.form.component.ImageButton"
-#define FM_SUN_COMPONENT_FILECONTROL    "com.sun.star.form.component.FileControl"
-#define FM_SUN_COMPONENT_TIMEFIELD      "com.sun.star.form.component.TimeField"
-#define FM_SUN_COMPONENT_DATEFIELD      "com.sun.star.form.component.DateField"
-#define FM_SUN_COMPONENT_NUMERICFIELD   "com.sun.star.form.component.NumericField"
-#define FM_SUN_COMPONENT_CURRENCYFIELD  "com.sun.star.form.component.CurrencyField"
-#define FM_SUN_COMPONENT_PATTERNFIELD   "com.sun.star.form.component.PatternField"
-#define FM_SUN_COMPONENT_HIDDENCONTROL  "com.sun.star.form.component.HiddenControl"
-#define FM_SUN_COMPONENT_IMAGECONTROL   "com.sun.star.form.component.DatabaseImageControl"
-#define FM_SUN_COMPONENT_FORMATTEDFIELD "com.sun.star.form.component.FormattedField"
-#define FM_SUN_COMPONENT_SCROLLBAR      "com.sun.star.form.component.ScrollBar"
-#define FM_SUN_COMPONENT_SPINBUTTON     "com.sun.star.form.component.SpinButton"
-#define FM_SUN_COMPONENT_NAVIGATIONBAR  "com.sun.star.form.component.NavigationToolBar"
-#define FM_SUN_CONTROL_GRIDCONTROL      "com.sun.star.form.control.GridControl"
+inline constexpr OUStringLiteral FM_COMPONENT_EDIT = u"stardiv.one.form.component.Edit";
+inline constexpr OUStringLiteral FM_COMPONENT_TEXTFIELD = u"stardiv.one.form.component.TextField";
+inline constexpr OUStringLiteral FM_COMPONENT_LISTBOX = u"stardiv.one.form.component.ListBox";
+inline constexpr OUStringLiteral FM_COMPONENT_COMBOBOX = u"stardiv.one.form.component.ComboBox";
+inline constexpr OUStringLiteral FM_COMPONENT_RADIOBUTTON = u"stardiv.one.form.component.RadioButton";
+inline constexpr OUStringLiteral FM_COMPONENT_GROUPBOX = u"stardiv.one.form.component.GroupBox";
+inline constexpr OUStringLiteral FM_COMPONENT_FIXEDTEXT = u"stardiv.one.form.component.FixedText";
+inline constexpr OUStringLiteral FM_COMPONENT_COMMANDBUTTON = u"stardiv.one.form.component.CommandButton";
+inline constexpr OUStringLiteral FM_COMPONENT_CHECKBOX = u"stardiv.one.form.component.CheckBox";
+inline constexpr OUStringLiteral FM_COMPONENT_GRID = u"stardiv.one.form.component.Grid";
+inline constexpr OUStringLiteral FM_COMPONENT_GRIDCONTROL = u"stardiv.one.form.component.GridControl";
+inline constexpr OUStringLiteral FM_COMPONENT_IMAGEBUTTON = u"stardiv.one.form.component.ImageButton";
+inline constexpr OUStringLiteral FM_COMPONENT_FILECONTROL = u"stardiv.one.form.component.FileControl";
+inline constexpr OUStringLiteral FM_COMPONENT_TIMEFIELD = u"stardiv.one.form.component.TimeField";
+inline constexpr OUStringLiteral FM_COMPONENT_DATEFIELD = u"stardiv.one.form.component.DateField";
+inline constexpr OUStringLiteral FM_COMPONENT_NUMERICFIELD = u"stardiv.one.form.component.NumericField";
+inline constexpr OUStringLiteral FM_COMPONENT_CURRENCYFIELD = u"stardiv.one.form.component.CurrencyField";
+inline constexpr OUStringLiteral FM_COMPONENT_PATTERNFIELD = u"stardiv.one.form.component.PatternField";
+inline constexpr OUStringLiteral FM_COMPONENT_FORMATTEDFIELD = u"stardiv.one.form.component.FormattedField";
+inline constexpr OUStringLiteral FM_COMPONENT_HIDDEN = u"stardiv.one.form.component.Hidden";
+inline constexpr OUStringLiteral FM_COMPONENT_HIDDENCONTROL = u"stardiv.one.form.component.HiddenControl";
+inline constexpr OUStringLiteral FM_COMPONENT_IMAGECONTROL = u"stardiv.one.form.component.ImageControl";
+inline constexpr OUStringLiteral FM_CONTROL_GRID = u"stardiv.one.form.control.Grid";
+inline constexpr OUStringLiteral FM_CONTROL_GRIDCONTROL = u"stardiv.one.form.control.GridControl";
+inline constexpr OUStringLiteral SRV_SDB_CONNECTION = u"com.sun.star.sdb.Connection";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_FORM = u"com.sun.star.form.component.Form";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_TEXTFIELD = u"com.sun.star.form.component.TextField";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_LISTBOX = u"com.sun.star.form.component.ListBox";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_COMBOBOX = u"com.sun.star.form.component.ComboBox";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_RADIOBUTTON = u"com.sun.star.form.component.RadioButton";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_GROUPBOX = u"com.sun.star.form.component.GroupBox";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_FIXEDTEXT = u"com.sun.star.form.component.FixedText";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_COMMANDBUTTON = u"com.sun.star.form.component.CommandButton";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_CHECKBOX = u"com.sun.star.form.component.CheckBox";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_GRIDCONTROL = u"com.sun.star.form.component.GridControl";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_IMAGEBUTTON = u"com.sun.star.form.component.ImageButton";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_FILECONTROL = u"com.sun.star.form.component.FileControl";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_TIMEFIELD = u"com.sun.star.form.component.TimeField";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_DATEFIELD = u"com.sun.star.form.component.DateField";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_NUMERICFIELD = u"com.sun.star.form.component.NumericField";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_CURRENCYFIELD = u"com.sun.star.form.component.CurrencyField";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_PATTERNFIELD = u"com.sun.star.form.component.PatternField";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_HIDDENCONTROL = u"com.sun.star.form.component.HiddenControl";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_IMAGECONTROL = u"com.sun.star.form.component.DatabaseImageControl";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_FORMATTEDFIELD = u"com.sun.star.form.component.FormattedField";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_SCROLLBAR = u"com.sun.star.form.component.ScrollBar";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_SPINBUTTON = u"com.sun.star.form.component.SpinButton";
+inline constexpr OUStringLiteral FM_SUN_COMPONENT_NAVIGATIONBAR = u"com.sun.star.form.component.NavigationToolBar";
+inline constexpr OUStringLiteral FM_SUN_CONTROL_GRIDCONTROL = u"com.sun.star.form.control.GridControl";
 
 namespace svxform
 {
diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index a354eae59e84..efe883d597cc 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -20,33 +20,33 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 
-#define FMURL_FORM_POSITION                ".uno:FormController/positionForm"
-#define FMURL_FORM_RECORDCOUNT             ".uno:FormController/RecordCount"
-#define FMURL_RECORD_MOVEFIRST             ".uno:FormController/moveToFirst"
-#define FMURL_RECORD_MOVEPREV              ".uno:FormController/moveToPrev"
-#define FMURL_RECORD_MOVENEXT              ".uno:FormController/moveToNext"
-#define FMURL_RECORD_MOVELAST              ".uno:FormController/moveToLast"
-#define FMURL_RECORD_MOVETONEW             ".uno:FormController/moveToNew"
-#define FMURL_RECORD_UNDO                  ".uno:FormController/undoRecord"
-#define FMURL_RECORD_SAVE                  ".uno:FormController/saveRecord"
-#define FMURL_RECORD_DELETE                ".uno:FormController/deleteRecord"
-#define FMURL_FORM_REFRESH                 ".uno:FormController/refreshForm"
-#define FMURL_FORM_REFRESH_CURRENT_CONTROL ".uno:FormController/refreshCurrentControl"
-#define FMURL_FORM_SORT_UP                 ".uno:FormController/sortUp"
-#define FMURL_FORM_SORT_DOWN               ".uno:FormController/sortDown"
-#define FMURL_FORM_SORT                    ".uno:FormController/sort"
-#define FMURL_FORM_AUTO_FILTER             ".uno:FormController/autoFilter"
-#define FMURL_FORM_FILTER                  ".uno:FormController/filter"
-#define FMURL_FORM_APPLY_FILTER            ".uno:FormController/applyFilter"
-#define FMURL_FORM_REMOVE_FILTER           ".uno:FormController/removeFilterOrder"
-#define FMURL_CONFIRM_DELETION             ".uno:FormSlots/ConfirmDeletion"
-#define FMURL_COMPONENT_FORMGRIDVIEW       ".component:DB/FormGridView"
-#define FMURL_GRIDVIEW_CLEARVIEW           ".uno:FormSlots/ClearView"
-#define FMURL_GRIDVIEW_ADDCOLUMN           ".uno:FormSlots/AddGridColumn"
-#define FMURL_GRIDVIEW_ATTACHTOFORM        ".uno:FormSlots/AttachToForm"
-#define FMARG_ATTACHTO_MASTERFORM          "MasterForm"
-#define FMARG_ADDCOL_COLUMNTYPE            "ColumnType"
-#define FMARG_ADDCOL_COLUMNPOS             "ColumnPosition"
+inline constexpr OUStringLiteral FMURL_FORM_POSITION = u".uno:FormController/positionForm";
+inline constexpr OUStringLiteral FMURL_FORM_RECORDCOUNT = u".uno:FormController/RecordCount";
+inline constexpr OUStringLiteral FMURL_RECORD_MOVEFIRST = u".uno:FormController/moveToFirst";
+inline constexpr OUStringLiteral FMURL_RECORD_MOVEPREV = u".uno:FormController/moveToPrev";
+inline constexpr OUStringLiteral FMURL_RECORD_MOVENEXT = u".uno:FormController/moveToNext";
+inline constexpr OUStringLiteral FMURL_RECORD_MOVELAST = u".uno:FormController/moveToLast";
+inline constexpr OUStringLiteral FMURL_RECORD_MOVETONEW = u".uno:FormController/moveToNew";
+inline constexpr OUStringLiteral FMURL_RECORD_UNDO = u".uno:FormController/undoRecord";
+inline constexpr OUStringLiteral FMURL_RECORD_SAVE = u".uno:FormController/saveRecord";
+inline constexpr OUStringLiteral FMURL_RECORD_DELETE = u".uno:FormController/deleteRecord";
+inline constexpr OUStringLiteral FMURL_FORM_REFRESH = u".uno:FormController/refreshForm";
+inline constexpr OUStringLiteral FMURL_FORM_REFRESH_CURRENT_CONTROL = u".uno:FormController/refreshCurrentControl";
+inline constexpr OUStringLiteral FMURL_FORM_SORT_UP = u".uno:FormController/sortUp";
+inline constexpr OUStringLiteral FMURL_FORM_SORT_DOWN = u".uno:FormController/sortDown";
+inline constexpr OUStringLiteral FMURL_FORM_SORT = u".uno:FormController/sort";
+inline constexpr OUStringLiteral FMURL_FORM_AUTO_FILTER = u".uno:FormController/autoFilter";
+inline constexpr OUStringLiteral FMURL_FORM_FILTER = u".uno:FormController/filter";
+inline constexpr OUStringLiteral FMURL_FORM_APPLY_FILTER = u".uno:FormController/applyFilter";
+inline constexpr OUStringLiteral FMURL_FORM_REMOVE_FILTER = u".uno:FormController/removeFilterOrder";
+inline constexpr OUStringLiteral FMURL_CONFIRM_DELETION = u".uno:FormSlots/ConfirmDeletion";
+inline constexpr OUStringLiteral FMURL_COMPONENT_FORMGRIDVIEW = u".component:DB/FormGridView";
+inline constexpr OUStringLiteral FMURL_GRIDVIEW_CLEARVIEW = u".uno:FormSlots/ClearView";
+inline constexpr OUStringLiteral FMURL_GRIDVIEW_ADDCOLUMN = u".uno:FormSlots/AddGridColumn";
+inline constexpr OUStringLiteral FMURL_GRIDVIEW_ATTACHTOFORM = u".uno:FormSlots/AttachToForm";
+inline constexpr OUStringLiteral FMARG_ATTACHTO_MASTERFORM = u"MasterForm";
+inline constexpr OUStringLiteral FMARG_ADDCOL_COLUMNTYPE = u"ColumnType";
+inline constexpr OUStringLiteral FMARG_ADDCOL_COLUMNPOS = u"ColumnPosition";
 
 #endif // INCLUDED_SVX_SOURCE_INC_FMURL_HXX