Extended loplugin:ostr: Rewrite some O[U]StringLiteral -> O[U]String

...in include files.  This is a mix of automatic rewriting in include files and
manual fixups (mostly addressing loplugin:redundantfcast) in source files that
include those.

Change-Id: I1f3cc1e67b9cabd2e9d61a4d9e9a01e587ea35cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158337
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

17 files changed, 378 insertions, 381 deletions

diff --git a/dbaccess/inc/bitmaps.hlst b/dbaccess/inc/bitmaps.hlst
index 15352b63b524..1f93e59f505c 100644
--- a/dbaccess/inc/bitmaps.hlst
+++ b/dbaccess/inc/bitmaps.hlst
@@ -10,24 +10,24 @@
 #ifndef INCLUDED_DBACCESS_INC_BITMAPS_HRC
 #define INCLUDED_DBACCESS_INC_BITMAPS_HRC
 
-inline constexpr OUStringLiteral BMP_FORMFOLDER_TREE_L = u"dbaccess/res/forms_32.png";
-inline constexpr OUStringLiteral BMP_REPORTFOLDER_TREE_L = u"dbaccess/res/reports_32.png";
-inline constexpr OUStringLiteral BMP_QUERYFOLDER_TREE_L = u"dbaccess/res/queries_32.png";
-inline constexpr OUStringLiteral BMP_TABLEFOLDER_TREE_L = u"dbaccess/res/tables_32.png";
-inline constexpr OUStringLiteral DATABASE_TREE_ICON = u"dbaccess/res/db.png";
-inline constexpr OUStringLiteral TABLE_TREE_ICON = u"res/sx03188.png";
-inline constexpr OUStringLiteral TABLEFOLDER_TREE_ICON = u"res/sx03187.png";
-inline constexpr OUStringLiteral VIEW_TREE_ICON = u"res/sx16670.png";
-inline constexpr OUStringLiteral QUERY_TREE_ICON = u"res/sx03202.png";
-inline constexpr OUStringLiteral QUERYFOLDER_TREE_ICON = u"res/sx03201.png";
-inline constexpr OUStringLiteral FORM_TREE_ICON = u"dbaccess/res/form_16.png";
-inline constexpr OUStringLiteral FORMFOLDER_TREE_ICON = u"dbaccess/res/forms_16.png";
-inline constexpr OUStringLiteral REPORT_TREE_ICON = u"dbaccess/res/report_16.png";
-inline constexpr OUStringLiteral REPORTFOLDER_TREE_ICON = u"dbaccess/res/reports_16.png";
-inline constexpr OUStringLiteral BMP_PRIMARY_KEY = u"dbaccess/res/jo01.png";
-inline constexpr OUStringLiteral BMP_PKEYICON = u"dbaccess/res/pkey.png";
-inline constexpr OUStringLiteral BMP_UP = u"dbaccess/res/sortup.png";
-inline constexpr OUStringLiteral BMP_DOWN = u"dbaccess/res/sortdown.png";
+inline constexpr OUString BMP_FORMFOLDER_TREE_L = u"dbaccess/res/forms_32.png"_ustr;
+inline constexpr OUString BMP_REPORTFOLDER_TREE_L = u"dbaccess/res/reports_32.png"_ustr;
+inline constexpr OUString BMP_QUERYFOLDER_TREE_L = u"dbaccess/res/queries_32.png"_ustr;
+inline constexpr OUString BMP_TABLEFOLDER_TREE_L = u"dbaccess/res/tables_32.png"_ustr;
+inline constexpr OUString DATABASE_TREE_ICON = u"dbaccess/res/db.png"_ustr;
+inline constexpr OUString TABLE_TREE_ICON = u"res/sx03188.png"_ustr;
+inline constexpr OUString TABLEFOLDER_TREE_ICON = u"res/sx03187.png"_ustr;
+inline constexpr OUString VIEW_TREE_ICON = u"res/sx16670.png"_ustr;
+inline constexpr OUString QUERY_TREE_ICON = u"res/sx03202.png"_ustr;
+inline constexpr OUString QUERYFOLDER_TREE_ICON = u"res/sx03201.png"_ustr;
+inline constexpr OUString FORM_TREE_ICON = u"dbaccess/res/form_16.png"_ustr;
+inline constexpr OUString FORMFOLDER_TREE_ICON = u"dbaccess/res/forms_16.png"_ustr;
+inline constexpr OUString REPORT_TREE_ICON = u"dbaccess/res/report_16.png"_ustr;
+inline constexpr OUString REPORTFOLDER_TREE_ICON = u"dbaccess/res/reports_16.png"_ustr;
+inline constexpr OUString BMP_PRIMARY_KEY = u"dbaccess/res/jo01.png"_ustr;
+inline constexpr OUString BMP_PKEYICON = u"dbaccess/res/pkey.png"_ustr;
+inline constexpr OUString BMP_UP = u"dbaccess/res/sortup.png"_ustr;
+inline constexpr OUString BMP_DOWN = u"dbaccess/res/sortdown.png"_ustr;
 
 #endif
 
diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h
index 4757d5d4b3f1..8f496b98a138 100644
--- a/dbaccess/inc/helpids.h
+++ b/dbaccess/inc/helpids.h
@@ -22,91 +22,91 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral HID_DATABROWSE_HEADER = u"DBACCESS_HID_DATABROWSE_HEADER";
-inline constexpr OUStringLiteral HID_CTL_TABBROWSER = u"DBACCESS_HID_CTL_TABBROWSER";
-inline constexpr OUStringLiteral HID_CTL_TREEVIEW = u"DBACCESS_HID_CTL_TREEVIEW";
-
-inline constexpr OUStringLiteral HID_DSADMIN_BROWSECONN = u"DBACCESS_HID_DSADMIN_BROWSECONN";
-
-inline constexpr OUStringLiteral HID_CTL_QRYSQLEDIT = u"DBACCESS_HID_CTL_QRYSQLEDIT";
-
-inline constexpr OUStringLiteral HID_CTL_QRYDGNTAB = u"DBACCESS_HID_CTL_QRYDGNTAB";
-inline constexpr OUStringLiteral HID_CTL_QRYDGNCRIT = u"DBACCESS_HID_CTL_QRYDGNCRIT";
-inline constexpr OUStringLiteral HID_QRYDGN_ROW_VISIBLE = u"DBACCESS_HID_QRYDGN_ROW_VISIBLE";
-inline constexpr OUStringLiteral HID_QRYDGN_ROW_TABLE = u"DBACCESS_HID_QRYDGN_ROW_TABLE";
-inline constexpr OUStringLiteral HID_QRYDGN_ROW_FIELD = u"DBACCESS_HID_QRYDGN_ROW_FIELD";
-inline constexpr OUStringLiteral HID_QRYDGN_ROW_ORDER = u"DBACCESS_HID_QRYDGN_ROW_ORDER";
-inline constexpr OUStringLiteral HID_QRYDGN_ROW_FUNCTION = u"DBACCESS_HID_QRYDGN_ROW_FUNCTION";
-inline constexpr OUStringLiteral HID_QRYDGN_ROW_ALIAS = u"DBACCESS_HID_QRYDGN_ROW_ALIAS";
-inline constexpr OUStringLiteral HID_QRYDGN_ROW_CRIT = u"DBACCESS_HID_QRYDGN_ROW_CRIT";
-
-inline constexpr OUStringLiteral HID_TAB_DESIGN_FIELDCONTROL = u"DBACCESS_HID_TAB_DESIGN_FIELDCONTROL";
-inline constexpr OUStringLiteral HID_TAB_DESIGN_DESCWIN = u"DBACCESS_HID_TAB_DESIGN_DESCWIN";
-inline constexpr OUStringLiteral HID_TABDESIGN_BACKGROUND = u"DBACCESS_HID_TABDESIGN_BACKGROUND";
-inline constexpr OUStringLiteral HID_CTL_TABLEEDIT = u"DBACCESS_HID_CTL_TABLEEDIT";
-inline constexpr OUStringLiteral HID_TABDESIGN_NAMECELL = u"DBACCESS_HID_TABDESIGN_NAMECELL";
-inline constexpr OUStringLiteral HID_TABDESIGN_TYPECELL = u"DBACCESS_HID_TABDESIGN_TYPECELL";
-inline constexpr OUStringLiteral HID_TABDESIGN_COMMENTCELL = u"DBACCESS_HID_TABDESIGN_COMMENTCELL";
-inline constexpr OUStringLiteral HID_TAB_DESIGN_HELP_TEXT_FRAME = u"DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME";
-inline constexpr OUStringLiteral HID_TAB_ENT_DEFAULT = u"DBACCESS_HID_TAB_ENT_DEFAULT";
-inline constexpr OUStringLiteral HID_TAB_ENT_FORMAT_SAMPLE = u"DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE";
-inline constexpr OUStringLiteral HID_TAB_ENT_FORMAT = u"DBACCESS_HID_TAB_ENT_FORMAT";
-inline constexpr OUStringLiteral HID_TAB_ENT_BOOL_DEFAULT = u"DBACCESS_HID_TAB_ENT_BOOL_DEFAULT";
-inline constexpr OUStringLiteral HID_TAB_ENT_REQUIRED = u"DBACCESS_HID_TAB_ENT_REQUIRED";
-inline constexpr OUStringLiteral HID_TAB_ENT_AUTOINCREMENT = u"DBACCESS_HID_TAB_ENT_AUTOINCREMENT";
-inline constexpr OUStringLiteral HID_TAB_ENT_TEXT_LEN = u"DBACCESS_HID_TAB_ENT_TEXT_LEN";
-inline constexpr OUStringLiteral HID_TAB_ENT_TYPE = u"DBACCESS_HID_TAB_ENT_TYPE";
-inline constexpr OUStringLiteral HID_TAB_ENT_COLUMNNAME = u"DBACCESS_HID_TAB_ENT_COLUMNNAME";
-inline constexpr OUStringLiteral HID_TAB_ENT_NUMTYP = u"DBACCESS_HID_TAB_ENT_NUMTYP";
-inline constexpr OUStringLiteral HID_TAB_ENT_LEN = u"DBACCESS_HID_TAB_ENT_LEN";
-inline constexpr OUStringLiteral HID_TAB_ENT_SCALE = u"DBACCESS_HID_TAB_ENT_SCALE";
-inline constexpr OUStringLiteral HID_CTL_RELATIONTAB = u"DBACCESS_HID_CTL_RELATIONTAB";
-inline constexpr OUStringLiteral HID_RELATIONDIALOG_LEFTFIELDCELL = u"DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL";
-inline constexpr OUStringLiteral HID_RELATIONDIALOG_RIGHTFIELDCELL = u"DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL";
-inline constexpr OUStringLiteral HID_CONFIRM_DROP_BUTTON_ALL = u"DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL";
-inline constexpr OUStringLiteral HID_DSADMIN_LDAP_HOSTNAME = u"DBACCESS_HID_DSADMIN_LDAP_HOSTNAME";
-inline constexpr OUStringLiteral HID_DSADMIN_MOZILLA_PROFILE_NAME = u"DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME";
-inline constexpr OUStringLiteral HID_DSADMIN_THUNDERBIRD_PROFILE_NAME = u"DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME";
-
-inline constexpr OUStringLiteral HID_DLGINDEX_INDEXDETAILS_FIELD = u"DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD";
-inline constexpr OUStringLiteral HID_DLGINDEX_INDEXDETAILS_SORTORDER = u"DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER";
-
-inline constexpr OUStringLiteral HID_TAB_AUTOINCREMENTVALUE = u"DBACCESS_HID_TAB_AUTOINCREMENTVALUE";
-
-inline constexpr OUStringLiteral HID_DSADMIN_DBASE_PATH = u"DBACCESS_HID_DSADMIN_DBASE_PATH";
-inline constexpr OUStringLiteral HID_DSADMIN_MYSQL_DATABASE = u"DBACCESS_HID_DSADMIN_MYSQL_DATABASE";
-inline constexpr OUStringLiteral HID_DSADMIN_MYSQL_ODBC_DATASOURCE = u"DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE";
-inline constexpr OUStringLiteral HID_DSADMIN_ODBC_DATASOURCE = u"DBACCESS_HID_DSADMIN_ODBC_DATASOURCE";
-inline constexpr OUStringLiteral HID_DSADMIN_MSACCESS_MDB_FILE = u"DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE";
-inline constexpr OUStringLiteral HID_DSADMIN_FLAT_PATH = u"DBACCESS_HID_DSADMIN_FLAT_PATH";
-inline constexpr OUStringLiteral HID_DSADMIN_CALC_PATH = u"DBACCESS_HID_DSADMIN_CALC_PATH";
-inline constexpr OUStringLiteral HID_DSADMIN_WRITER_PATH = u"DBACCESS_HID_DSADMIN_WRITER_PATH";
-inline constexpr OUStringLiteral HID_DSADMIN_ORACLE_DATABASE = u"DBACCESS_HID_DSADMIN_ORACLE_DATABASE";
-
-inline constexpr OUStringLiteral HID_APP_TABLE_TREE = u"DBACCESS_HID_APP_TABLE_TREE";
-inline constexpr OUStringLiteral HID_APP_FORM_TREE = u"DBACCESS_HID_APP_FORM_TREE";
-inline constexpr OUStringLiteral HID_APP_QUERY_TREE = u"DBACCESS_HID_APP_QUERY_TREE";
-inline constexpr OUStringLiteral HID_APP_REPORT_TREE = u"DBACCESS_HID_APP_REPORT_TREE";
-inline constexpr OUStringLiteral HID_APP_CREATION_LIST = u"DBACCESS_HID_APP_CREATION_LIST";
-inline constexpr OUStringLiteral HID_APP_SWAP_ICONCONTROL = u"DBACCESS_HID_APP_SWAP_ICONCONTROL";
-
-
-inline constexpr OUStringLiteral HID_APP_HELP_TEXT = u"DBACCESS_HID_APP_HELP_TEXT";
-inline constexpr OUStringLiteral HID_APP_DESCRIPTION_TEXT = u"DBACCESS_HID_APP_DESCRIPTION_TEXT";
-inline constexpr OUStringLiteral HID_APP_VIEW_PREVIEW_CB = u"DBACCESS_HID_APP_VIEW_PREVIEW_CB";
-inline constexpr OUStringLiteral HID_APP_VIEW_PREVIEW_1 = u"DBACCESS_HID_APP_VIEW_PREVIEW_1";
-inline constexpr OUStringLiteral HID_APP_VIEW_PREVIEW_2 = u"DBACCESS_HID_APP_VIEW_PREVIEW_2";
-inline constexpr OUStringLiteral HID_TABDESIGN_HELPTEXT = u"DBACCESS_HID_TABDESIGN_HELPTEXT";
-inline constexpr OUStringLiteral HID_APP_VIEW_PREVIEW_3 = u"DBACCESS_HID_APP_VIEW_PREVIEW_3";
-
-
-inline constexpr OUStringLiteral HID_DBWIZ_PREVIOUS = u"DBACCESS_HID_DBWIZ_PREVIOUS";
-inline constexpr OUStringLiteral HID_DBWIZ_NEXT = u"DBACCESS_HID_DBWIZ_NEXT";
-inline constexpr OUStringLiteral HID_DBWIZ_CANCEL = u"DBACCESS_HID_DBWIZ_CANCEL";
-inline constexpr OUStringLiteral HID_DBWIZ_FINISH = u"DBACCESS_HID_DBWIZ_FINISH";
-inline constexpr OUStringLiteral HID_DBWIZ_HELP = u"DBACCESS_HID_DBWIZ_HELP";
-
-inline constexpr OUStringLiteral HID_DBWIZ_ROADMAP = u"DBACCESS_HID_DBWIZ_ROADMAP";
+inline constexpr OUString HID_DATABROWSE_HEADER = u"DBACCESS_HID_DATABROWSE_HEADER"_ustr;
+inline constexpr OUString HID_CTL_TABBROWSER = u"DBACCESS_HID_CTL_TABBROWSER"_ustr;
+inline constexpr OUString HID_CTL_TREEVIEW = u"DBACCESS_HID_CTL_TREEVIEW"_ustr;
+
+inline constexpr OUString HID_DSADMIN_BROWSECONN = u"DBACCESS_HID_DSADMIN_BROWSECONN"_ustr;
+
+inline constexpr OUString HID_CTL_QRYSQLEDIT = u"DBACCESS_HID_CTL_QRYSQLEDIT"_ustr;
+
+inline constexpr OUString HID_CTL_QRYDGNTAB = u"DBACCESS_HID_CTL_QRYDGNTAB"_ustr;
+inline constexpr OUString HID_CTL_QRYDGNCRIT = u"DBACCESS_HID_CTL_QRYDGNCRIT"_ustr;
+inline constexpr OUString HID_QRYDGN_ROW_VISIBLE = u"DBACCESS_HID_QRYDGN_ROW_VISIBLE"_ustr;
+inline constexpr OUString HID_QRYDGN_ROW_TABLE = u"DBACCESS_HID_QRYDGN_ROW_TABLE"_ustr;
+inline constexpr OUString HID_QRYDGN_ROW_FIELD = u"DBACCESS_HID_QRYDGN_ROW_FIELD"_ustr;
+inline constexpr OUString HID_QRYDGN_ROW_ORDER = u"DBACCESS_HID_QRYDGN_ROW_ORDER"_ustr;
+inline constexpr OUString HID_QRYDGN_ROW_FUNCTION = u"DBACCESS_HID_QRYDGN_ROW_FUNCTION"_ustr;
+inline constexpr OUString HID_QRYDGN_ROW_ALIAS = u"DBACCESS_HID_QRYDGN_ROW_ALIAS"_ustr;
+inline constexpr OUString HID_QRYDGN_ROW_CRIT = u"DBACCESS_HID_QRYDGN_ROW_CRIT"_ustr;
+
+inline constexpr OUString HID_TAB_DESIGN_FIELDCONTROL = u"DBACCESS_HID_TAB_DESIGN_FIELDCONTROL"_ustr;
+inline constexpr OUString HID_TAB_DESIGN_DESCWIN = u"DBACCESS_HID_TAB_DESIGN_DESCWIN"_ustr;
+inline constexpr OUString HID_TABDESIGN_BACKGROUND = u"DBACCESS_HID_TABDESIGN_BACKGROUND"_ustr;
+inline constexpr OUString HID_CTL_TABLEEDIT = u"DBACCESS_HID_CTL_TABLEEDIT"_ustr;
+inline constexpr OUString HID_TABDESIGN_NAMECELL = u"DBACCESS_HID_TABDESIGN_NAMECELL"_ustr;
+inline constexpr OUString HID_TABDESIGN_TYPECELL = u"DBACCESS_HID_TABDESIGN_TYPECELL"_ustr;
+inline constexpr OUString HID_TABDESIGN_COMMENTCELL = u"DBACCESS_HID_TABDESIGN_COMMENTCELL"_ustr;
+inline constexpr OUString HID_TAB_DESIGN_HELP_TEXT_FRAME = u"DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME"_ustr;
+inline constexpr OUString HID_TAB_ENT_DEFAULT = u"DBACCESS_HID_TAB_ENT_DEFAULT"_ustr;
+inline constexpr OUString HID_TAB_ENT_FORMAT_SAMPLE = u"DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE"_ustr;
+inline constexpr OUString HID_TAB_ENT_FORMAT = u"DBACCESS_HID_TAB_ENT_FORMAT"_ustr;
+inline constexpr OUString HID_TAB_ENT_BOOL_DEFAULT = u"DBACCESS_HID_TAB_ENT_BOOL_DEFAULT"_ustr;
+inline constexpr OUString HID_TAB_ENT_REQUIRED = u"DBACCESS_HID_TAB_ENT_REQUIRED"_ustr;
+inline constexpr OUString HID_TAB_ENT_AUTOINCREMENT = u"DBACCESS_HID_TAB_ENT_AUTOINCREMENT"_ustr;
+inline constexpr OUString HID_TAB_ENT_TEXT_LEN = u"DBACCESS_HID_TAB_ENT_TEXT_LEN"_ustr;
+inline constexpr OUString HID_TAB_ENT_TYPE = u"DBACCESS_HID_TAB_ENT_TYPE"_ustr;
+inline constexpr OUString HID_TAB_ENT_COLUMNNAME = u"DBACCESS_HID_TAB_ENT_COLUMNNAME"_ustr;
+inline constexpr OUString HID_TAB_ENT_NUMTYP = u"DBACCESS_HID_TAB_ENT_NUMTYP"_ustr;
+inline constexpr OUString HID_TAB_ENT_LEN = u"DBACCESS_HID_TAB_ENT_LEN"_ustr;
+inline constexpr OUString HID_TAB_ENT_SCALE = u"DBACCESS_HID_TAB_ENT_SCALE"_ustr;
+inline constexpr OUString HID_CTL_RELATIONTAB = u"DBACCESS_HID_CTL_RELATIONTAB"_ustr;
+inline constexpr OUString HID_RELATIONDIALOG_LEFTFIELDCELL = u"DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL"_ustr;
+inline constexpr OUString HID_RELATIONDIALOG_RIGHTFIELDCELL = u"DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL"_ustr;
+inline constexpr OUString HID_CONFIRM_DROP_BUTTON_ALL = u"DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL"_ustr;
+inline constexpr OUString HID_DSADMIN_LDAP_HOSTNAME = u"DBACCESS_HID_DSADMIN_LDAP_HOSTNAME"_ustr;
+inline constexpr OUString HID_DSADMIN_MOZILLA_PROFILE_NAME = u"DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME"_ustr;
+inline constexpr OUString HID_DSADMIN_THUNDERBIRD_PROFILE_NAME = u"DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME"_ustr;
+
+inline constexpr OUString HID_DLGINDEX_INDEXDETAILS_FIELD = u"DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD"_ustr;
+inline constexpr OUString HID_DLGINDEX_INDEXDETAILS_SORTORDER = u"DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER"_ustr;
+
+inline constexpr OUString HID_TAB_AUTOINCREMENTVALUE = u"DBACCESS_HID_TAB_AUTOINCREMENTVALUE"_ustr;
+
+inline constexpr OUString HID_DSADMIN_DBASE_PATH = u"DBACCESS_HID_DSADMIN_DBASE_PATH"_ustr;
+inline constexpr OUString HID_DSADMIN_MYSQL_DATABASE = u"DBACCESS_HID_DSADMIN_MYSQL_DATABASE"_ustr;
+inline constexpr OUString HID_DSADMIN_MYSQL_ODBC_DATASOURCE = u"DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE"_ustr;
+inline constexpr OUString HID_DSADMIN_ODBC_DATASOURCE = u"DBACCESS_HID_DSADMIN_ODBC_DATASOURCE"_ustr;
+inline constexpr OUString HID_DSADMIN_MSACCESS_MDB_FILE = u"DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE"_ustr;
+inline constexpr OUString HID_DSADMIN_FLAT_PATH = u"DBACCESS_HID_DSADMIN_FLAT_PATH"_ustr;
+inline constexpr OUString HID_DSADMIN_CALC_PATH = u"DBACCESS_HID_DSADMIN_CALC_PATH"_ustr;
+inline constexpr OUString HID_DSADMIN_WRITER_PATH = u"DBACCESS_HID_DSADMIN_WRITER_PATH"_ustr;
+inline constexpr OUString HID_DSADMIN_ORACLE_DATABASE = u"DBACCESS_HID_DSADMIN_ORACLE_DATABASE"_ustr;
+
+inline constexpr OUString HID_APP_TABLE_TREE = u"DBACCESS_HID_APP_TABLE_TREE"_ustr;
+inline constexpr OUString HID_APP_FORM_TREE = u"DBACCESS_HID_APP_FORM_TREE"_ustr;
+inline constexpr OUString HID_APP_QUERY_TREE = u"DBACCESS_HID_APP_QUERY_TREE"_ustr;
+inline constexpr OUString HID_APP_REPORT_TREE = u"DBACCESS_HID_APP_REPORT_TREE"_ustr;
+inline constexpr OUString HID_APP_CREATION_LIST = u"DBACCESS_HID_APP_CREATION_LIST"_ustr;
+inline constexpr OUString HID_APP_SWAP_ICONCONTROL = u"DBACCESS_HID_APP_SWAP_ICONCONTROL"_ustr;
+
+
+inline constexpr OUString HID_APP_HELP_TEXT = u"DBACCESS_HID_APP_HELP_TEXT"_ustr;
+inline constexpr OUString HID_APP_DESCRIPTION_TEXT = u"DBACCESS_HID_APP_DESCRIPTION_TEXT"_ustr;
+inline constexpr OUString HID_APP_VIEW_PREVIEW_CB = u"DBACCESS_HID_APP_VIEW_PREVIEW_CB"_ustr;
+inline constexpr OUString HID_APP_VIEW_PREVIEW_1 = u"DBACCESS_HID_APP_VIEW_PREVIEW_1"_ustr;
+inline constexpr OUString HID_APP_VIEW_PREVIEW_2 = u"DBACCESS_HID_APP_VIEW_PREVIEW_2"_ustr;
+inline constexpr OUString HID_TABDESIGN_HELPTEXT = u"DBACCESS_HID_TABDESIGN_HELPTEXT"_ustr;
+inline constexpr OUString HID_APP_VIEW_PREVIEW_3 = u"DBACCESS_HID_APP_VIEW_PREVIEW_3"_ustr;
+
+
+inline constexpr OUString HID_DBWIZ_PREVIOUS = u"DBACCESS_HID_DBWIZ_PREVIOUS"_ustr;
+inline constexpr OUString HID_DBWIZ_NEXT = u"DBACCESS_HID_DBWIZ_NEXT"_ustr;
+inline constexpr OUString HID_DBWIZ_CANCEL = u"DBACCESS_HID_DBWIZ_CANCEL"_ustr;
+inline constexpr OUString HID_DBWIZ_FINISH = u"DBACCESS_HID_DBWIZ_FINISH"_ustr;
+inline constexpr OUString HID_DBWIZ_HELP = u"DBACCESS_HID_DBWIZ_HELP"_ustr;
+
+inline constexpr OUString HID_DBWIZ_ROADMAP = u"DBACCESS_HID_DBWIZ_ROADMAP"_ustr;
 
 #endif
 
