dbaccess/inc/bitmaps.hlst | 28 ++---
dbaccess/inc/helpids.h | 144 +++++++++++++++---------------
dbaccess/inc/strings.hxx | 152 +++++++++++++++++---------------
dbaccess/source/ui/browser/dbloader.cxx | 23 +---
4 files changed, 176 insertions(+), 171 deletions(-)
New commits:
commit 8e2fe1bb107c263cd3a0b04c14fc0267b3df2380
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Dec 3 11:06:33 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Dec 3 13:26:38 2021 +0100
loplugin:stringliteraldefine in dbaccess
Change-Id: Ic7c2d23747d56432037f145b7ce9a5b6cf3724cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126283
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/dbaccess/inc/bitmaps.hlst b/dbaccess/inc/bitmaps.hlst
index fb9c4567bb87..640dbee00c2c 100644
--- a/dbaccess/inc/bitmaps.hlst
+++ b/dbaccess/inc/bitmaps.hlst
@@ -14,20 +14,20 @@
#define BMP_REPORTFOLDER_TREE_L "dbaccess/res/reports_32.png"
#define BMP_QUERYFOLDER_TREE_L "dbaccess/res/queries_32.png"
#define BMP_TABLEFOLDER_TREE_L "dbaccess/res/tables_32.png"
-#define DATABASE_TREE_ICON "dbaccess/res/db.png"
-#define TABLE_TREE_ICON "res/sx03188.png"
-#define TABLEFOLDER_TREE_ICON "res/sx03187.png"
-#define VIEW_TREE_ICON "res/sx16670.png"
-#define QUERY_TREE_ICON "res/sx03202.png"
-#define QUERYFOLDER_TREE_ICON "res/sx03201.png"
-#define FORM_TREE_ICON "dbaccess/res/form_16.png"
-#define FORMFOLDER_TREE_ICON "dbaccess/res/forms_16.png"
-#define REPORT_TREE_ICON "dbaccess/res/report_16.png"
-#define REPORTFOLDER_TREE_ICON "dbaccess/res/reports_16.png"
-#define BMP_PRIMARY_KEY "dbaccess/res/jo01.png"
-#define BMP_PKEYICON "dbaccess/res/pkey.png"
-#define BMP_UP "dbaccess/res/sortup.png"
-#define BMP_DOWN "dbaccess/res/sortdown.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";
#endif
diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h
index c2720688f9b3..c8cc9dfb27bb 100644
--- a/dbaccess/inc/helpids.h
+++ b/dbaccess/inc/helpids.h
@@ -21,90 +21,90 @@
#define INCLUDED_DBACCESS_INC_HELPIDS_H
-#define HID_DATABROWSE_HEADER
"DBACCESS_HID_DATABROWSE_HEADER"
-#define HID_CTL_TABBROWSER
"DBACCESS_HID_CTL_TABBROWSER"
-#define HID_CTL_TREEVIEW
"DBACCESS_HID_CTL_TREEVIEW"
+inline constexpr OStringLiteral HID_DATABROWSE_HEADER =
"DBACCESS_HID_DATABROWSE_HEADER";
+inline constexpr OStringLiteral HID_CTL_TABBROWSER =
"DBACCESS_HID_CTL_TABBROWSER";
+inline constexpr OStringLiteral HID_CTL_TREEVIEW = "DBACCESS_HID_CTL_TREEVIEW";
-#define HID_DSADMIN_BROWSECONN
"DBACCESS_HID_DSADMIN_BROWSECONN"
+inline constexpr OStringLiteral HID_DSADMIN_BROWSECONN =
"DBACCESS_HID_DSADMIN_BROWSECONN";
-#define HID_CTL_QRYSQLEDIT
"DBACCESS_HID_CTL_QRYSQLEDIT"
+inline constexpr OStringLiteral HID_CTL_QRYSQLEDIT =
"DBACCESS_HID_CTL_QRYSQLEDIT";
-#define HID_CTL_QRYDGNTAB
"DBACCESS_HID_CTL_QRYDGNTAB"
-#define HID_CTL_QRYDGNCRIT
"DBACCESS_HID_CTL_QRYDGNCRIT"
-#define HID_QRYDGN_ROW_VISIBLE
"DBACCESS_HID_QRYDGN_ROW_VISIBLE"
-#define HID_QRYDGN_ROW_TABLE
"DBACCESS_HID_QRYDGN_ROW_TABLE"
-#define HID_QRYDGN_ROW_FIELD
"DBACCESS_HID_QRYDGN_ROW_FIELD"
-#define HID_QRYDGN_ROW_ORDER
"DBACCESS_HID_QRYDGN_ROW_ORDER"
-#define HID_QRYDGN_ROW_FUNCTION
"DBACCESS_HID_QRYDGN_ROW_FUNCTION"
-#define HID_QRYDGN_ROW_ALIAS
"DBACCESS_HID_QRYDGN_ROW_ALIAS"
-#define HID_QRYDGN_ROW_CRIT
"DBACCESS_HID_QRYDGN_ROW_CRIT"
+inline constexpr OStringLiteral HID_CTL_QRYDGNTAB =
"DBACCESS_HID_CTL_QRYDGNTAB";
+inline constexpr OStringLiteral HID_CTL_QRYDGNCRIT =
"DBACCESS_HID_CTL_QRYDGNCRIT";
+inline constexpr OStringLiteral HID_QRYDGN_ROW_VISIBLE =
"DBACCESS_HID_QRYDGN_ROW_VISIBLE";
+inline constexpr OStringLiteral HID_QRYDGN_ROW_TABLE =
"DBACCESS_HID_QRYDGN_ROW_TABLE";
+inline constexpr OStringLiteral HID_QRYDGN_ROW_FIELD =
"DBACCESS_HID_QRYDGN_ROW_FIELD";
+inline constexpr OStringLiteral HID_QRYDGN_ROW_ORDER =
"DBACCESS_HID_QRYDGN_ROW_ORDER";
+inline constexpr OStringLiteral HID_QRYDGN_ROW_FUNCTION =
"DBACCESS_HID_QRYDGN_ROW_FUNCTION";
+inline constexpr OStringLiteral HID_QRYDGN_ROW_ALIAS =
"DBACCESS_HID_QRYDGN_ROW_ALIAS";
+inline constexpr OStringLiteral HID_QRYDGN_ROW_CRIT =
"DBACCESS_HID_QRYDGN_ROW_CRIT";
-#define HID_TAB_DESIGN_FIELDCONTROL
"DBACCESS_HID_TAB_DESIGN_FIELDCONTROL"
+inline constexpr OStringLiteral HID_TAB_DESIGN_FIELDCONTROL =
"DBACCESS_HID_TAB_DESIGN_FIELDCONTROL";
#define HID_TABLE_DESIGN_HELP_WINDOW
"DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW"
-#define HID_TAB_DESIGN_DESCWIN
"DBACCESS_HID_TAB_DESIGN_DESCWIN"
-#define HID_TABDESIGN_BACKGROUND
"DBACCESS_HID_TABDESIGN_BACKGROUND"
-#define HID_CTL_TABLEEDIT
"DBACCESS_HID_CTL_TABLEEDIT"
-#define HID_TABDESIGN_NAMECELL
"DBACCESS_HID_TABDESIGN_NAMECELL"
-#define HID_TABDESIGN_TYPECELL
"DBACCESS_HID_TABDESIGN_TYPECELL"
-#define HID_TABDESIGN_COMMENTCELL
"DBACCESS_HID_TABDESIGN_COMMENTCELL"
-#define HID_TAB_DESIGN_HELP_TEXT_FRAME
"DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME"
+inline constexpr OStringLiteral HID_TAB_DESIGN_DESCWIN =
"DBACCESS_HID_TAB_DESIGN_DESCWIN";
+inline constexpr OStringLiteral HID_TABDESIGN_BACKGROUND =
"DBACCESS_HID_TABDESIGN_BACKGROUND";
+inline constexpr OStringLiteral HID_CTL_TABLEEDIT =
"DBACCESS_HID_CTL_TABLEEDIT";
+inline constexpr OStringLiteral HID_TABDESIGN_NAMECELL =
"DBACCESS_HID_TABDESIGN_NAMECELL";
+inline constexpr OStringLiteral HID_TABDESIGN_TYPECELL =
"DBACCESS_HID_TABDESIGN_TYPECELL";
+inline constexpr OStringLiteral HID_TABDESIGN_COMMENTCELL =
"DBACCESS_HID_TABDESIGN_COMMENTCELL";
+inline constexpr OStringLiteral HID_TAB_DESIGN_HELP_TEXT_FRAME =
"DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME";
#define HID_TABLE_DESIGN_TABPAGE_GENERAL
"DBACCESS_HID_TABLE_DESIGN_TABPAGE_GENERAL"
-#define HID_TAB_ENT_DEFAULT
"DBACCESS_HID_TAB_ENT_DEFAULT"
-#define HID_TAB_ENT_FORMAT_SAMPLE
"DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE"
-#define HID_TAB_ENT_FORMAT
"DBACCESS_HID_TAB_ENT_FORMAT"
-#define HID_TAB_ENT_BOOL_DEFAULT
"DBACCESS_HID_TAB_ENT_BOOL_DEFAULT"
-#define HID_TAB_ENT_REQUIRED
"DBACCESS_HID_TAB_ENT_REQUIRED"
-#define HID_TAB_ENT_AUTOINCREMENT
"DBACCESS_HID_TAB_ENT_AUTOINCREMENT"
-#define HID_TAB_ENT_TEXT_LEN
"DBACCESS_HID_TAB_ENT_TEXT_LEN"
-#define HID_TAB_ENT_TYPE
"DBACCESS_HID_TAB_ENT_TYPE"
-#define HID_TAB_ENT_COLUMNNAME
"DBACCESS_HID_TAB_ENT_COLUMNNAME"
-#define HID_TAB_ENT_NUMTYP
"DBACCESS_HID_TAB_ENT_NUMTYP"
-#define HID_TAB_ENT_LEN
"DBACCESS_HID_TAB_ENT_LEN"
-#define HID_TAB_ENT_SCALE
"DBACCESS_HID_TAB_ENT_SCALE"
-#define HID_CTL_RELATIONTAB
"DBACCESS_HID_CTL_RELATIONTAB"
+inline constexpr OStringLiteral HID_TAB_ENT_DEFAULT =
"DBACCESS_HID_TAB_ENT_DEFAULT";
+inline constexpr OStringLiteral HID_TAB_ENT_FORMAT_SAMPLE =
"DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE";
+inline constexpr OStringLiteral HID_TAB_ENT_FORMAT =
"DBACCESS_HID_TAB_ENT_FORMAT";
+inline constexpr OStringLiteral HID_TAB_ENT_BOOL_DEFAULT =
"DBACCESS_HID_TAB_ENT_BOOL_DEFAULT";
+inline constexpr OStringLiteral HID_TAB_ENT_REQUIRED =
"DBACCESS_HID_TAB_ENT_REQUIRED";
+inline constexpr OStringLiteral HID_TAB_ENT_AUTOINCREMENT =
"DBACCESS_HID_TAB_ENT_AUTOINCREMENT";
+inline constexpr OStringLiteral HID_TAB_ENT_TEXT_LEN =
"DBACCESS_HID_TAB_ENT_TEXT_LEN";
+inline constexpr OStringLiteral HID_TAB_ENT_TYPE = "DBACCESS_HID_TAB_ENT_TYPE";
+inline constexpr OStringLiteral HID_TAB_ENT_COLUMNNAME =
"DBACCESS_HID_TAB_ENT_COLUMNNAME";
+inline constexpr OStringLiteral HID_TAB_ENT_NUMTYP =
"DBACCESS_HID_TAB_ENT_NUMTYP";
+inline constexpr OStringLiteral HID_TAB_ENT_LEN = "DBACCESS_HID_TAB_ENT_LEN";
+inline constexpr OStringLiteral HID_TAB_ENT_SCALE =
"DBACCESS_HID_TAB_ENT_SCALE";
+inline constexpr OStringLiteral HID_CTL_RELATIONTAB =
"DBACCESS_HID_CTL_RELATIONTAB";
#define HID_RELATIONDIALOG_LEFTFIELDCELL
"DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL"
-#define HID_RELATIONDIALOG_RIGHTFIELDCELL
"DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL"
-#define HID_CONFIRM_DROP_BUTTON_ALL
"DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL"
-#define HID_DSADMIN_LDAP_HOSTNAME
"DBACCESS_HID_DSADMIN_LDAP_HOSTNAME"
-#define HID_DSADMIN_MOZILLA_PROFILE_NAME
"DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME"
-#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME
"DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME"
+inline constexpr OStringLiteral HID_RELATIONDIALOG_RIGHTFIELDCELL =
"DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL";
+inline constexpr OStringLiteral HID_CONFIRM_DROP_BUTTON_ALL =
"DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL";
+inline constexpr OStringLiteral HID_DSADMIN_LDAP_HOSTNAME =
"DBACCESS_HID_DSADMIN_LDAP_HOSTNAME";
+inline constexpr OStringLiteral HID_DSADMIN_MOZILLA_PROFILE_NAME =
"DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME";
+inline constexpr OStringLiteral HID_DSADMIN_THUNDERBIRD_PROFILE_NAME =
"DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME";
-#define HID_DLGINDEX_INDEXDETAILS_FIELD
"DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD"
-#define HID_DLGINDEX_INDEXDETAILS_SORTORDER
"DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER"
+inline constexpr OStringLiteral HID_DLGINDEX_INDEXDETAILS_FIELD =
"DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD";
+inline constexpr OStringLiteral HID_DLGINDEX_INDEXDETAILS_SORTORDER =
"DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER";
-#define HID_TAB_AUTOINCREMENTVALUE
"DBACCESS_HID_TAB_AUTOINCREMENTVALUE"
+inline constexpr OStringLiteral HID_TAB_AUTOINCREMENTVALUE =
"DBACCESS_HID_TAB_AUTOINCREMENTVALUE";
-#define HID_DSADMIN_DBASE_PATH
"DBACCESS_HID_DSADMIN_DBASE_PATH"
-#define HID_DSADMIN_MYSQL_DATABASE
"DBACCESS_HID_DSADMIN_MYSQL_DATABASE"
+inline constexpr OStringLiteral HID_DSADMIN_DBASE_PATH =
"DBACCESS_HID_DSADMIN_DBASE_PATH";
+inline constexpr OStringLiteral HID_DSADMIN_MYSQL_DATABASE =
"DBACCESS_HID_DSADMIN_MYSQL_DATABASE";
#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE
"DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE"
#define HID_DSADMIN_ODBC_DATASOURCE
"DBACCESS_HID_DSADMIN_ODBC_DATASOURCE"
-#define HID_DSADMIN_MSACCESS_MDB_FILE
"DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE"
-#define HID_DSADMIN_FLAT_PATH
"DBACCESS_HID_DSADMIN_FLAT_PATH"
-#define HID_DSADMIN_CALC_PATH
"DBACCESS_HID_DSADMIN_CALC_PATH"
-#define HID_DSADMIN_WRITER_PATH
"DBACCESS_HID_DSADMIN_WRITER_PATH"
-#define HID_DSADMIN_ORACLE_DATABASE
"DBACCESS_HID_DSADMIN_ORACLE_DATABASE"
-
-#define HID_APP_TABLE_TREE
"DBACCESS_HID_APP_TABLE_TREE"
-#define HID_APP_FORM_TREE
"DBACCESS_HID_APP_FORM_TREE"
-#define HID_APP_QUERY_TREE
"DBACCESS_HID_APP_QUERY_TREE"
-#define HID_APP_REPORT_TREE
"DBACCESS_HID_APP_REPORT_TREE"
-#define HID_APP_CREATION_LIST
"DBACCESS_HID_APP_CREATION_LIST"
-#define HID_APP_SWAP_ICONCONTROL
"DBACCESS_HID_APP_SWAP_ICONCONTROL"
-
-
-#define HID_APP_HELP_TEXT
"DBACCESS_HID_APP_HELP_TEXT"
-#define HID_APP_DESCRIPTION_TEXT
"DBACCESS_HID_APP_DESCRIPTION_TEXT"
-#define HID_APP_VIEW_PREVIEW_CB
"DBACCESS_HID_APP_VIEW_PREVIEW_CB"
-#define HID_APP_VIEW_PREVIEW_1
"DBACCESS_HID_APP_VIEW_PREVIEW_1"
-#define HID_APP_VIEW_PREVIEW_2
"DBACCESS_HID_APP_VIEW_PREVIEW_2"
-#define HID_TABDESIGN_HELPTEXT
"DBACCESS_HID_TABDESIGN_HELPTEXT"
-#define HID_APP_VIEW_PREVIEW_3
"DBACCESS_HID_APP_VIEW_PREVIEW_3"
-
-
-#define HID_DBWIZ_PREVIOUS
"DBACCESS_HID_DBWIZ_PREVIOUS"
-#define HID_DBWIZ_NEXT
"DBACCESS_HID_DBWIZ_NEXT"
-#define HID_DBWIZ_CANCEL
"DBACCESS_HID_DBWIZ_CANCEL"
-#define HID_DBWIZ_FINISH
"DBACCESS_HID_DBWIZ_FINISH"
+inline constexpr OStringLiteral HID_DSADMIN_MSACCESS_MDB_FILE =
"DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE";
+inline constexpr OStringLiteral HID_DSADMIN_FLAT_PATH =
"DBACCESS_HID_DSADMIN_FLAT_PATH";
+inline constexpr OStringLiteral HID_DSADMIN_CALC_PATH =
"DBACCESS_HID_DSADMIN_CALC_PATH";
+inline constexpr OStringLiteral HID_DSADMIN_WRITER_PATH =
"DBACCESS_HID_DSADMIN_WRITER_PATH";
+inline constexpr OStringLiteral HID_DSADMIN_ORACLE_DATABASE =
"DBACCESS_HID_DSADMIN_ORACLE_DATABASE";
+
+inline constexpr OStringLiteral HID_APP_TABLE_TREE =
"DBACCESS_HID_APP_TABLE_TREE";
+inline constexpr OStringLiteral HID_APP_FORM_TREE =
"DBACCESS_HID_APP_FORM_TREE";
+inline constexpr OStringLiteral HID_APP_QUERY_TREE =
"DBACCESS_HID_APP_QUERY_TREE";
+inline constexpr OStringLiteral HID_APP_REPORT_TREE =
"DBACCESS_HID_APP_REPORT_TREE";
+inline constexpr OStringLiteral HID_APP_CREATION_LIST =
"DBACCESS_HID_APP_CREATION_LIST";
+inline constexpr OStringLiteral HID_APP_SWAP_ICONCONTROL =
"DBACCESS_HID_APP_SWAP_ICONCONTROL";
+
+
+inline constexpr OStringLiteral HID_APP_HELP_TEXT =
"DBACCESS_HID_APP_HELP_TEXT";
+inline constexpr OStringLiteral HID_APP_DESCRIPTION_TEXT =
"DBACCESS_HID_APP_DESCRIPTION_TEXT";
+inline constexpr OStringLiteral HID_APP_VIEW_PREVIEW_CB =
"DBACCESS_HID_APP_VIEW_PREVIEW_CB";
+inline constexpr OStringLiteral HID_APP_VIEW_PREVIEW_1 =
"DBACCESS_HID_APP_VIEW_PREVIEW_1";
+inline constexpr OStringLiteral HID_APP_VIEW_PREVIEW_2 =
"DBACCESS_HID_APP_VIEW_PREVIEW_2";
+inline constexpr OStringLiteral HID_TABDESIGN_HELPTEXT =
"DBACCESS_HID_TABDESIGN_HELPTEXT";
+inline constexpr OStringLiteral HID_APP_VIEW_PREVIEW_3 =
"DBACCESS_HID_APP_VIEW_PREVIEW_3";
+
+
+inline constexpr OStringLiteral HID_DBWIZ_PREVIOUS =
"DBACCESS_HID_DBWIZ_PREVIOUS";
+inline constexpr OStringLiteral HID_DBWIZ_NEXT = "DBACCESS_HID_DBWIZ_NEXT";
+inline constexpr OStringLiteral HID_DBWIZ_CANCEL = "DBACCESS_HID_DBWIZ_CANCEL";
+inline constexpr OStringLiteral HID_DBWIZ_FINISH = "DBACCESS_HID_DBWIZ_FINISH";
#endif
diff --git a/dbaccess/inc/strings.hxx b/dbaccess/inc/strings.hxx
index b70186d28863..c3ce05ca1c55 100644
--- a/dbaccess/inc/strings.hxx
+++ b/dbaccess/inc/strings.hxx
@@ -6,9 +6,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#pragma once
-#ifndef INCLUDED_DBACCESS_INC_STRINGS_HXX
-#define INCLUDED_DBACCESS_INC_STRINGS_HXX
+#include <rtl/ustring.hxx>
// property names
@@ -169,97 +169,109 @@
// service names
-#define SERVICE_SDBC_RESULTSET "com.sun.star.sdbc.ResultSet"
-#define SERVICE_SDBC_ROWSET "com.sun.star.sdbc.RowSet"
-#define SERVICE_SDBC_STATEMENT "com.sun.star.sdbc.Statement"
-#define SERVICE_SDBC_PREPAREDSTATEMENT "com.sun.star.sdbc.PreparedStatement"
-#define SERVICE_SDBC_CALLABLESTATEMENT "com.sun.star.sdbc.CallableStatement"
+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";
#define SERVICE_SDBC_CONNECTION "com.sun.star.sdbc.Connection"
-#define SERVICE_SDBCX_CONTAINER "com.sun.star.sdbcx.Container"
-#define SERVICE_SDBCX_TABLE "com.sun.star.sdbcx.Table"
-#define SERVICE_SDBCX_RESULTSET "com.sun.star.sdbcx.ResultSet"
-#define SERVICE_SDB_CONNECTION "com.sun.star.sdb.Connection"
-#define SERVICE_SDBCX_COLUMN "com.sun.star.sdbcx.Column"
-#define SERVICE_SDBCX_COLUMNDESCRIPTOR "com.sun.star.sdbcx.ColumnDescriptor"
-#define SERVICE_SDB_COLUMNSETTINGS "com.sun.star.sdb.ColumnSettings"
-#define SERVICE_SDB_RESULTCOLUMN "com.sun.star.sdb.ResultColumn"
-#define SERVICE_SDB_DATACOLUMN "com.sun.star.sdb.DataColumn"
-#define SERVICE_SDB_DATASOURCE "com.sun.star.sdb.DataSource"
-#define SERVICE_SDB_RESULTSET "com.sun.star.sdb.ResultSet"
-#define SERVICE_SDB_ROWSET "com.sun.star.sdb.RowSet"
-#define SERVICE_SDB_PREPAREDSTATMENT "com.sun.star.sdb.PreparedStatement"
-#define SERVICE_SDB_CALLABLESTATEMENT "com.sun.star.sdb.CallableStatement"
-#define SERVICE_SDB_SQLQUERYCOMPOSER "com.sun.star.sdb.SQLQueryComposer"
-#define SERVICE_SDB_DATASETTINGS "com.sun.star.sdb.DefinitionSettings"
-#define SERVICE_SDB_QUERYDESCRIPTOR "com.sun.star.sdb.QueryDescriptor"
-#define SERVICE_SDB_QUERY "com.sun.star.sdb.Query"
+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_PREPAREDSTATMENT
+ = 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";
#define SERVICE_SDBCX_COLUMNS "com.sun.star.sdbcx.Columns"
-#define SERVICE_SDBCX_TABLES "com.sun.star.sdbcx.Tables"
-#define SERVICE_SDB_QUERIES "com.sun.star.sdb.Queries"
+inline constexpr OUStringLiteral SERVICE_SDBCX_TABLES =
u"com.sun.star.sdbcx.Tables";
+inline constexpr OUStringLiteral SERVICE_SDB_QUERIES =
u"com.sun.star.sdb.Queries";
#define SERVICE_SDBCX_INDEXCOLUMN "com.sun.star.sdbcx.IndexColumn"
#define SERVICE_SDBCX_KEYCOLUMN "com.sun.star.sdbcx.KeyColumn"
-#define SERVICE_SDB_DOCUMENTDEFINITION "com.sun.star.sdb.DocumentDefinition"
+inline constexpr OUStringLiteral SERVICE_SDB_DOCUMENTDEFINITION
+ = u"com.sun.star.sdb.DocumentDefinition";
#define SERVICE_NAME_FORM "com.sun.star.sdb.Form"
-#define SERVICE_NAME_FORM_COLLECTION "com.sun.star.sdb.Forms"
+inline constexpr OUStringLiteral SERVICE_NAME_FORM_COLLECTION =
u"com.sun.star.sdb.Forms";
#define SERVICE_NAME_REPORT "com.sun.star.sdb.Report"
-#define SERVICE_NAME_REPORT_COLLECTION "com.sun.star.sdb.Reports"
-#define SERVICE_NAME_QUERY_COLLECTION "com.sun.star.sdb.Queries"
+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";
#define SERVICE_NAME_TABLE_COLLECTION "com.sun.star.sdb.Tables"
-#define SERVICE_NAME_SINGLESELECTQUERYCOMPOSER
"com.sun.star.sdb.SingleSelectQueryComposer"
-#define SERVICE_SDB_APPLICATIONCONTROLLER
"org.openoffice.comp.dbu.OApplicationController"
+inline constexpr OUStringLiteral SERVICE_NAME_SINGLESELECTQUERYCOMPOSER
+ = u"com.sun.star.sdb.SingleSelectQueryComposer";
+inline constexpr OUStringLiteral SERVICE_SDB_APPLICATIONCONTROLLER
+ = u"org.openoffice.comp.dbu.OApplicationController";
// info properties
-#define INFO_JDBCDRIVERCLASS "JavaDriverClass"
-#define INFO_TEXTFILEEXTENSION "Extension"
-#define INFO_CHARSET "CharSet"
-#define INFO_TEXTFILEHEADER "HeaderLine"
-#define INFO_FIELDDELIMITER "FieldDelimiter"
-#define INFO_TEXTDELIMITER "StringDelimiter"
-#define INFO_DECIMALDELIMITER "DecimalDelimiter"
-#define INFO_THOUSANDSDELIMITER "ThousandDelimiter"
-#define INFO_SHOWDELETEDROWS "ShowDeleted"
-#define INFO_ALLOWLONGTABLENAMES "NoNameLengthLimit"
-#define INFO_ADDITIONALOPTIONS "SystemDriverSettings"
-#define INFO_AUTORETRIEVEVALUE "AutoRetrievingStatement"
-#define INFO_AUTORETRIEVEENABLED "IsAutoRetrievingEnabled"
-#define INFO_APPEND_TABLE_ALIAS "AppendTableAliasName"
-#define INFO_AS_BEFORE_CORRELATION_NAME "GenerateASBeforeCorrelationName"
-#define INFO_FORMS_CHECK_REQUIRED_FIELDS "FormsCheckRequiredFields"
-#define INFO_PARAMETERNAMESUBST "ParameterNameSubstitution"
-#define INFO_IGNOREDRIVER_PRIV "IgnoreDriverPrivileges"
-#define INFO_USECATALOG "UseCatalog"
-#define INFO_CONN_LDAP_BASEDN "BaseDN"
-#define INFO_CONN_LDAP_ROWCOUNT "MaxRowCount"
-#define INFO_PREVIEW "Preview"
-#define INFO_MEDIATYPE "MediaType"
-#define INFO_ESCAPE_DATETIME "EscapeDateTime"
+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";
// other
-#define INFO_POOLURL "PoolURL"
+inline constexpr OUStringLiteral INFO_POOLURL = u"PoolURL";
#define URL_INTERACTIVE "Interactive"
// URLs
-#define URL_COMPONENT_QUERYDESIGN ".component:DB/QueryDesign"
-#define URL_COMPONENT_VIEWDESIGN ".component:DB/ViewDesign"
-#define URL_COMPONENT_TABLEDESIGN ".component:DB/TableDesign"
-#define URL_COMPONENT_FORMGRIDVIEW ".component:DB/FormGridView"
-#define URL_COMPONENT_DATASOURCEBROWSER ".component:DB/DataSourceBrowser"
-#define URL_COMPONENT_RELATIONDESIGN ".component:DB/RelationDesign"
+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";
#define URL_COMPONENT_APPLICATION ".component:DB/Application"
#define URL_COMPONENT_REPORTDESIGN ".component:DB/ReportDesign"
// service names
-#define SERVICE_SDB_DIRECTSQLDIALOG "org.openoffice.comp.dbu.DirectSqlDialog"
+inline constexpr OUStringLiteral SERVICE_SDB_DIRECTSQLDIALOG
+ = u"org.openoffice.comp.dbu.DirectSqlDialog";
// other DBU relevant strings
-#define FRAME_NAME_QUERY_PREVIEW "QueryPreview"
-#define SERVICE_CONTROLDEFAULT "com.sun.star.comp.dbu.OColumnControl"
#define PROPERTY_QUERYDESIGNVIEW "QueryDesignView"
#define PROPERTY_GRAPHICAL_DESIGN "GraphicalDesign"
#define PROPERTY_HELP_URL "HelpURL"
+inline constexpr OUStringLiteral FRAME_NAME_QUERY_PREVIEW = u"QueryPreview";
+inline constexpr OUStringLiteral SERVICE_CONTROLDEFAULT =
u"com.sun.star.comp.dbu.OColumnControl";
// other DBU properties
@@ -270,14 +282,12 @@
#define PROPERTY_ENABLED "Enabled"
#define PROPERTY_MOUSE_WHEEL_BEHAVIOR "MouseWheelBehavior"
-#define SQLSTATE_GENERAL "01000"
+inline constexpr OUStringLiteral SQLSTATE_GENERAL = u"01000";
#define PROPERTY_APPLYFORMDESIGNMODE "ApplyFormDesignMode"
#define PROPERTY_IS_FORM "IsForm"
#define PROPERTY_PERSISTENT_PATH "PersistentPath"
-#define STR_AUTOTEXTSEPARATORLIST "\"\t34\t'\t39"
-
-#endif
+inline constexpr OUStringLiteral STR_AUTOTEXTSEPARATORLIST = u"\"\t34\t'\t39";
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/dbaccess/source/ui/browser/dbloader.cxx
b/dbaccess/source/ui/browser/dbloader.cxx
index 3530bf7a6acd..67645e92e611 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -113,22 +113,17 @@ void SAL_CALL DBContentLoader::load(const Reference<
XFrame > & rFrame, const OU
m_xListener = rListener;
m_aArgs = rArgs;
- static const struct ServiceNameToImplName
+ static constexpr struct ServiceNameToImplName
{
- const char* pAsciiServiceName;
+ rtl::OUStringConstExpr sServiceName;
const char* pAsciiImplementationName;
- ServiceNameToImplName( const char* _pService, const char* _pImpl )
- :pAsciiServiceName( _pService )
- ,pAsciiImplementationName( _pImpl )
- {
- }
} aImplementations[] = {
- ServiceNameToImplName( URL_COMPONENT_FORMGRIDVIEW,
"org.openoffice.comp.dbu.OFormGridView" ),
- ServiceNameToImplName( URL_COMPONENT_DATASOURCEBROWSER,
"org.openoffice.comp.dbu.ODatasourceBrowser" ),
- ServiceNameToImplName( URL_COMPONENT_QUERYDESIGN,
"org.openoffice.comp.dbu.OQueryDesign" ),
- ServiceNameToImplName( URL_COMPONENT_TABLEDESIGN,
"org.openoffice.comp.dbu.OTableDesign" ),
- ServiceNameToImplName( URL_COMPONENT_RELATIONDESIGN,
"org.openoffice.comp.dbu.ORelationDesign" ),
- ServiceNameToImplName( URL_COMPONENT_VIEWDESIGN,
"org.openoffice.comp.dbu.OViewDesign" )
+ { URL_COMPONENT_FORMGRIDVIEW,
"org.openoffice.comp.dbu.OFormGridView" },
+ { URL_COMPONENT_DATASOURCEBROWSER,
"org.openoffice.comp.dbu.ODatasourceBrowser" },
+ { URL_COMPONENT_QUERYDESIGN,
"org.openoffice.comp.dbu.OQueryDesign" },
+ { URL_COMPONENT_TABLEDESIGN,
"org.openoffice.comp.dbu.OTableDesign" },
+ { URL_COMPONENT_RELATIONDESIGN,
"org.openoffice.comp.dbu.ORelationDesign" },
+ { URL_COMPONENT_VIEWDESIGN,
"org.openoffice.comp.dbu.OViewDesign" }
};
INetURLObject aParser( rURL );
@@ -137,7 +132,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame
> & rFrame, const OU
const OUString sComponentURL( aParser.GetMainURL(
INetURLObject::DecodeMechanism::ToIUri ) );
for (const ServiceNameToImplName& aImplementation : aImplementations)
{
- if ( sComponentURL.equalsAscii( aImplementation.pAsciiServiceName ) )
+ if ( sComponentURL == aImplementation.sServiceName )
{
xController.set( m_xContext->getServiceManager()->
createInstanceWithContext( OUString::createFromAscii(
aImplementation.pAsciiImplementationName ), m_xContext), UNO_QUERY_THROW );
