diff options
Diffstat (limited to 'dbaccess/inc')
| -rw-r--r-- | dbaccess/inc/bitmaps.hlst | 36 | ||||
| -rw-r--r-- | dbaccess/inc/core_resource.hxx | 7 | ||||
| -rw-r--r-- | dbaccess/inc/dbadllapi.hxx | 5 | ||||
| -rw-r--r-- | dbaccess/inc/helpids.h | 172 | ||||
| -rw-r--r-- | dbaccess/inc/pch/precompiled_dba.hxx | 3 | ||||
| -rw-r--r-- | dbaccess/inc/pch/precompiled_dbaxml.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/inc/pch/precompiled_dbu.hxx | 17 | ||||
| -rw-r--r-- | dbaccess/inc/pch/precompiled_sdbt.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/inc/query.hrc | 4 | ||||
| -rw-r--r-- | dbaccess/inc/strings.hrc | 25 | ||||
| -rw-r--r-- | dbaccess/inc/strings.hxx | 482 | ||||
| -rw-r--r-- | dbaccess/inc/templwin.hrc | 2 |
12 files changed, 374 insertions, 383 deletions
diff --git a/dbaccess/inc/bitmaps.hlst b/dbaccess/inc/bitmaps.hlst index fb9c4567bb87..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 -#define BMP_FORMFOLDER_TREE_L "dbaccess/res/forms_32.png" -#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 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/core_resource.hxx b/dbaccess/inc/core_resource.hxx index 99cbb34d6d2a..000a59bf1713 100644 --- a/dbaccess/inc/core_resource.hxx +++ b/dbaccess/inc/core_resource.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX -#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX +#pragma once #include <rtl/ustring.hxx> #include "dbadllapi.hxx" @@ -31,7 +30,7 @@ namespace dbaccess { // ResourceManager // handling resources within the DBA-Core library - class OOO_DLLPUBLIC_DBA ResourceManager + class UNLESS_MERGELIBS_MORE(OOO_DLLPUBLIC_DBA) ResourceManager { private: // no instantiation allowed @@ -66,6 +65,4 @@ namespace dbaccess }; } -#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/dbadllapi.hxx b/dbaccess/inc/dbadllapi.hxx index 6388e579b36a..d742b9a3b1e9 100644 --- a/dbaccess/inc/dbadllapi.hxx +++ b/dbaccess/inc/dbadllapi.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_INC_DBADLLAPI_HXX -#define INCLUDED_DBACCESS_SOURCE_INC_DBADLLAPI_HXX +#pragma once #include <sal/config.h> @@ -30,6 +29,4 @@ #define OOO_DLLPUBLIC_DBA SAL_DLLPUBLIC_IMPORT #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h index c2720688f9b3..8f496b98a138 100644 --- a/dbaccess/inc/helpids.h +++ b/dbaccess/inc/helpids.h @@ -20,91 +20,93 @@ #ifndef INCLUDED_DBACCESS_INC_HELPIDS_H #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" - -#define HID_DSADMIN_BROWSECONN "DBACCESS_HID_DSADMIN_BROWSECONN" - -#define 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" - -#define 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" -#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" -#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" - -#define HID_DLGINDEX_INDEXDETAILS_FIELD "DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD" -#define HID_DLGINDEX_INDEXDETAILS_SORTORDER "DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER" - -#define 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" -#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" +#include <rtl/ustring.hxx> + +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/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx index 516dcef5f4c6..b281a8b51193 100644 --- a/dbaccess/inc/pch/precompiled_dba.hxx +++ b/dbaccess/inc/pch/precompiled_dba.hxx @@ -99,7 +99,6 @@ #include <vcl/dllapi.h> #include <vcl/mapmod.hxx> #include <vcl/region.hxx> -#include <vcl/scopedbitmapaccess.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclptr.hxx> #endif // PCH_LEVEL >= 2 @@ -245,7 +244,7 @@ #include <svl/svldllapi.h> #include <tools/color.hxx> #include <tools/degree.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> #include <tools/long.hxx> diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx index fc06290f489d..f611bbfcbd1a 100644 --- a/dbaccess/inc/pch/precompiled_dbaxml.hxx +++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx @@ -89,7 +89,7 @@ #include <sax/tools/converter.hxx> #include <sfx2/docfile.hxx> #include <svl/filenotation.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/pathoptions.hxx> #include <xmloff/ProgressBarHelper.hxx> #include <xmloff/dllapi.h> diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index 9bfc030bc5ab..15a42d978df7 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-09-12 11:51:31 using: + Generated on 2023-07-19 09:21:53 using: ./bin/update_pch dbaccess dbu --cutoff=12 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -36,6 +36,7 @@ #include <new> #include <optional> #include <ostream> +#include <span> #include <string_view> #include <type_traits> #include <unordered_map> @@ -53,6 +54,7 @@ #include <osl/process.h> #include <osl/thread.hxx> #include <rtl/bootstrap.hxx> +#include <rtl/character.hxx> #include <rtl/instance.hxx> #include <rtl/math.h> #include <rtl/ref.hxx> @@ -78,12 +80,12 @@ #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> #include <vcl/ctrl.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/event.hxx> #include <vcl/font.hxx> #include <vcl/gradient.hxx> #include <vcl/idle.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> @@ -114,10 +116,12 @@ #include <vcl/wall.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/color/bcolor.hxx> #include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/vector/b2enums.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> @@ -141,6 +145,7 @@ #include <com/sun/star/frame/FrameAction.hpp> #include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/frame/XDispatch.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> @@ -151,7 +156,6 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/DataType.hpp> @@ -174,6 +178,7 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> @@ -182,15 +187,14 @@ #include <connectivity/dbtools.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <cppu/unotype.hxx> -#include <cppuhelper/compbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> +#include <o3tl/safeint.hxx> #include <o3tl/typed_flags_set.hxx> #include <salhelper/simplereferenceobject.hxx> -#include <salhelper/singletonref.hxx> #include <sfx2/dllapi.h> #include <sot/exchange.hxx> #include <sot/formats.hxx> @@ -206,9 +210,9 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/color.hxx> #include <tools/degree.hxx> -#include <tools/diagnose_ex.h> #include <tools/gen.hxx> #include <tools/globname.hxx> +#include <tools/lineend.hxx> #include <tools/link.hxx> #include <tools/long.hxx> #include <tools/mapunit.hxx> @@ -216,7 +220,6 @@ #include <tools/ref.hxx> #include <tools/solar.h> #include <tools/toolsdllapi.h> -#include <tools/wintypes.hxx> #include <typelib/typedescription.h> #include <uno/data.h> #include <unotools/eventlisteneradapter.hxx> diff --git a/dbaccess/inc/pch/precompiled_sdbt.hxx b/dbaccess/inc/pch/precompiled_sdbt.hxx index f691c1fa5c65..66bc51bdece0 100644 --- a/dbaccess/inc/pch/precompiled_sdbt.hxx +++ b/dbaccess/inc/pch/precompiled_sdbt.hxx @@ -39,7 +39,7 @@ #include <connectivity/sqlerror.hxx> #include <connectivity/statementcomposer.hxx> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <connectiontools.hxx> diff --git a/dbaccess/inc/query.hrc b/dbaccess/inc/query.hrc index e4c034ded11c..abb8bef8d1e8 100644 --- a/dbaccess/inc/query.hrc +++ b/dbaccess/inc/query.hrc @@ -19,7 +19,9 @@ #ifndef INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC #define INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC -#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) +#include <unotools/resmgr.hxx> + +#define NC_(Context, String) TranslateId(Context, u8##String) const TranslateId RSC_QUERY_OBJECT_TYPE[] = { diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc index ed910c8df1af..0691ff9f7a8b 100644 --- a/dbaccess/inc/strings.hrc +++ b/dbaccess/inc/strings.hrc @@ -21,7 +21,7 @@ #include <unotools/resmgr.hxx> -#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) +#define NC_(Context, String) TranslateId(Context, u8##String) #define RID_STR_CONNECTION_INVALID NC_("RID_STR_CONNECTION_INVALID", "No connection could be established.") #define RID_STR_TABLE_IS_FILTERED NC_("RID_STR_TABLE_IS_FILTERED", "The table $name$ already exists. It is not visible because it has been filtered out.") @@ -293,7 +293,6 @@ #define STR_JDBCDRIVER_SUCCESS NC_("STR_JDBCDRIVER_SUCCESS", "The JDBC driver was loaded successfully.") #define STR_JDBCDRIVER_NO_SUCCESS NC_("STR_JDBCDRIVER_NO_SUCCESS", "The JDBC driver could not be loaded.") #define STR_MSACCESS_FILTERNAME NC_("STR_MSACCESS_FILTERNAME", "MS Access file") -#define STR_MSACCESS_2007_FILTERNAME NC_("STR_MSACCESS_2007_FILTERNAME", "MS Access 2007 file") #define STR_FIREBIRD_FILTERNAME NC_("STR_FIREBIRD_FILTERNAME", "Firebird Database") #define STR_RSC_CHARSETS NC_("STR_RSC_CHARSETS", "System") @@ -330,9 +329,9 @@ #define STR_DBASE_PATH_OR_FILE NC_("STR_DBASE_PATH_OR_FILE", "Path to the dBASE files") #define STR_FLAT_PATH_OR_FILE NC_("STR_FLAT_PATH_OR_FILE", "Path to the text files") #define STR_CALC_PATH_OR_FILE NC_("STR_CALC_PATH_OR_FILE", "Path to the spreadsheet document") -#define STR_NAME_OF_ODBC_DATASOURCE NC_("STR_NAME_OF_ODBC_DATASOURCE", "Name of the ODBC data source on your system") +#define STR_NAME_OF_ODBC_DATASOURCE NC_("STR_NAME_OF_ODBC_DATASOURCE", "Name of the ODBC data source") #define STR_WRITER_PATH_OR_FILE NC_("STR_WRITER_PATH_OR_FILE", "Path to the Writer document") -#define STR_MYSQL_DATABASE_NAME NC_("STR_MYSQL_DATABASE_NAME", "Name of the MySQL database") +#define STR_MYSQL_DATABASE_NAME NC_("STR_MYSQL_DATABASE_NAME", "Name of the MySQL/MariaDB database") #define STR_ORACLE_DATABASE_NAME NC_("STR_ORACLE_DATABASE_NAME", "Name of the Oracle database") #define STR_MSACCESS_MDB_FILE NC_("STR_MSACCESS_MDB_FILE", "Microsoft Access database file") #define STR_NO_ADDITIONAL_SETTINGS NC_("STR_NO_ADDITIONAL_SETTINGS", "No more settings are necessary. To verify that the connection is working, click the '%test' button.") @@ -365,16 +364,17 @@ #define STR_PAGETITLE_ADO NC_("STR_PAGETITLE_ADO", "Set up ADO connection" ) #define STR_PAGETITLE_JDBC NC_("STR_PAGETITLE_JDBC", "Set up JDBC connection" ) #define STR_PAGETITLE_ORACLE NC_("STR_PAGETITLE_ORACLE", "Set up Oracle database connection" ) -#define STR_PAGETITLE_MYSQL NC_("STR_PAGETITLE_MYSQL", "Set up MySQL connection" ) +#define STR_PAGETITLE_MYSQL NC_("STR_PAGETITLE_MYSQL", "Set up MySQL/MariaDB connection" ) +#define STR_PAGETITLE_POSTGRES NC_("STR_PAGETITLE_POSTGRES", "Set up PostgreSQL connection" ) #define STR_PAGETITLE_ODBC NC_("STR_PAGETITLE_ODBC", "Set up ODBC connection" ) #define STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET NC_("STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET", "Set up Writer Document or Spreadsheet connection" ) #define STR_PAGETITLE_AUTHENTIFICATION NC_("STR_PAGETITLE_AUTHENTIFICATION", "Set up user authentication" ) -#define STR_PAGETITLE_MYSQL_NATIVE NC_("STR_PAGETITLE_MYSQL_NATIVE", "Set up MySQL server data") +#define STR_PAGETITLE_MYSQL_NATIVE NC_("STR_PAGETITLE_MYSQL_NATIVE", "Set up MySQL/MariaDB server data") #define STR_PAGETITLE_FINAL NC_("STR_PAGETITLE_FINAL", "Save and proceed" ) #define STR_DATABASEDEFAULTNAME NC_("STR_DATABASEDEFAULTNAME", "New Database" ) -#define STR_MYSQLJDBC_HEADERTEXT NC_("STR_MYSQLJDBC_HEADERTEXT", "Set up connection to a MySQL database using JDBC" ) -#define STR_MYSQLJDBC_HELPTEXT NC_("STR_MYSQLJDBC_HELPTEXT", "Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings.") -#define STR_MYSQL_DRIVERCLASSTEXT NC_("STR_MYSQL_DRIVERCLASSTEXT", "MySQL JDBC d~river class:") +#define STR_MYSQLJDBC_HEADERTEXT NC_("STR_MYSQLJDBC_HEADERTEXT", "Set up connection to a MySQL/MariaDB database using JDBC" ) +#define STR_MYSQLJDBC_HELPTEXT NC_("STR_MYSQLJDBC_HELPTEXT", "Please enter the required information to connect to a MySQL/MariaDB database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings.") +#define STR_MYSQL_DRIVERCLASSTEXT NC_("STR_MYSQL_DRIVERCLASSTEXT", "MySQL/MariaDB JDBC d~river class:") #define STR_MYSQL_DEFAULT NC_("STR_MYSQL_DEFAULT", "Default: 3306") #define STR_DBASE_HEADERTEXT NC_("STR_DBASE_HEADERTEXT", "Set up a connection to dBASE files" ) #define STR_DBASE_HELPTEXT NC_("STR_DBASE_HELPTEXT", "Select the folder where the dBASE files are stored." ) @@ -385,8 +385,8 @@ #define STR_MSACCESS_HELPTEXT NC_("STR_MSACCESS_HELPTEXT", "Please select the Microsoft Access file you want to access.") #define STR_ADO_HEADERTEXT NC_("STR_ADO_HEADERTEXT", "Set up a connection to an ADO database" ) #define STR_ADO_HELPTEXT NC_("STR_ADO_HELPTEXT", "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ) -#define STR_ODBC_HEADERTEXT NC_("STR_ODBC_HEADERTEXT", "Set up a connection to an ODBC database" ) -#define STR_ODBC_HELPTEXT NC_("STR_ODBC_HELPTEXT", "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ) +#define STR_ODBC_HEADERTEXT NC_("STR_ODBC_HEADERTEXT", "Set up a connection to an ODBC data source" ) +#define STR_ODBC_HELPTEXT NC_("STR_ODBC_HELPTEXT", "Enter the name of the ODBC data source you want to use.\nClick 'Browse...' to select an ODBC data source that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ) #define STR_JDBC_HEADERTEXT NC_("STR_JDBC_HEADERTEXT", "Set up a connection to a JDBC database" ) #define STR_JDBC_HELPTEXT NC_("STR_JDBC_HELPTEXT", "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ) #define STR_ORACLE_HEADERTEXT NC_("STR_ORACLE_HEADERTEXT", "Set up a connection to an Oracle database") @@ -420,6 +420,9 @@ #define STR_EXCEPTION_INFO NC_("STR_EXCEPTION_INFO", "Information") #define STR_EXCEPTION_DETAILS NC_("STR_EXCEPTION_DETAILS", "Details") +#define STR_ADD_USER NC_("STR_ADD_USER", "Add User") +#define STR_DELETE_USER NC_("STR_DELETE_USER", "Delete User") +#define STR_CHANGE_PASSWORD NC_("STR_CHANGE_PASSWORD", "Change Password") #define STR_QUERY_USERADMIN_DELETE_USER NC_("STR_QUERY_USERADMIN_DELETE_USER", "Do you really want to delete the user?") #define STR_USERADMIN_NOT_AVAILABLE NC_("STR_USERADMIN_NOT_AVAILABLE", "The database does not support user administration." ) #define STR_ERROR_PASSWORDS_NOT_IDENTICAL NC_("STR_ERROR_PASSWORDS_NOT_IDENTICAL", "The passwords do not match. Please enter the password again.") diff --git a/dbaccess/inc/strings.hxx b/dbaccess/inc/strings.hxx index b70186d28863..9783f9e41030 100644 --- a/dbaccess/inc/strings.hxx +++ b/dbaccess/inc/strings.hxx @@ -6,278 +6,266 @@ * 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 -#define PROPERTY_URL "URL" -#define PROPERTY_INFO "Info" -#define PROPERTY_SETTINGS "Settings" -#define PROPERTY_ISPASSWORDREQUIRED "IsPasswordRequired" -#define PROPERTY_TABLEFILTER "TableFilter" -#define PROPERTY_TABLETYPEFILTER "TableTypeFilter" -#define PROPERTY_NAME "Name" -#define PROPERTY_SCHEMANAME "SchemaName" -#define PROPERTY_CATALOGNAME "CatalogName" -#define PROPERTY_PRIVILEGES "Privileges" -#define PROPERTY_ESCAPE_PROCESSING "EscapeProcessing" -#define PROPERTY_COMMAND "Command" -#define PROPERTY_TYPE "Type" -#define PROPERTY_TYPENAME "TypeName" -#define PROPERTY_PRECISION "Precision" -#define PROPERTY_SCALE "Scale" -#define PROPERTY_ISNULLABLE "IsNullable" -#define PROPERTY_ISAUTOINCREMENT "IsAutoIncrement" -#define PROPERTY_ISROWVERSION "IsRowVersion" -#define PROPERTY_DESCRIPTION "Description" -#define PROPERTY_DEFAULTVALUE "DefaultValue" -#define PROPERTY_NUMBERFORMAT "FormatKey" -#define PROPERTY_QUERYTIMEOUT "QueryTimeOut" -#define PROPERTY_MAXFIELDSIZE "MaxFieldSize" -#define PROPERTY_MAXROWS "MaxRows" -#define PROPERTY_CURSORNAME "CursorName" -#define PROPERTY_RESULTSETCONCURRENCY "ResultSetConcurrency" -#define PROPERTY_RESULTSETTYPE "ResultSetType" -#define PROPERTY_FETCHDIRECTION "FetchDirection" -#define PROPERTY_FETCHSIZE "FetchSize" -#define PROPERTY_USEBOOKMARKS "UseBookmarks" -#define PROPERTY_ISSEARCHABLE "IsSearchable" -#define PROPERTY_ISCURRENCY "IsCurrency" -#define PROPERTY_ISSIGNED "IsSigned" -#define PROPERTY_DISPLAYSIZE "DisplaySize" -#define PROPERTY_LABEL "Label" -#define PROPERTY_ISREADONLY "IsReadOnly" -#define PROPERTY_ISWRITABLE "IsWritable" -#define PROPERTY_ISDEFINITELYWRITABLE "IsDefinitelyWritable" -#define PROPERTY_VALUE "Value" -#define PROPERTY_TABLENAME "TableName" -#define PROPERTY_ISCASESENSITIVE "IsCaseSensitive" -#define PROPERTY_SERVICENAME "ServiceName" -#define PROPERTY_ISBOOKMARKABLE "IsBookmarkable" -#define PROPERTY_CANUPDATEINSERTEDROWS "CanUpdateInsertedRows" -#define PROPERTY_ISSET "IsSet" -#define PROPERTY_ISOUTPARAMETER "IsOutParameter" -#define PROPERTY_NUMBERFORMATSSUPPLIER "NumberFormatsSupplier" -#define PROPERTY_ISCALCULATED "IsCalculated" -#define PROPERTY_DATASOURCENAME "DataSourceName" -#define PROPERTY_DATABASE_LOCATION "DatabaseLocation" -#define PROPERTY_CONNECTION_RESOURCE "ConnectionResource" -#define PROPERTY_CONNECTION_INFO "ConnectionInfo" -#define PROPERTY_RESULT_SET "ResultSet" -#define PROPERTY_SELECTION "Selection" -#define PROPERTY_BOOKMARK_SELECTION "BookmarkSelection" -#define PROPERTY_COLUMN_NAME "ColumnName" -#define PROPERTY_COLUMN "Column" -#define PROPERTY_DATASOURCE "DataSource" -#define PROPERTY_TRANSACTIONISOLATION "TransactionIsolation" -#define PROPERTY_TYPEMAP "TypeMap" -#define PROPERTY_USER "User" -#define PROPERTY_PASSWORD "Password" -#define PROPERTY_COMMAND_TYPE "CommandType" -#define PROPERTY_ACTIVECOMMAND "ActiveCommand" -#define PROPERTY_ACTIVE_CONNECTION "ActiveConnection" -#define PROPERTY_FILTER "Filter" -#define PROPERTY_APPLYFILTER "ApplyFilter" -#define PROPERTY_ORDER "Order" -#define PROPERTY_APPLYORDER "ApplyOrder" -#define PROPERTY_ISMODIFIED "IsModified" -#define PROPERTY_ISNEW "IsNew" -#define PROPERTY_ROWCOUNT "RowCount" -#define PROPERTY_ISROWCOUNTFINAL "IsRowCountFinal" -#define PROPERTY_HELPFILENAME "HelpFileName" -#define PROPERTY_WIDTH "Width" -#define PROPERTY_ROW_HEIGHT "RowHeight" -#define PROPERTY_AUTOGROW "AutoGrow" -#define PROPERTY_FORMATKEY "FormatKey" -#define PROPERTY_ALIGN "Align" -#define PROPERTY_FONT "FontDescriptor" -#define PROPERTY_TEXTCOLOR "TextColor" -#define PROPERTY_BOUNDFIELD "BoundField" -#define PROPERTY_CONTROLSOURCE "DataField" -#define PROPERTY_REALNAME "RealName" -#define PROPERTY_ISHIDDEN "IsHidden" -#define PROPERTY_UPDATE_TABLENAME "UpdateTableName" -#define PROPERTY_UPDATE_SCHEMANAME "UpdateSchemaName" -#define PROPERTY_UPDATE_CATALOGNAME "UpdateCatalogName" -#define PROPERTY_RELATIVEPOSITION "RelativePosition" -#define PROPERTY_CONTROLMODEL "ControlModel" -#define PROPERTY_ISASCENDING "IsAscending" -#define PROPERTY_RELATEDCOLUMN "RelatedColumn" -#define PROPERTY_ISUNIQUE "IsUnique" -#define PROPERTY_ISPRIMARYKEYINDEX "IsPrimaryKeyIndex" -#define PROPERTY_IGNORERESULT "IgnoreResult" -#define PROPERTY_UPDATERULE "UpdateRule" -#define PROPERTY_DELETERULE "DeleteRule" -#define PROPERTY_REFERENCEDTABLE "ReferencedTable" -#define PROPERTY_REFERENCEDCOLUMN "ReferencedColumn" -#define PROPERTY_PARENTWINDOW "ParentWindow" -#define PROPERTY_SQLEXCEPTION "SQLException" -#define PROPERTY_BORDER "Border" -#define PROPERTY_THREADSAFE "ThreadSafe" -#define PROPERTY_HELPTEXT "HelpText" -#define PROPERTY_CONTROLDEFAULT "ControlDefault" -#define PROPERTY_HIDDEN "Hidden" -#define PROPERTY_DEFAULTSTATE "DefaultState" -#define PROPERTY_SUPPRESSVERSIONCL "SuppressVersionColumns" -#define PROPERTY_SHOW_BROWSER "ShowBrowser" -#define PROPERTY_ENABLE_BROWSER "EnableBrowser" -#define PROPERTY_SHOWMENU "ShowMenu" -#define PROPERTY_LAYOUTINFORMATION "LayoutInformation" -#define PROPERTY_CURRENTTABLE "CurrentTable" -#define PROPERTY_DATABASENAME "DatabaseName" -#define PROPERTY_CONTROLUSER "ControlUser" -#define PROPERTY_CONTROLPASSWORD "ControlPassword" -#define PROPERTY_CACHESIZE "CacheSize" -#define PROPERTY_TEXTLINECOLOR "TextLineColor" -#define PROPERTY_TEXTEMPHASIS "FontEmphasisMark" -#define PROPERTY_TEXTRELIEF "FontRelief" -#define PROPERTY_DEFAULTTEXT "DefaultText" -#define PROPERTY_EFFECTIVEDEFAULT "EffectiveDefault" -#define PROPERTY_AUTOINCREMENTCREATION "AutoIncrementCreation" -#define PROPERTY_BOOLEANCOMPARISONMODE "BooleanComparisonMode" -#define PROPERTY_ENABLESQL92CHECK "EnableSQL92Check" -#define PROPERTY_FONTCHARWIDTH "FontCharWidth" -#define PROPERTY_FONTCHARSET "FontCharset" -#define PROPERTY_FONTFAMILY "FontFamily" -#define PROPERTY_FONTHEIGHT "FontHeight" -#define PROPERTY_FONTKERNING "FontKerning" -#define PROPERTY_FONTNAME "FontName" -#define PROPERTY_FONTORIENTATION "FontOrientation" -#define PROPERTY_FONTPITCH "FontPitch" -#define PROPERTY_FONTSLANT "FontSlant" -#define PROPERTY_FONTSTRIKEOUT "FontStrikeout" -#define PROPERTY_FONTSTYLENAME "FontStyleName" -#define PROPERTY_FONTUNDERLINE "FontUnderline" -#define PROPERTY_FONTWEIGHT "FontWeight" -#define PROPERTY_FONTWIDTH "FontWidth" -#define PROPERTY_FONTWORDLINEMODE "FontWordLineMode" -#define PROPERTY_FONTTYPE "FontType" -#define PROPERTY_PERSISTENT_NAME "PersistentName" -#define PROPERTY_EMBEDDEDOBJECT "EmbeddedObject" -#define PROPERTY_ORIGINAL "Original" -#define PROPERTY_USECATALOGINSELECT "UseCatalogInSelect" -#define PROPERTY_USESCHEMAINSELECT "UseSchemaInSelect" -#define PROPERTY_OUTERJOINESCAPE "EnableOuterJoinEscape" -#define PROPERTY_AS_TEMPLATE "AsTemplate" -#define PROPERTY_HAVING_CLAUSE "HavingClause" -#define PROPERTY_GROUP_BY "GroupBy" -#define PROPERTY_EDIT_WIDTH "EditWidth" -#define PROPERTY_SINGLESELECTQUERYCOMPOSER "SingleSelectQueryComposer" -#define PROPERTY_CHANGE_NOTIFICATION_ENABLED "PropertyChangeNotificationEnabled" +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 -#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" -#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" -#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" -#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" -#define SERVICE_NAME_FORM "com.sun.star.sdb.Form" -#define SERVICE_NAME_FORM_COLLECTION "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" -#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 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 -#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 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 -#define INFO_POOLURL "PoolURL" -#define URL_INTERACTIVE "Interactive" +inline constexpr OUString INFO_POOLURL = u"PoolURL"_ustr; // 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" -#define URL_COMPONENT_APPLICATION ".component:DB/Application" -#define URL_COMPONENT_REPORTDESIGN ".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 -#define SERVICE_SDB_DIRECTSQLDIALOG "org.openoffice.comp.dbu.DirectSqlDialog" +inline constexpr OUString SERVICE_SDB_DIRECTSQLDIALOG + = u"org.openoffice.comp.dbu.DirectSqlDialog"_ustr; // 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 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 -#define PROPERTY_TRISTATE "TriState" -#define PROPERTY_ENABLEOUTERJOIN "EnableOuterJoinEscape" -#define PROPERTY_TABSTOP "TabStop" -#define PROPERTY_DEFAULTCONTROL "DefaultControl" -#define PROPERTY_ENABLED "Enabled" -#define PROPERTY_MOUSE_WHEEL_BEHAVIOR "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); -#define SQLSTATE_GENERAL "01000" +inline constexpr OUString SQLSTATE_GENERAL = u"01000"_ustr; -#define PROPERTY_APPLYFORMDESIGNMODE "ApplyFormDesignMode" -#define PROPERTY_IS_FORM "IsForm" -#define PROPERTY_PERSISTENT_PATH "PersistentPath" +inline constexpr OUString PROPERTY_IS_FORM(u"IsForm"_ustr); +inline constexpr OUString PROPERTY_PERSISTENT_PATH(u"PersistentPath"_ustr); -#define STR_AUTOTEXTSEPARATORLIST "\"\t34\t'\t39" - -#endif +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/inc/templwin.hrc b/dbaccess/inc/templwin.hrc index 052883d37926..2cc76e395245 100644 --- a/dbaccess/inc/templwin.hrc +++ b/dbaccess/inc/templwin.hrc @@ -22,7 +22,7 @@ #include <utility> #include <unotools/resmgr.hxx> -#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) +#define NC_(Context, String) TranslateId(Context, u8##String) #define DI_TITLE 1 #define DI_FROM 2 |