diff --git a/dbaccess/inc/strings.hxx b/dbaccess/inc/strings.hxx
index 021f34cc70b5..9783f9e41030 100644
--- a/dbaccess/inc/strings.hxx
+++ b/dbaccess/inc/strings.hxx
@@ -12,263 +12,260 @@
 
 // property names
 
-inline constexpr OUStringLiteral PROPERTY_URL(u"URL");
-inline constexpr OUStringLiteral PROPERTY_INFO(u"Info");
-inline constexpr OUStringLiteral PROPERTY_SETTINGS(u"Settings");
-inline constexpr OUStringLiteral PROPERTY_ISPASSWORDREQUIRED(u"IsPasswordRequired");
-inline constexpr OUStringLiteral PROPERTY_TABLEFILTER(u"TableFilter");
-inline constexpr OUStringLiteral PROPERTY_TABLETYPEFILTER(u"TableTypeFilter");
-inline constexpr OUStringLiteral PROPERTY_NAME(u"Name");
-inline constexpr OUStringLiteral PROPERTY_SCHEMANAME(u"SchemaName");
-inline constexpr OUStringLiteral PROPERTY_CATALOGNAME(u"CatalogName");
-inline constexpr OUStringLiteral PROPERTY_PRIVILEGES(u"Privileges");
-inline constexpr OUStringLiteral PROPERTY_ESCAPE_PROCESSING(u"EscapeProcessing");
-inline constexpr OUStringLiteral PROPERTY_COMMAND(u"Command");
-inline constexpr OUStringLiteral PROPERTY_TYPE(u"Type");
-inline constexpr OUStringLiteral PROPERTY_TYPENAME(u"TypeName");
-inline constexpr OUStringLiteral PROPERTY_PRECISION(u"Precision");
-inline constexpr OUStringLiteral PROPERTY_SCALE(u"Scale");
-inline constexpr OUStringLiteral PROPERTY_ISNULLABLE(u"IsNullable");
-inline constexpr OUStringLiteral PROPERTY_ISAUTOINCREMENT(u"IsAutoIncrement");
-inline constexpr OUStringLiteral PROPERTY_ISROWVERSION(u"IsRowVersion");
-inline constexpr OUStringLiteral PROPERTY_DESCRIPTION(u"Description");
-inline constexpr OUStringLiteral PROPERTY_DEFAULTVALUE(u"DefaultValue");
-inline constexpr OUStringLiteral PROPERTY_NUMBERFORMAT(u"FormatKey");
-inline constexpr OUStringLiteral PROPERTY_QUERYTIMEOUT(u"QueryTimeOut");
-inline constexpr OUStringLiteral PROPERTY_MAXFIELDSIZE(u"MaxFieldSize");
-inline constexpr OUStringLiteral PROPERTY_MAXROWS(u"MaxRows");
-inline constexpr OUStringLiteral PROPERTY_CURSORNAME(u"CursorName");
-inline constexpr OUStringLiteral PROPERTY_RESULTSETCONCURRENCY(u"ResultSetConcurrency");
-inline constexpr OUStringLiteral PROPERTY_RESULTSETTYPE(u"ResultSetType");
-inline constexpr OUStringLiteral PROPERTY_FETCHDIRECTION(u"FetchDirection");
-inline constexpr OUStringLiteral PROPERTY_FETCHSIZE(u"FetchSize");
-inline constexpr OUStringLiteral PROPERTY_USEBOOKMARKS(u"UseBookmarks");
-inline constexpr OUStringLiteral PROPERTY_ISSEARCHABLE(u"IsSearchable");
-inline constexpr OUStringLiteral PROPERTY_ISCURRENCY(u"IsCurrency");
-inline constexpr OUStringLiteral PROPERTY_ISSIGNED(u"IsSigned");
-inline constexpr OUStringLiteral PROPERTY_DISPLAYSIZE(u"DisplaySize");
-inline constexpr OUStringLiteral PROPERTY_LABEL(u"Label");
-inline constexpr OUStringLiteral PROPERTY_ISREADONLY(u"IsReadOnly");
-inline constexpr OUStringLiteral PROPERTY_ISWRITABLE(u"IsWritable");
-inline constexpr OUStringLiteral PROPERTY_ISDEFINITELYWRITABLE(u"IsDefinitelyWritable");
-inline constexpr OUStringLiteral PROPERTY_VALUE(u"Value");
-inline constexpr OUStringLiteral PROPERTY_TABLENAME(u"TableName");
-inline constexpr OUStringLiteral PROPERTY_ISCASESENSITIVE(u"IsCaseSensitive");
-inline constexpr OUStringLiteral PROPERTY_SERVICENAME(u"ServiceName");
-inline constexpr OUStringLiteral PROPERTY_ISBOOKMARKABLE(u"IsBookmarkable");
-inline constexpr OUStringLiteral PROPERTY_CANUPDATEINSERTEDROWS(u"CanUpdateInsertedRows");
-inline constexpr OUStringLiteral PROPERTY_NUMBERFORMATSSUPPLIER(u"NumberFormatsSupplier");
-inline constexpr OUStringLiteral PROPERTY_DATASOURCENAME(u"DataSourceName");
-inline constexpr OUStringLiteral PROPERTY_DATABASE_LOCATION(u"DatabaseLocation");
-inline constexpr OUStringLiteral PROPERTY_CONNECTION_RESOURCE(u"ConnectionResource");
-inline constexpr OUStringLiteral PROPERTY_CONNECTION_INFO(u"ConnectionInfo");
-inline constexpr OUStringLiteral PROPERTY_RESULT_SET(u"ResultSet");
-inline constexpr OUStringLiteral PROPERTY_SELECTION(u"Selection");
-inline constexpr OUStringLiteral PROPERTY_BOOKMARK_SELECTION(u"BookmarkSelection");
-inline constexpr OUStringLiteral PROPERTY_COLUMN_NAME(u"ColumnName");
-inline constexpr OUStringLiteral PROPERTY_COLUMN(u"Column");
-inline constexpr OUStringLiteral PROPERTY_DATASOURCE(u"DataSource");
-inline constexpr OUStringLiteral PROPERTY_TRANSACTIONISOLATION(u"TransactionIsolation");
-inline constexpr OUStringLiteral PROPERTY_TYPEMAP(u"TypeMap");
-inline constexpr OUStringLiteral PROPERTY_USER(u"User");
-inline constexpr OUStringLiteral PROPERTY_PASSWORD(u"Password");
-inline constexpr OUStringLiteral PROPERTY_COMMAND_TYPE(u"CommandType");
-inline constexpr OUStringLiteral PROPERTY_ACTIVECOMMAND(u"ActiveCommand");
-inline constexpr OUStringLiteral PROPERTY_ACTIVE_CONNECTION(u"ActiveConnection");
-inline constexpr OUStringLiteral PROPERTY_FILTER(u"Filter");
-inline constexpr OUStringLiteral PROPERTY_APPLYFILTER(u"ApplyFilter");
-inline constexpr OUStringLiteral PROPERTY_ORDER(u"Order");
-inline constexpr OUStringLiteral PROPERTY_APPLYORDER(u"ApplyOrder");
-inline constexpr OUStringLiteral PROPERTY_ISMODIFIED(u"IsModified");
-inline constexpr OUStringLiteral PROPERTY_ISNEW(u"IsNew");
-inline constexpr OUStringLiteral PROPERTY_ROWCOUNT(u"RowCount");
-inline constexpr OUStringLiteral PROPERTY_ISROWCOUNTFINAL(u"IsRowCountFinal");
-inline constexpr OUStringLiteral PROPERTY_WIDTH(u"Width");
-inline constexpr OUStringLiteral PROPERTY_ROW_HEIGHT(u"RowHeight");
-inline constexpr OUStringLiteral PROPERTY_AUTOGROW(u"AutoGrow");
-inline constexpr OUStringLiteral PROPERTY_FORMATKEY(u"FormatKey");
-inline constexpr OUStringLiteral PROPERTY_ALIGN(u"Align");
-inline constexpr OUStringLiteral PROPERTY_FONT(u"FontDescriptor");
-inline constexpr OUStringLiteral PROPERTY_TEXTCOLOR(u"TextColor");
-inline constexpr OUStringLiteral PROPERTY_BOUNDFIELD(u"BoundField");
-inline constexpr OUStringLiteral PROPERTY_CONTROLSOURCE(u"DataField");
-inline constexpr OUStringLiteral PROPERTY_REALNAME(u"RealName");
-inline constexpr OUStringLiteral PROPERTY_UPDATE_TABLENAME(u"UpdateTableName");
-inline constexpr OUStringLiteral PROPERTY_UPDATE_SCHEMANAME(u"UpdateSchemaName");
-inline constexpr OUStringLiteral PROPERTY_UPDATE_CATALOGNAME(u"UpdateCatalogName");
-inline constexpr OUStringLiteral PROPERTY_RELATIVEPOSITION(u"RelativePosition");
-inline constexpr OUStringLiteral PROPERTY_CONTROLMODEL(u"ControlModel");
-inline constexpr OUStringLiteral PROPERTY_RELATEDCOLUMN(u"RelatedColumn");
-inline constexpr OUStringLiteral PROPERTY_ISUNIQUE(u"IsUnique");
-inline constexpr OUStringLiteral PROPERTY_ISPRIMARYKEYINDEX(u"IsPrimaryKeyIndex");
-inline constexpr OUStringLiteral PROPERTY_IGNORERESULT(u"IgnoreResult");
-inline constexpr OUStringLiteral PROPERTY_UPDATERULE(u"UpdateRule");
-inline constexpr OUStringLiteral PROPERTY_DELETERULE(u"DeleteRule");
-inline constexpr OUStringLiteral PROPERTY_REFERENCEDTABLE(u"ReferencedTable");
-inline constexpr OUStringLiteral PROPERTY_SQLEXCEPTION(u"SQLException");
-inline constexpr OUStringLiteral PROPERTY_BORDER(u"Border");
-inline constexpr OUStringLiteral PROPERTY_HELPTEXT(u"HelpText");
-inline constexpr OUStringLiteral PROPERTY_CONTROLDEFAULT(u"ControlDefault");
-inline constexpr OUStringLiteral PROPERTY_HIDDEN(u"Hidden");
-inline constexpr OUStringLiteral PROPERTY_DEFAULTSTATE(u"DefaultState");
-inline constexpr OUStringLiteral PROPERTY_SUPPRESSVERSIONCL(u"SuppressVersionColumns");
-inline constexpr OUStringLiteral PROPERTY_SHOW_BROWSER(u"ShowBrowser");
-inline constexpr OUStringLiteral PROPERTY_ENABLE_BROWSER(u"EnableBrowser");
-inline constexpr OUStringLiteral PROPERTY_SHOWMENU(u"ShowMenu");
-inline constexpr OUStringLiteral PROPERTY_LAYOUTINFORMATION(u"LayoutInformation");
-inline constexpr OUStringLiteral PROPERTY_CURRENTTABLE(u"CurrentTable");
-inline constexpr OUStringLiteral PROPERTY_TEXTLINECOLOR(u"TextLineColor");
-inline constexpr OUStringLiteral PROPERTY_TEXTEMPHASIS(u"FontEmphasisMark");
-inline constexpr OUStringLiteral PROPERTY_TEXTRELIEF(u"FontRelief");
-inline constexpr OUStringLiteral PROPERTY_DEFAULTTEXT(u"DefaultText");
-inline constexpr OUStringLiteral PROPERTY_EFFECTIVEDEFAULT(u"EffectiveDefault");
-inline constexpr OUStringLiteral PROPERTY_AUTOINCREMENTCREATION(u"AutoIncrementCreation");
-inline constexpr OUStringLiteral PROPERTY_BOOLEANCOMPARISONMODE(u"BooleanComparisonMode");
-inline constexpr OUStringLiteral PROPERTY_ENABLESQL92CHECK(u"EnableSQL92Check");
-inline constexpr OUStringLiteral PROPERTY_FONTCHARWIDTH(u"FontCharWidth");
-inline constexpr OUStringLiteral PROPERTY_FONTCHARSET(u"FontCharset");
-inline constexpr OUStringLiteral PROPERTY_FONTFAMILY(u"FontFamily");
-inline constexpr OUStringLiteral PROPERTY_FONTHEIGHT(u"FontHeight");
-inline constexpr OUStringLiteral PROPERTY_FONTKERNING(u"FontKerning");
-inline constexpr OUStringLiteral PROPERTY_FONTNAME(u"FontName");
-inline constexpr OUStringLiteral PROPERTY_FONTORIENTATION(u"FontOrientation");
-inline constexpr OUStringLiteral PROPERTY_FONTPITCH(u"FontPitch");
-inline constexpr OUStringLiteral PROPERTY_FONTSLANT(u"FontSlant");
-inline constexpr OUStringLiteral PROPERTY_FONTSTRIKEOUT(u"FontStrikeout");
-inline constexpr OUStringLiteral PROPERTY_FONTSTYLENAME(u"FontStyleName");
-inline constexpr OUStringLiteral PROPERTY_FONTUNDERLINE(u"FontUnderline");
-inline constexpr OUStringLiteral PROPERTY_FONTWEIGHT(u"FontWeight");
-inline constexpr OUStringLiteral PROPERTY_FONTWIDTH(u"FontWidth");
-inline constexpr OUStringLiteral PROPERTY_FONTWORDLINEMODE(u"FontWordLineMode");
-inline constexpr OUStringLiteral PROPERTY_FONTTYPE(u"FontType");
-inline constexpr OUStringLiteral PROPERTY_PERSISTENT_NAME(u"PersistentName");
-inline constexpr OUStringLiteral PROPERTY_EMBEDDEDOBJECT(u"EmbeddedObject");
-inline constexpr OUStringLiteral PROPERTY_ORIGINAL(u"Original");
-inline constexpr OUStringLiteral PROPERTY_USECATALOGINSELECT(u"UseCatalogInSelect");
-inline constexpr OUStringLiteral PROPERTY_USESCHEMAINSELECT(u"UseSchemaInSelect");
-inline constexpr OUStringLiteral PROPERTY_OUTERJOINESCAPE(u"EnableOuterJoinEscape");
-inline constexpr OUStringLiteral PROPERTY_AS_TEMPLATE(u"AsTemplate");
-inline constexpr OUStringLiteral PROPERTY_HAVING_CLAUSE(u"HavingClause");
-inline constexpr OUStringLiteral PROPERTY_GROUP_BY(u"GroupBy");
-inline constexpr OUStringLiteral PROPERTY_EDIT_WIDTH(u"EditWidth");
-inline constexpr OUStringLiteral PROPERTY_SINGLESELECTQUERYCOMPOSER(u"SingleSelectQueryComposer");
-inline constexpr OUStringLiteral
-    PROPERTY_CHANGE_NOTIFICATION_ENABLED(u"PropertyChangeNotificationEnabled");
-inline constexpr OUStringLiteral PROPERTY_CHAR_STRIKEOUT(u"CharStrikeout");
-inline constexpr OUStringLiteral PROPERTY_CHAR_UNDERLINE(u"CharUnderline");
-inline constexpr OUStringLiteral PROPERTY_CHAR_UNDERLINE_COLOR(u"CharUnderlineColor");
-inline constexpr OUStringLiteral PROPERTY_CHAR_UNDERLINE_HAS_COLOR(u"CharUnderlineHasColor");
+inline constexpr OUString PROPERTY_URL(u"URL"_ustr);
+inline constexpr OUString PROPERTY_INFO(u"Info"_ustr);
+inline constexpr OUString PROPERTY_SETTINGS(u"Settings"_ustr);
+inline constexpr OUString PROPERTY_ISPASSWORDREQUIRED(u"IsPasswordRequired"_ustr);
+inline constexpr OUString PROPERTY_TABLEFILTER(u"TableFilter"_ustr);
+inline constexpr OUString PROPERTY_TABLETYPEFILTER(u"TableTypeFilter"_ustr);
+inline constexpr OUString PROPERTY_NAME(u"Name"_ustr);
+inline constexpr OUString PROPERTY_SCHEMANAME(u"SchemaName"_ustr);
+inline constexpr OUString PROPERTY_CATALOGNAME(u"CatalogName"_ustr);
+inline constexpr OUString PROPERTY_PRIVILEGES(u"Privileges"_ustr);
+inline constexpr OUString PROPERTY_ESCAPE_PROCESSING(u"EscapeProcessing"_ustr);
+inline constexpr OUString PROPERTY_COMMAND(u"Command"_ustr);
+inline constexpr OUString PROPERTY_TYPE(u"Type"_ustr);
+inline constexpr OUString PROPERTY_TYPENAME(u"TypeName"_ustr);
+inline constexpr OUString PROPERTY_PRECISION(u"Precision"_ustr);
+inline constexpr OUString PROPERTY_SCALE(u"Scale"_ustr);
+inline constexpr OUString PROPERTY_ISNULLABLE(u"IsNullable"_ustr);
+inline constexpr OUString PROPERTY_ISAUTOINCREMENT(u"IsAutoIncrement"_ustr);
+inline constexpr OUString PROPERTY_ISROWVERSION(u"IsRowVersion"_ustr);
+inline constexpr OUString PROPERTY_DESCRIPTION(u"Description"_ustr);
+inline constexpr OUString PROPERTY_DEFAULTVALUE(u"DefaultValue"_ustr);
+inline constexpr OUString PROPERTY_NUMBERFORMAT(u"FormatKey"_ustr);
+inline constexpr OUString PROPERTY_QUERYTIMEOUT(u"QueryTimeOut"_ustr);
+inline constexpr OUString PROPERTY_MAXFIELDSIZE(u"MaxFieldSize"_ustr);
+inline constexpr OUString PROPERTY_MAXROWS(u"MaxRows"_ustr);
+inline constexpr OUString PROPERTY_CURSORNAME(u"CursorName"_ustr);
+inline constexpr OUString PROPERTY_RESULTSETCONCURRENCY(u"ResultSetConcurrency"_ustr);
+inline constexpr OUString PROPERTY_RESULTSETTYPE(u"ResultSetType"_ustr);
+inline constexpr OUString PROPERTY_FETCHDIRECTION(u"FetchDirection"_ustr);
+inline constexpr OUString PROPERTY_FETCHSIZE(u"FetchSize"_ustr);
+inline constexpr OUString PROPERTY_USEBOOKMARKS(u"UseBookmarks"_ustr);
+inline constexpr OUString PROPERTY_ISSEARCHABLE(u"IsSearchable"_ustr);
+inline constexpr OUString PROPERTY_ISCURRENCY(u"IsCurrency"_ustr);
+inline constexpr OUString PROPERTY_ISSIGNED(u"IsSigned"_ustr);
+inline constexpr OUString PROPERTY_DISPLAYSIZE(u"DisplaySize"_ustr);
+inline constexpr OUString PROPERTY_LABEL(u"Label"_ustr);
+inline constexpr OUString PROPERTY_ISREADONLY(u"IsReadOnly"_ustr);
+inline constexpr OUString PROPERTY_ISWRITABLE(u"IsWritable"_ustr);
+inline constexpr OUString PROPERTY_ISDEFINITELYWRITABLE(u"IsDefinitelyWritable"_ustr);
+inline constexpr OUString PROPERTY_VALUE(u"Value"_ustr);
+inline constexpr OUString PROPERTY_TABLENAME(u"TableName"_ustr);
+inline constexpr OUString PROPERTY_ISCASESENSITIVE(u"IsCaseSensitive"_ustr);
+inline constexpr OUString PROPERTY_SERVICENAME(u"ServiceName"_ustr);
+inline constexpr OUString PROPERTY_ISBOOKMARKABLE(u"IsBookmarkable"_ustr);
+inline constexpr OUString PROPERTY_CANUPDATEINSERTEDROWS(u"CanUpdateInsertedRows"_ustr);
+inline constexpr OUString PROPERTY_NUMBERFORMATSSUPPLIER(u"NumberFormatsSupplier"_ustr);
+inline constexpr OUString PROPERTY_DATASOURCENAME(u"DataSourceName"_ustr);
+inline constexpr OUString PROPERTY_DATABASE_LOCATION(u"DatabaseLocation"_ustr);
+inline constexpr OUString PROPERTY_CONNECTION_RESOURCE(u"ConnectionResource"_ustr);
+inline constexpr OUString PROPERTY_CONNECTION_INFO(u"ConnectionInfo"_ustr);
+inline constexpr OUString PROPERTY_RESULT_SET(u"ResultSet"_ustr);
+inline constexpr OUString PROPERTY_SELECTION(u"Selection"_ustr);
+inline constexpr OUString PROPERTY_BOOKMARK_SELECTION(u"BookmarkSelection"_ustr);
+inline constexpr OUString PROPERTY_COLUMN_NAME(u"ColumnName"_ustr);
+inline constexpr OUString PROPERTY_COLUMN(u"Column"_ustr);
+inline constexpr OUString PROPERTY_DATASOURCE(u"DataSource"_ustr);
+inline constexpr OUString PROPERTY_TRANSACTIONISOLATION(u"TransactionIsolation"_ustr);
+inline constexpr OUString PROPERTY_TYPEMAP(u"TypeMap"_ustr);
+inline constexpr OUString PROPERTY_USER(u"User"_ustr);
+inline constexpr OUString PROPERTY_PASSWORD(u"Password"_ustr);
+inline constexpr OUString PROPERTY_COMMAND_TYPE(u"CommandType"_ustr);
+inline constexpr OUString PROPERTY_ACTIVECOMMAND(u"ActiveCommand"_ustr);
+inline constexpr OUString PROPERTY_ACTIVE_CONNECTION(u"ActiveConnection"_ustr);
+inline constexpr OUString PROPERTY_FILTER(u"Filter"_ustr);
+inline constexpr OUString PROPERTY_APPLYFILTER(u"ApplyFilter"_ustr);
+inline constexpr OUString PROPERTY_ORDER(u"Order"_ustr);
+inline constexpr OUString PROPERTY_APPLYORDER(u"ApplyOrder"_ustr);
+inline constexpr OUString PROPERTY_ISMODIFIED(u"IsModified"_ustr);
+inline constexpr OUString PROPERTY_ISNEW(u"IsNew"_ustr);
+inline constexpr OUString PROPERTY_ROWCOUNT(u"RowCount"_ustr);
+inline constexpr OUString PROPERTY_ISROWCOUNTFINAL(u"IsRowCountFinal"_ustr);
+inline constexpr OUString PROPERTY_WIDTH(u"Width"_ustr);
+inline constexpr OUString PROPERTY_ROW_HEIGHT(u"RowHeight"_ustr);
+inline constexpr OUString PROPERTY_AUTOGROW(u"AutoGrow"_ustr);
+inline constexpr OUString PROPERTY_FORMATKEY(u"FormatKey"_ustr);
+inline constexpr OUString PROPERTY_ALIGN(u"Align"_ustr);
+inline constexpr OUString PROPERTY_FONT(u"FontDescriptor"_ustr);
+inline constexpr OUString PROPERTY_TEXTCOLOR(u"TextColor"_ustr);
+inline constexpr OUString PROPERTY_BOUNDFIELD(u"BoundField"_ustr);
+inline constexpr OUString PROPERTY_CONTROLSOURCE(u"DataField"_ustr);
+inline constexpr OUString PROPERTY_REALNAME(u"RealName"_ustr);
+inline constexpr OUString PROPERTY_UPDATE_TABLENAME(u"UpdateTableName"_ustr);
+inline constexpr OUString PROPERTY_UPDATE_SCHEMANAME(u"UpdateSchemaName"_ustr);
+inline constexpr OUString PROPERTY_UPDATE_CATALOGNAME(u"UpdateCatalogName"_ustr);
+inline constexpr OUString PROPERTY_RELATIVEPOSITION(u"RelativePosition"_ustr);
+inline constexpr OUString PROPERTY_CONTROLMODEL(u"ControlModel"_ustr);
+inline constexpr OUString PROPERTY_RELATEDCOLUMN(u"RelatedColumn"_ustr);
+inline constexpr OUString PROPERTY_ISUNIQUE(u"IsUnique"_ustr);
+inline constexpr OUString PROPERTY_ISPRIMARYKEYINDEX(u"IsPrimaryKeyIndex"_ustr);
+inline constexpr OUString PROPERTY_IGNORERESULT(u"IgnoreResult"_ustr);
+inline constexpr OUString PROPERTY_UPDATERULE(u"UpdateRule"_ustr);
+inline constexpr OUString PROPERTY_DELETERULE(u"DeleteRule"_ustr);
+inline constexpr OUString PROPERTY_REFERENCEDTABLE(u"ReferencedTable"_ustr);
+inline constexpr OUString PROPERTY_SQLEXCEPTION(u"SQLException"_ustr);
+inline constexpr OUString PROPERTY_BORDER(u"Border"_ustr);
+inline constexpr OUString PROPERTY_HELPTEXT(u"HelpText"_ustr);
+inline constexpr OUString PROPERTY_CONTROLDEFAULT(u"ControlDefault"_ustr);
+inline constexpr OUString PROPERTY_HIDDEN(u"Hidden"_ustr);
+inline constexpr OUString PROPERTY_DEFAULTSTATE(u"DefaultState"_ustr);
+inline constexpr OUString PROPERTY_SUPPRESSVERSIONCL(u"SuppressVersionColumns"_ustr);
+inline constexpr OUString PROPERTY_SHOW_BROWSER(u"ShowBrowser"_ustr);
+inline constexpr OUString PROPERTY_ENABLE_BROWSER(u"EnableBrowser"_ustr);
+inline constexpr OUString PROPERTY_SHOWMENU(u"ShowMenu"_ustr);
+inline constexpr OUString PROPERTY_LAYOUTINFORMATION(u"LayoutInformation"_ustr);
+inline constexpr OUString PROPERTY_CURRENTTABLE(u"CurrentTable"_ustr);
+inline constexpr OUString PROPERTY_TEXTLINECOLOR(u"TextLineColor"_ustr);
+inline constexpr OUString PROPERTY_TEXTEMPHASIS(u"FontEmphasisMark"_ustr);
+inline constexpr OUString PROPERTY_TEXTRELIEF(u"FontRelief"_ustr);
+inline constexpr OUString PROPERTY_DEFAULTTEXT(u"DefaultText"_ustr);
+inline constexpr OUString PROPERTY_EFFECTIVEDEFAULT(u"EffectiveDefault"_ustr);
+inline constexpr OUString PROPERTY_AUTOINCREMENTCREATION(u"AutoIncrementCreation"_ustr);
+inline constexpr OUString PROPERTY_BOOLEANCOMPARISONMODE(u"BooleanComparisonMode"_ustr);
+inline constexpr OUString PROPERTY_ENABLESQL92CHECK(u"EnableSQL92Check"_ustr);
+inline constexpr OUString PROPERTY_FONTCHARWIDTH(u"FontCharWidth"_ustr);
+inline constexpr OUString PROPERTY_FONTCHARSET(u"FontCharset"_ustr);
+inline constexpr OUString PROPERTY_FONTFAMILY(u"FontFamily"_ustr);
+inline constexpr OUString PROPERTY_FONTHEIGHT(u"FontHeight"_ustr);
+inline constexpr OUString PROPERTY_FONTKERNING(u"FontKerning"_ustr);
+inline constexpr OUString PROPERTY_FONTNAME(u"FontName"_ustr);
+inline constexpr OUString PROPERTY_FONTORIENTATION(u"FontOrientation"_ustr);
+inline constexpr OUString PROPERTY_FONTPITCH(u"FontPitch"_ustr);
+inline constexpr OUString PROPERTY_FONTSLANT(u"FontSlant"_ustr);
+inline constexpr OUString PROPERTY_FONTSTRIKEOUT(u"FontStrikeout"_ustr);
+inline constexpr OUString PROPERTY_FONTSTYLENAME(u"FontStyleName"_ustr);
+inline constexpr OUString PROPERTY_FONTUNDERLINE(u"FontUnderline"_ustr);
+inline constexpr OUString PROPERTY_FONTWEIGHT(u"FontWeight"_ustr);
+inline constexpr OUString PROPERTY_FONTWIDTH(u"FontWidth"_ustr);
+inline constexpr OUString PROPERTY_FONTWORDLINEMODE(u"FontWordLineMode"_ustr);
+inline constexpr OUString PROPERTY_FONTTYPE(u"FontType"_ustr);
+inline constexpr OUString PROPERTY_PERSISTENT_NAME(u"PersistentName"_ustr);
+inline constexpr OUString PROPERTY_EMBEDDEDOBJECT(u"EmbeddedObject"_ustr);
+inline constexpr OUString PROPERTY_ORIGINAL(u"Original"_ustr);
+inline constexpr OUString PROPERTY_USECATALOGINSELECT(u"UseCatalogInSelect"_ustr);
+inline constexpr OUString PROPERTY_USESCHEMAINSELECT(u"UseSchemaInSelect"_ustr);
+inline constexpr OUString PROPERTY_OUTERJOINESCAPE(u"EnableOuterJoinEscape"_ustr);
+inline constexpr OUString PROPERTY_AS_TEMPLATE(u"AsTemplate"_ustr);
+inline constexpr OUString PROPERTY_HAVING_CLAUSE(u"HavingClause"_ustr);
+inline constexpr OUString PROPERTY_GROUP_BY(u"GroupBy"_ustr);
+inline constexpr OUString PROPERTY_EDIT_WIDTH(u"EditWidth"_ustr);
+inline constexpr OUString PROPERTY_SINGLESELECTQUERYCOMPOSER(u"SingleSelectQueryComposer"_ustr);
+inline constexpr OUString
+    PROPERTY_CHANGE_NOTIFICATION_ENABLED(u"PropertyChangeNotificationEnabled"_ustr);
+inline constexpr OUString PROPERTY_CHAR_STRIKEOUT(u"CharStrikeout"_ustr);
+inline constexpr OUString PROPERTY_CHAR_UNDERLINE(u"CharUnderline"_ustr);
+inline constexpr OUString PROPERTY_CHAR_UNDERLINE_COLOR(u"CharUnderlineColor"_ustr);
+inline constexpr OUString PROPERTY_CHAR_UNDERLINE_HAS_COLOR(u"CharUnderlineHasColor"_ustr);
 
 // service names
 
