diff options
Diffstat (limited to 'dbaccess/source/ui')
| -rw-r--r-- | dbaccess/source/ui/app/AppIconControl.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/ConnectionPage.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
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)); |