dbaccess/inc/bitmaps.hlst | 8 ++++----
dbaccess/inc/helpids.h | 8 +++-----
dbaccess/inc/strings.hxx | 9 ---------
dbaccess/source/ui/app/AppIconControl.cxx | 4 ++--
dbaccess/source/ui/dlg/ConnectionPage.cxx | 2 +-
5 files changed, 10 insertions(+), 21 deletions(-)
New commits:
commit 6a1686ba9e51027463733086a62ded7b0641f61a
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Dec 3 14:39:49 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Dec 4 18:27:18 2021 +0100
use more OUStringLiteral in dbaccess
and remove some dead defines
Change-Id: I432cfbac954ae6798813ca5a31684e66f772acb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126313
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 640dbee00c2c..15352b63b524 100644
--- a/dbaccess/inc/bitmaps.hlst
+++ b/dbaccess/inc/bitmaps.hlst
@@ -10,10 +10,10 @@
#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"
+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";
diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h
index c8cc9dfb27bb..87077eb318c4 100644
--- a/dbaccess/inc/helpids.h
+++ b/dbaccess/inc/helpids.h
@@ -40,7 +40,6 @@ inline constexpr OStringLiteral HID_QRYDGN_ROW_ALIAS =
"DBACCESS_HID_QRYDGN_ROW_
inline constexpr OStringLiteral HID_QRYDGN_ROW_CRIT =
"DBACCESS_HID_QRYDGN_ROW_CRIT";
inline constexpr OStringLiteral HID_TAB_DESIGN_FIELDCONTROL =
"DBACCESS_HID_TAB_DESIGN_FIELDCONTROL";
-#define HID_TABLE_DESIGN_HELP_WINDOW
"DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW"
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";
@@ -48,7 +47,6 @@ inline constexpr OStringLiteral HID_TABDESIGN_NAMECELL =
"DBACCESS_HID_TABDESIGN
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"
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";
@@ -62,7 +60,7 @@ inline constexpr OStringLiteral HID_TAB_ENT_NUMTYP =
"DBACCESS_HID_TAB_ENT_NUMTY
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"
+inline constexpr OStringLiteral HID_RELATIONDIALOG_LEFTFIELDCELL =
"DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL";
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";
@@ -76,8 +74,8 @@ inline constexpr OStringLiteral HID_TAB_AUTOINCREMENTVALUE =
"DBACCESS_HID_TAB_A
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"
+inline constexpr OStringLiteral HID_DSADMIN_MYSQL_ODBC_DATASOURCE =
"DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE";
+inline constexpr OStringLiteral HID_DSADMIN_ODBC_DATASOURCE =
"DBACCESS_HID_DSADMIN_ODBC_DATASOURCE";
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";
diff --git a/dbaccess/inc/strings.hxx b/dbaccess/inc/strings.hxx
index c3ce05ca1c55..95a7a0fa4a89 100644
--- a/dbaccess/inc/strings.hxx
+++ b/dbaccess/inc/strings.hxx
@@ -176,7 +176,6 @@ 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"
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";
@@ -199,19 +198,13 @@ inline constexpr OUStringLiteral
SERVICE_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"
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"
inline constexpr OUStringLiteral SERVICE_SDB_DOCUMENTDEFINITION
= u"com.sun.star.sdb.DocumentDefinition";
-#define SERVICE_NAME_FORM "com.sun.star.sdb.Form"
inline constexpr OUStringLiteral SERVICE_NAME_FORM_COLLECTION =
u"com.sun.star.sdb.Forms";
-#define SERVICE_NAME_REPORT "com.sun.star.sdb.Report"
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"
inline constexpr OUStringLiteral SERVICE_NAME_SINGLESELECTQUERYCOMPOSER
= u"com.sun.star.sdb.SingleSelectQueryComposer";
inline constexpr OUStringLiteral SERVICE_SDB_APPLICATIONCONTROLLER
@@ -246,7 +239,6 @@ inline constexpr OUStringLiteral INFO_ESCAPE_DATETIME =
u"EscapeDateTime";
// other
inline constexpr OUStringLiteral INFO_POOLURL = u"PoolURL";
-#define URL_INTERACTIVE "Interactive"
// URLs
@@ -257,7 +249,6 @@ inline constexpr OUStringLiteral URL_COMPONENT_FORMGRIDVIEW
= u".component:DB/Fo
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
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx
b/dbaccess/source/ui/app/AppIconControl.cxx
index ff9e35ab9cd3..1448c401584c 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -73,7 +73,7 @@ void OApplicationIconControl::Fill()
{
TranslateId pLabelResId;
ElementType eType;
- const char* aImageResId;
+ rtl::OUStringConstExpr aImageResId;
} aCategories[] = { { RID_STR_TABLES_CONTAINER, E_TABLE,
BMP_TABLEFOLDER_TREE_L },
{ RID_STR_QUERIES_CONTAINER, E_QUERY,
BMP_QUERYFOLDER_TREE_L },
{ RID_STR_FORMS_CONTAINER, E_FORM,
BMP_FORMFOLDER_TREE_L },
@@ -85,7 +85,7 @@ void OApplicationIconControl::Fill()
std::unique_ptr<ThumbnailViewItem> xItem(
new ThumbnailViewItem(*this, aCategorie.eType + 1));
xItem->mbBorder = false;
- xItem->maPreview1 =
BitmapEx(OUString::createFromAscii(aCategorie.aImageResId));
+ xItem->maPreview1 = BitmapEx(aCategorie.aImageResId);
const Size& rSize = xItem->maPreview1.GetSizePixel();
m_nMaxWidth = std::max(m_nMaxWidth, rSize.Width());
m_nMaxHeight = std::max(m_nMaxHeight, rSize.Height());
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 1450ece5b454..5b2fed5c26de 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -127,7 +127,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 ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE :
HID_DSADMIN_ODBC_DATASOURCE);
+ m_xConnectionURL->set_help_id( eType ==
::dbaccess::DST_MYSQL_ODBC ? OString(HID_DSADMIN_MYSQL_ODBC_DATASOURCE) :
OString(HID_DSADMIN_ODBC_DATASOURCE));
break;
case ::dbaccess::DST_LDAP:
m_xFT_Connection->set_label(DBA_RES(STR_HOSTNAME));