-inline constexpr OUStringLiteral SERVICE_SDBC_RESULTSET = u"com.sun.star.sdbc.ResultSet";
-inline constexpr OUStringLiteral SERVICE_SDBC_ROWSET = u"com.sun.star.sdbc.RowSet";
-inline constexpr OUStringLiteral SERVICE_SDBC_STATEMENT = u"com.sun.star.sdbc.Statement";
-inline constexpr OUStringLiteral SERVICE_SDBC_PREPAREDSTATEMENT
-    = u"com.sun.star.sdbc.PreparedStatement";
-inline constexpr OUStringLiteral SERVICE_SDBC_CALLABLESTATEMENT
-    = u"com.sun.star.sdbc.CallableStatement";
-inline constexpr OUStringLiteral SERVICE_SDBCX_CONTAINER = u"com.sun.star.sdbcx.Container";
-inline constexpr OUStringLiteral SERVICE_SDBCX_TABLE = u"com.sun.star.sdbcx.Table";
-inline constexpr OUStringLiteral SERVICE_SDBCX_RESULTSET = u"com.sun.star.sdbcx.ResultSet";
-inline constexpr OUStringLiteral SERVICE_SDB_CONNECTION = u"com.sun.star.sdb.Connection";
-inline constexpr OUStringLiteral SERVICE_SDBCX_COLUMN = u"com.sun.star.sdbcx.Column";
-inline constexpr OUStringLiteral SERVICE_SDBCX_COLUMNDESCRIPTOR
-    = u"com.sun.star.sdbcx.ColumnDescriptor";
-inline constexpr OUStringLiteral SERVICE_SDB_COLUMNSETTINGS = u"com.sun.star.sdb.ColumnSettings";
-inline constexpr OUStringLiteral SERVICE_SDB_RESULTCOLUMN = u"com.sun.star.sdb.ResultColumn";
-inline constexpr OUStringLiteral SERVICE_SDB_DATACOLUMN = u"com.sun.star.sdb.DataColumn";
-inline constexpr OUStringLiteral SERVICE_SDB_DATASOURCE = u"com.sun.star.sdb.DataSource";
-inline constexpr OUStringLiteral SERVICE_SDB_RESULTSET = u"com.sun.star.sdb.ResultSet";
-inline constexpr OUStringLiteral SERVICE_SDB_ROWSET = u"com.sun.star.sdb.RowSet";
-inline constexpr OUStringLiteral SERVICE_SDB_PREPAREDSTATEMENT
-    = u"com.sun.star.sdb.PreparedStatement";
-inline constexpr OUStringLiteral SERVICE_SDB_CALLABLESTATEMENT
-    = u"com.sun.star.sdb.CallableStatement";
-inline constexpr OUStringLiteral SERVICE_SDB_SQLQUERYCOMPOSER
-    = u"com.sun.star.sdb.SQLQueryComposer";
-inline constexpr OUStringLiteral SERVICE_SDB_DATASETTINGS = u"com.sun.star.sdb.DefinitionSettings";
-inline constexpr OUStringLiteral SERVICE_SDB_QUERYDESCRIPTOR = u"com.sun.star.sdb.QueryDescriptor";
-inline constexpr OUStringLiteral SERVICE_SDB_QUERY = u"com.sun.star.sdb.Query";
-inline constexpr OUStringLiteral SERVICE_SDBCX_TABLES = u"com.sun.star.sdbcx.Tables";
-inline constexpr OUStringLiteral SERVICE_SDB_QUERIES = u"com.sun.star.sdb.Queries";
-inline constexpr OUStringLiteral SERVICE_SDB_DOCUMENTDEFINITION
-    = u"com.sun.star.sdb.DocumentDefinition";
-inline constexpr OUStringLiteral SERVICE_NAME_FORM_COLLECTION = u"com.sun.star.sdb.Forms";
-inline constexpr OUStringLiteral SERVICE_NAME_REPORT_COLLECTION = u"com.sun.star.sdb.Reports";
-inline constexpr OUStringLiteral SERVICE_NAME_QUERY_COLLECTION = u"com.sun.star.sdb.Queries";
-inline constexpr OUStringLiteral SERVICE_NAME_SINGLESELECTQUERYCOMPOSER
-    = u"com.sun.star.sdb.SingleSelectQueryComposer";
-inline constexpr OUStringLiteral SERVICE_SDB_APPLICATIONCONTROLLER
-    = u"org.openoffice.comp.dbu.OApplicationController";
+inline constexpr OUString SERVICE_SDBC_RESULTSET = u"com.sun.star.sdbc.ResultSet"_ustr;
+inline constexpr OUString SERVICE_SDBC_ROWSET = u"com.sun.star.sdbc.RowSet"_ustr;
+inline constexpr OUString SERVICE_SDBC_STATEMENT = u"com.sun.star.sdbc.Statement"_ustr;
+inline constexpr OUString SERVICE_SDBC_PREPAREDSTATEMENT
+    = u"com.sun.star.sdbc.PreparedStatement"_ustr;
+inline constexpr OUString SERVICE_SDBC_CALLABLESTATEMENT
+    = u"com.sun.star.sdbc.CallableStatement"_ustr;
+inline constexpr OUString SERVICE_SDBCX_CONTAINER = u"com.sun.star.sdbcx.Container"_ustr;
+inline constexpr OUString SERVICE_SDBCX_TABLE = u"com.sun.star.sdbcx.Table"_ustr;
+inline constexpr OUString SERVICE_SDBCX_RESULTSET = u"com.sun.star.sdbcx.ResultSet"_ustr;
+inline constexpr OUString SERVICE_SDB_CONNECTION = u"com.sun.star.sdb.Connection"_ustr;
+inline constexpr OUString SERVICE_SDBCX_COLUMN = u"com.sun.star.sdbcx.Column"_ustr;
+inline constexpr OUString SERVICE_SDBCX_COLUMNDESCRIPTOR
+    = u"com.sun.star.sdbcx.ColumnDescriptor"_ustr;
+inline constexpr OUString SERVICE_SDB_COLUMNSETTINGS = u"com.sun.star.sdb.ColumnSettings"_ustr;
+inline constexpr OUString SERVICE_SDB_RESULTCOLUMN = u"com.sun.star.sdb.ResultColumn"_ustr;
+inline constexpr OUString SERVICE_SDB_DATACOLUMN = u"com.sun.star.sdb.DataColumn"_ustr;
+inline constexpr OUString SERVICE_SDB_DATASOURCE = u"com.sun.star.sdb.DataSource"_ustr;
+inline constexpr OUString SERVICE_SDB_RESULTSET = u"com.sun.star.sdb.ResultSet"_ustr;
+inline constexpr OUString SERVICE_SDB_ROWSET = u"com.sun.star.sdb.RowSet"_ustr;
+inline constexpr OUString SERVICE_SDB_PREPAREDSTATEMENT
+    = u"com.sun.star.sdb.PreparedStatement"_ustr;
+inline constexpr OUString SERVICE_SDB_CALLABLESTATEMENT
+    = u"com.sun.star.sdb.CallableStatement"_ustr;
+inline constexpr OUString SERVICE_SDB_SQLQUERYCOMPOSER = u"com.sun.star.sdb.SQLQueryComposer"_ustr;
+inline constexpr OUString SERVICE_SDB_DATASETTINGS = u"com.sun.star.sdb.DefinitionSettings"_ustr;
+inline constexpr OUString SERVICE_SDB_QUERYDESCRIPTOR = u"com.sun.star.sdb.QueryDescriptor"_ustr;
+inline constexpr OUString SERVICE_SDB_QUERY = u"com.sun.star.sdb.Query"_ustr;
+inline constexpr OUString SERVICE_SDBCX_TABLES = u"com.sun.star.sdbcx.Tables"_ustr;
+inline constexpr OUString SERVICE_SDB_QUERIES = u"com.sun.star.sdb.Queries"_ustr;
+inline constexpr OUString SERVICE_SDB_DOCUMENTDEFINITION
+    = u"com.sun.star.sdb.DocumentDefinition"_ustr;
+inline constexpr OUString SERVICE_NAME_FORM_COLLECTION = u"com.sun.star.sdb.Forms"_ustr;
+inline constexpr OUString SERVICE_NAME_REPORT_COLLECTION = u"com.sun.star.sdb.Reports"_ustr;
+inline constexpr OUString SERVICE_NAME_QUERY_COLLECTION = u"com.sun.star.sdb.Queries"_ustr;
+inline constexpr OUString SERVICE_NAME_SINGLESELECTQUERYCOMPOSER
+    = u"com.sun.star.sdb.SingleSelectQueryComposer"_ustr;
+inline constexpr OUString SERVICE_SDB_APPLICATIONCONTROLLER
+    = u"org.openoffice.comp.dbu.OApplicationController"_ustr;
 
 // info properties
-inline constexpr OUStringLiteral INFO_JDBCDRIVERCLASS = u"JavaDriverClass";
-inline constexpr OUStringLiteral INFO_TEXTFILEEXTENSION = u"Extension";
-inline constexpr OUStringLiteral INFO_CHARSET = u"CharSet";
-inline constexpr OUStringLiteral INFO_TEXTFILEHEADER = u"HeaderLine";
-inline constexpr OUStringLiteral INFO_FIELDDELIMITER = u"FieldDelimiter";
-inline constexpr OUStringLiteral INFO_TEXTDELIMITER = u"StringDelimiter";
-inline constexpr OUStringLiteral INFO_DECIMALDELIMITER = u"DecimalDelimiter";
-inline constexpr OUStringLiteral INFO_THOUSANDSDELIMITER = u"ThousandDelimiter";
-inline constexpr OUStringLiteral INFO_SHOWDELETEDROWS = u"ShowDeleted";
-inline constexpr OUStringLiteral INFO_ALLOWLONGTABLENAMES = u"NoNameLengthLimit";
-inline constexpr OUStringLiteral INFO_ADDITIONALOPTIONS = u"SystemDriverSettings";
-inline constexpr OUStringLiteral INFO_AUTORETRIEVEVALUE = u"AutoRetrievingStatement";
-inline constexpr OUStringLiteral INFO_AUTORETRIEVEENABLED = u"IsAutoRetrievingEnabled";
-inline constexpr OUStringLiteral INFO_APPEND_TABLE_ALIAS = u"AppendTableAliasName";
-inline constexpr OUStringLiteral INFO_AS_BEFORE_CORRELATION_NAME
-    = u"GenerateASBeforeCorrelationName";
-inline constexpr OUStringLiteral INFO_FORMS_CHECK_REQUIRED_FIELDS = u"FormsCheckRequiredFields";
-inline constexpr OUStringLiteral INFO_PARAMETERNAMESUBST = u"ParameterNameSubstitution";
-inline constexpr OUStringLiteral INFO_IGNOREDRIVER_PRIV = u"IgnoreDriverPrivileges";
-inline constexpr OUStringLiteral INFO_USECATALOG = u"UseCatalog";
-inline constexpr OUStringLiteral INFO_CONN_LDAP_BASEDN = u"BaseDN";
-inline constexpr OUStringLiteral INFO_CONN_LDAP_ROWCOUNT = u"MaxRowCount";
-inline constexpr OUStringLiteral INFO_PREVIEW = u"Preview";
-inline constexpr OUStringLiteral INFO_MEDIATYPE = u"MediaType";
-inline constexpr OUStringLiteral INFO_ESCAPE_DATETIME = u"EscapeDateTime";
+inline constexpr OUString INFO_JDBCDRIVERCLASS = u"JavaDriverClass"_ustr;
+inline constexpr OUString INFO_TEXTFILEEXTENSION = u"Extension"_ustr;
+inline constexpr OUString INFO_CHARSET = u"CharSet"_ustr;
+inline constexpr OUString INFO_TEXTFILEHEADER = u"HeaderLine"_ustr;
+inline constexpr OUString INFO_FIELDDELIMITER = u"FieldDelimiter"_ustr;
+inline constexpr OUString INFO_TEXTDELIMITER = u"StringDelimiter"_ustr;
+inline constexpr OUString INFO_DECIMALDELIMITER = u"DecimalDelimiter"_ustr;
+inline constexpr OUString INFO_THOUSANDSDELIMITER = u"ThousandDelimiter"_ustr;
+inline constexpr OUString INFO_SHOWDELETEDROWS = u"ShowDeleted"_ustr;
+inline constexpr OUString INFO_ALLOWLONGTABLENAMES = u"NoNameLengthLimit"_ustr;
+inline constexpr OUString INFO_ADDITIONALOPTIONS = u"SystemDriverSettings"_ustr;
+inline constexpr OUString INFO_AUTORETRIEVEVALUE = u"AutoRetrievingStatement"_ustr;
+inline constexpr OUString INFO_AUTORETRIEVEENABLED = u"IsAutoRetrievingEnabled"_ustr;
+inline constexpr OUString INFO_APPEND_TABLE_ALIAS = u"AppendTableAliasName"_ustr;
+inline constexpr OUString INFO_AS_BEFORE_CORRELATION_NAME = u"GenerateASBeforeCorrelationName"_ustr;
+inline constexpr OUString INFO_FORMS_CHECK_REQUIRED_FIELDS = u"FormsCheckRequiredFields"_ustr;
+inline constexpr OUString INFO_PARAMETERNAMESUBST = u"ParameterNameSubstitution"_ustr;
+inline constexpr OUString INFO_IGNOREDRIVER_PRIV = u"IgnoreDriverPrivileges"_ustr;
+inline constexpr OUString INFO_USECATALOG = u"UseCatalog"_ustr;
+inline constexpr OUString INFO_CONN_LDAP_BASEDN = u"BaseDN"_ustr;
+inline constexpr OUString INFO_CONN_LDAP_ROWCOUNT = u"MaxRowCount"_ustr;
+inline constexpr OUString INFO_PREVIEW = u"Preview"_ustr;
+inline constexpr OUString INFO_MEDIATYPE = u"MediaType"_ustr;
+inline constexpr OUString INFO_ESCAPE_DATETIME = u"EscapeDateTime"_ustr;
 
 // other
-inline constexpr OUStringLiteral INFO_POOLURL = u"PoolURL";
+inline constexpr OUString INFO_POOLURL = u"PoolURL"_ustr;
 
 // URLs
 
-inline constexpr OUStringLiteral URL_COMPONENT_QUERYDESIGN = u".component:DB/QueryDesign";
-inline constexpr OUStringLiteral URL_COMPONENT_VIEWDESIGN = u".component:DB/ViewDesign";
-inline constexpr OUStringLiteral URL_COMPONENT_TABLEDESIGN = u".component:DB/TableDesign";
-inline constexpr OUStringLiteral URL_COMPONENT_FORMGRIDVIEW = u".component:DB/FormGridView";
-inline constexpr OUStringLiteral URL_COMPONENT_DATASOURCEBROWSER
-    = u".component:DB/DataSourceBrowser";
-inline constexpr OUStringLiteral URL_COMPONENT_RELATIONDESIGN = u".component:DB/RelationDesign";
-inline constexpr OUStringLiteral URL_COMPONENT_REPORTDESIGN(u".component:DB/ReportDesign");
+inline constexpr OUString URL_COMPONENT_QUERYDESIGN = u".component:DB/QueryDesign"_ustr;
+inline constexpr OUString URL_COMPONENT_VIEWDESIGN = u".component:DB/ViewDesign"_ustr;
+inline constexpr OUString URL_COMPONENT_TABLEDESIGN = u".component:DB/TableDesign"_ustr;
+inline constexpr OUString URL_COMPONENT_FORMGRIDVIEW = u".component:DB/FormGridView"_ustr;
+inline constexpr OUString URL_COMPONENT_DATASOURCEBROWSER = u".component:DB/DataSourceBrowser"_ustr;
+inline constexpr OUString URL_COMPONENT_RELATIONDESIGN = u".component:DB/RelationDesign"_ustr;
+inline constexpr OUString URL_COMPONENT_REPORTDESIGN(u".component:DB/ReportDesign"_ustr);
 
 // service names
 
-inline constexpr OUStringLiteral SERVICE_SDB_DIRECTSQLDIALOG
-    = u"org.openoffice.comp.dbu.DirectSqlDialog";
+inline constexpr OUString SERVICE_SDB_DIRECTSQLDIALOG
+    = u"org.openoffice.comp.dbu.DirectSqlDialog"_ustr;
 
 // other DBU relevant strings
 
-inline constexpr OUStringLiteral PROPERTY_QUERYDESIGNVIEW(u"QueryDesignView");
-inline constexpr OUStringLiteral PROPERTY_GRAPHICAL_DESIGN(u"GraphicalDesign");
-inline constexpr OUStringLiteral PROPERTY_HELP_URL(u"HelpURL");
-inline constexpr OUStringLiteral FRAME_NAME_QUERY_PREVIEW = u"QueryPreview";
-inline constexpr OUStringLiteral SERVICE_CONTROLDEFAULT = u"com.sun.star.comp.dbu.OColumnControl";
+inline constexpr OUString PROPERTY_QUERYDESIGNVIEW(u"QueryDesignView"_ustr);
+inline constexpr OUString PROPERTY_GRAPHICAL_DESIGN(u"GraphicalDesign"_ustr);
+inline constexpr OUString PROPERTY_HELP_URL(u"HelpURL"_ustr);
+inline constexpr OUString FRAME_NAME_QUERY_PREVIEW = u"QueryPreview"_ustr;
+inline constexpr OUString SERVICE_CONTROLDEFAULT = u"com.sun.star.comp.dbu.OColumnControl"_ustr;
 
 // other DBU properties
 
-inline constexpr OUStringLiteral PROPERTY_ENABLEOUTERJOIN(u"EnableOuterJoinEscape");
-inline constexpr OUStringLiteral PROPERTY_TABSTOP(u"TabStop");
-inline constexpr OUStringLiteral PROPERTY_DEFAULTCONTROL(u"DefaultControl");
-inline constexpr OUStringLiteral PROPERTY_ENABLED(u"Enabled");
-inline constexpr OUStringLiteral PROPERTY_MOUSE_WHEEL_BEHAVIOR(u"MouseWheelBehavior");
+inline constexpr OUString PROPERTY_ENABLEOUTERJOIN(u"EnableOuterJoinEscape"_ustr);
+inline constexpr OUString PROPERTY_TABSTOP(u"TabStop"_ustr);
+inline constexpr OUString PROPERTY_DEFAULTCONTROL(u"DefaultControl"_ustr);
+inline constexpr OUString PROPERTY_ENABLED(u"Enabled"_ustr);
+inline constexpr OUString PROPERTY_MOUSE_WHEEL_BEHAVIOR(u"MouseWheelBehavior"_ustr);
 
-inline constexpr OUStringLiteral SQLSTATE_GENERAL = u"01000";
+inline constexpr OUString SQLSTATE_GENERAL = u"01000"_ustr;
 
-inline constexpr OUStringLiteral PROPERTY_IS_FORM(u"IsForm");
-inline constexpr OUStringLiteral PROPERTY_PERSISTENT_PATH(u"PersistentPath");
+inline constexpr OUString PROPERTY_IS_FORM(u"IsForm"_ustr);
+inline constexpr OUString PROPERTY_PERSISTENT_PATH(u"PersistentPath"_ustr);
 
-inline constexpr OUStringLiteral STR_AUTOTEXTSEPARATORLIST = u"\"\t34\t'\t39";
+inline constexpr OUString STR_AUTOTEXTSEPARATORLIST = u"\"\t34\t'\t39"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index ec4edf6f0fb4..44709a2a5a33 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1708,8 +1708,8 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
 
         // a number of properties is plain copied
         const OUString aPropertyNames[] = {
-            OUString(PROPERTY_ALIGN), OUString(PROPERTY_RELATIVEPOSITION), OUString(PROPERTY_WIDTH), OUString(PROPERTY_HIDDEN), OUString(PROPERTY_CONTROLMODEL),
-            OUString(PROPERTY_HELPTEXT), OUString(PROPERTY_CONTROLDEFAULT)
+            PROPERTY_ALIGN, PROPERTY_RELATIVEPOSITION, PROPERTY_WIDTH, PROPERTY_HIDDEN, PROPERTY_CONTROLMODEL,
+            PROPERTY_HELPTEXT, PROPERTY_CONTROLDEFAULT
         };
         for (const auto & aPropertyName : aPropertyNames)
         {
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 688e755936a6..f6dffbd1314a 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -245,7 +245,7 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc
     {
         Any aValue;
         Reference<XInterface> xDs = dbaccess::getDataSource(_xConnection);
-        if ( dbtools::getDataSourceSetting(xDs,static_cast <OUString> (PROPERTY_BOOLEANCOMPARISONMODE),aValue) )
+        if ( dbtools::getDataSourceSetting(xDs,PROPERTY_BOOLEANCOMPARISONMODE,aValue) )
         {
             OSL_VERIFY( aValue >>= m_nBoolCompareMode );
         }
diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
index 45a9da5fc68b..505e0d36b98f 100644
--- a/dbaccess/source/core/api/columnsettings.cxx
+++ b/dbaccess/source/core/api/columnsettings.cxx
@@ -121,14 +121,14 @@ namespace dbaccess
             };
             const PropertyDescriptor aProps[] =
             {
-                { OUString(PROPERTY_ALIGN),            PROPERTY_ID_ALIGN },
-                { OUString(PROPERTY_NUMBERFORMAT),     PROPERTY_ID_NUMBERFORMAT },
-                { OUString(PROPERTY_RELATIVEPOSITION), PROPERTY_ID_RELATIVEPOSITION },
-                { OUString(PROPERTY_WIDTH),            PROPERTY_ID_WIDTH },
-                { OUString(PROPERTY_HELPTEXT),         PROPERTY_ID_HELPTEXT },
-                { OUString(PROPERTY_CONTROLDEFAULT),   PROPERTY_ID_CONTROLDEFAULT },
-                { OUString(PROPERTY_CONTROLMODEL),     PROPERTY_ID_CONTROLMODEL },
-                { OUString(PROPERTY_HIDDEN),           PROPERTY_ID_HIDDEN }
+                { PROPERTY_ALIGN,            PROPERTY_ID_ALIGN },
+                { PROPERTY_NUMBERFORMAT,     PROPERTY_ID_NUMBERFORMAT },
+                { PROPERTY_RELATIVEPOSITION, PROPERTY_ID_RELATIVEPOSITION },
+                { PROPERTY_WIDTH,            PROPERTY_ID_WIDTH },
+                { PROPERTY_HELPTEXT,         PROPERTY_ID_HELPTEXT },
+                { PROPERTY_CONTROLDEFAULT,   PROPERTY_ID_CONTROLDEFAULT },
+                { PROPERTY_CONTROLMODEL,     PROPERTY_ID_CONTROLMODEL },
+                { PROPERTY_HIDDEN,           PROPERTY_ID_HIDDEN }
             };
 
             for (const auto & aProp : aProps)
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index a385079fcae7..82b3fc02c556 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -90,7 +90,7 @@ OUString OTableColumnDescriptor::getImplementationName(  )
 
 Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames(  )
 {
-    return { m_bActAsDescriptor? OUString(SERVICE_SDBCX_COLUMNDESCRIPTOR) : OUString(SERVICE_SDBCX_COLUMN),
+    return { m_bActAsDescriptor? SERVICE_SDBCX_COLUMNDESCRIPTOR : SERVICE_SDBCX_COLUMN,
         SERVICE_SDB_COLUMNSETTINGS };
 }
 
@@ -208,10 +208,10 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co
     };
     const PropertyDescriptor aProps[] =
     {
-        { OUString(PROPERTY_CATALOGNAME),      PROPERTY_ID_CATALOGNAME },
-        { OUString(PROPERTY_SCHEMANAME),       PROPERTY_ID_SCHEMANAME },
-        { OUString(PROPERTY_TABLENAME),        PROPERTY_ID_TABLENAME },
-        { OUString(PROPERTY_REALNAME),         PROPERTY_ID_REALNAME }
+        { PROPERTY_CATALOGNAME,      PROPERTY_ID_CATALOGNAME },
+        { PROPERTY_SCHEMANAME,       PROPERTY_ID_SCHEMANAME },
+        { PROPERTY_TABLENAME,        PROPERTY_ID_TABLENAME },
+        { PROPERTY_REALNAME,         PROPERTY_ID_REALNAME }
     };
     for (const auto & aProp : aProps)
     {
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 204c73dc11c2..204bad556e5d 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1643,7 +1643,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
     aDelegatorArguments.getArray()[nArgsLen++] <<= xInfoSet;
 
     Reference< XPropertySet > xProp( _rxTargetStorage, UNO_QUERY_THROW );
-    xProp->setPropertyValue( INFO_MEDIATYPE, Any( OUString(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) ) );
+    xProp->setPropertyValue( INFO_MEDIATYPE, Any( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) );
 
     OUString aVersion;
     SvtSaveOptions::ODFSaneDefaultVersion const nDefVersion =
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 33dea6873692..f9a063c86e3a 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -157,7 +157,7 @@ css::uno::Reference< css::beans::XPropertySetInfo >  SAL_CALL ODocumentContainer
 
 Sequence< OUString > SAL_CALL ODocumentContainer::getSupportedServiceNames(  )
 {
-    return { m_bFormsContainer ? OUString(SERVICE_NAME_FORM_COLLECTION) : OUString(SERVICE_NAME_REPORT_COLLECTION) };
+    return { m_bFormsContainer ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION };
 }
 
 OUString ODocumentContainer::determineContentType() const
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index ab6257f7f9a6..cee5e04a04f4 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -183,27 +183,27 @@ ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext, OUString
 
     GetAutoStylePool()->AddFamily(
         XmlStyleFamily::TABLE_TABLE,
-        OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ),
+        XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME,
         m_xExportHelper.get(),
-        OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX ));
+        XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX);
 
     GetAutoStylePool()->AddFamily(
         XmlStyleFamily::TABLE_COLUMN,
-        OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ),
+        XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME,
         m_xColumnExportHelper.get(),
-        OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX ));
+        XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX);
 
     GetAutoStylePool()->AddFamily(
         XmlStyleFamily::TABLE_CELL,
-        OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ),
+        XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME,
         m_xCellExportHelper.get(),
-        OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX ));
+        XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX);
 
     GetAutoStylePool()->AddFamily(
         XmlStyleFamily::TABLE_ROW,
-        OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ),
+        XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME,
         m_xRowExportHelper.get(),
-        OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX ));
+        XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX);
 }
 
 void ODBExport::exportDataSource()
@@ -862,15 +862,15 @@ void ODBExport::exportStyleName(const ::xmloff::token::XMLTokenEnum _eToken,cons
 void ODBExport::exportTableName(XPropertySet* _xProp,bool _bUpdate)
 {
     OUString sValue;
-    _xProp->getPropertyValue(_bUpdate ? OUString(PROPERTY_UPDATE_TABLENAME) : OUString(PROPERTY_NAME)) >>= sValue;
+    _xProp->getPropertyValue(_bUpdate ? PROPERTY_UPDATE_TABLENAME : PROPERTY_NAME) >>= sValue;
     if ( sValue.isEmpty() )
         return;
 
     AddAttribute(XML_NAMESPACE_DB, XML_NAME,sValue);
-    _xProp->getPropertyValue(_bUpdate ? OUString(PROPERTY_UPDATE_SCHEMANAME) : OUString(PROPERTY_SCHEMANAME)) >>= sValue;
+    _xProp->getPropertyValue(_bUpdate ? PROPERTY_UPDATE_SCHEMANAME : PROPERTY_SCHEMANAME) >>= sValue;
     if ( !sValue.isEmpty() )
         AddAttribute(XML_NAMESPACE_DB, XML_SCHEMA_NAME,sValue);
-    _xProp->getPropertyValue(_bUpdate ? OUString(PROPERTY_UPDATE_CATALOGNAME) : OUString(PROPERTY_CATALOGNAME)) >>= sValue;
+    _xProp->getPropertyValue(_bUpdate ? PROPERTY_UPDATE_CATALOGNAME : PROPERTY_CATALOGNAME) >>= sValue;
     if ( !sValue.isEmpty() )
         AddAttribute(XML_NAMESPACE_DB, XML_CATALOG_NAME,sValue);
 
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 61c0940e98a1..9d548a138139 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2568,7 +2568,7 @@ sal_Bool SAL_CALL OApplicationController::attachModel(const Reference< XModel >
 
     const OUString aPropertyNames[] =
     {
-        OUString(PROPERTY_URL), OUString(PROPERTY_USER)
+        PROPERTY_URL, PROPERTY_USER
     };
 
     // disconnect from old model
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 5fb250c4bde3..7235ac3c6990 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -480,10 +480,10 @@ bool SbaTableQueryBrowser::InitializeForm( const Reference< XPropertySet > & i_f
 
         const OUString aTransferProperties[] =
         {
-            OUString(PROPERTY_APPLYFILTER),
-            OUString(PROPERTY_FILTER),
-            OUString(PROPERTY_HAVING_CLAUSE),
-            OUString(PROPERTY_ORDER)
+            PROPERTY_APPLYFILTER,
+            PROPERTY_FILTER,
+            PROPERTY_HAVING_CLAUSE,
+            PROPERTY_ORDER
         };
         for (const auto & aTransferProperty : aTransferProperties)
         {
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index fa485a97b2df..bb56d81b2e43 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -128,7 +128,7 @@ namespace dbaui
             case  ::dbaccess::DST_MYSQL_ODBC:
             case  ::dbaccess::DST_ODBC:
                 m_xFT_Connection->set_label(DBA_RES(STR_NAME_OF_ODBC_DATASOURCE));
-                m_xConnectionURL->set_help_id( eType ==  ::dbaccess::DST_MYSQL_ODBC ? OUString(HID_DSADMIN_MYSQL_ODBC_DATASOURCE) : OUString(HID_DSADMIN_ODBC_DATASOURCE));
+                m_xConnectionURL->set_help_id( eType ==  ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE);
                 break;
             case  ::dbaccess::DST_LDAP:
                 m_xFT_Connection->set_label(DBA_RES(STR_HOSTNAME));
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index f975bbc2160c..ae856a34b35f 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1323,7 +1323,7 @@ bool insertHierarchyElement(weld::Window* pParent, const Reference< XComponentCo
             {"Parent", uno::Any(xNameAccess)},
             {PROPERTY_EMBEDDEDOBJECT, uno::Any(_xContent)},
         }));
-        OUString sServiceName(_bCollection ? (_bForm ? OUString(SERVICE_NAME_FORM_COLLECTION) : OUString(SERVICE_NAME_REPORT_COLLECTION)) : OUString(SERVICE_SDB_DOCUMENTDEFINITION));
+        OUString sServiceName(_bCollection ? (_bForm ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION);
 
         Reference<XContent > xNew( xORB->createInstanceWithArguments( sServiceName, aArguments ), UNO_QUERY_THROW );
         Reference< XNameContainer > xNameContainer( xNameAccess, UNO_QUERY_THROW );
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 8cfe9ace02f2..29be8774747b 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -134,7 +134,7 @@ bool ObjectCopySource::isView() const
 void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObject ) const
 {
     const OUString aCopyProperties[] = {
-        OUString(PROPERTY_FONT), OUString(PROPERTY_ROW_HEIGHT), OUString(PROPERTY_TEXTCOLOR),OUString(PROPERTY_TEXTLINECOLOR),OUString(PROPERTY_TEXTEMPHASIS),OUString(PROPERTY_TEXTRELIEF)
+        PROPERTY_FONT, PROPERTY_ROW_HEIGHT, PROPERTY_TEXTCOLOR,PROPERTY_TEXTLINECOLOR,PROPERTY_TEXTEMPHASIS,PROPERTY_TEXTRELIEF
     };
     for (const auto & aCopyProperty : aCopyProperties)
     {
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index e84f36e7f58f..47c3932ca21a 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -160,7 +160,7 @@ namespace dbaui
     // QueryDesigner
     QueryDesigner::QueryDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication,
         const Reference< XFrame >& _rxParentFrame, bool _bCreateView )
-        :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, _bCreateView ? OUString(URL_COMPONENT_VIEWDESIGN) : OUString(URL_COMPONENT_QUERYDESIGN) )
+        :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, _bCreateView ? URL_COMPONENT_VIEWDESIGN : URL_COMPONENT_QUERYDESIGN )
         ,m_nCommandType( _bCreateView ? CommandType::TABLE : CommandType::QUERY )
     {
     }
@@ -189,7 +189,7 @@ namespace dbaui
 
     // TableDesigner
     TableDesigner::TableDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame )
-        :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< OUString >( URL_COMPONENT_TABLEDESIGN ) )
+        :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, URL_COMPONENT_TABLEDESIGN )
     {
     }
 
@@ -243,7 +243,7 @@ namespace dbaui
     // ResultSetBrowser
     ResultSetBrowser::ResultSetBrowser( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame,
             bool _bTable )
-        :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast < OUString >( URL_COMPONENT_DATASOURCEBROWSER ) )
+        :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, URL_COMPONENT_DATASOURCEBROWSER )
         ,m_bTable(_bTable)
     {
     }
@@ -273,7 +273,7 @@ namespace dbaui
 
     // RelationDesigner
     RelationDesigner::RelationDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame )
-        :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< OUString >( URL_COMPONENT_RELATIONDESIGN ) )
+        :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, URL_COMPONENT_RELATIONDESIGN )
     {
     }
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index b885b3e481f4..880600342dea 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -659,7 +659,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
     OUString sUnsupportedSetting;
 
     const OUString aSettings[] = {
-        OUString(PROPERTY_FILTER), OUString(PROPERTY_ORDER), OUString(PROPERTY_HAVING_CLAUSE), OUString(PROPERTY_GROUP_BY)
+        PROPERTY_FILTER, PROPERTY_ORDER, PROPERTY_HAVING_CLAUSE, PROPERTY_GROUP_BY
     };
     for (const auto & aSetting : aSettings)
     {