summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/dlg')
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx6
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx4
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.cxx42
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx4
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx8
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx2
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx2
8 files changed, 35 insertions, 35 deletions
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index cda30378d4e4..a0d53c47c5d5 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -132,7 +132,7 @@ namespace
if ( _pPortNumber )
{
- sNewUrl += String::CreateFromAscii(":");
+ sNewUrl += rtl::OUString::createFromAscii(":");
sNewUrl += String::CreateFromInt32(_pPortNumber->GetValue());
}
@@ -524,7 +524,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
if ( sDatabaseName.Len() )
{
- sNewUrl += String::CreateFromAscii("/");
+ sNewUrl += rtl::OUString::createFromAscii("/");
sNewUrl += sDatabaseName;
}
}
@@ -543,7 +543,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
sDatabaseName = pCollection->cutPrefix( pUrlItem->GetValue() );
if ( sDatabaseName.Len() )
{
- sNewUrl += String::CreateFromAscii(":");
+ sNewUrl += rtl::OUString::createFromAscii(":");
sNewUrl += sDatabaseName;
}
}
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 957aa84fdfb2..a04d977daf83 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -464,9 +464,9 @@ DBG_NAME(OTextConnectionHelper)
{
String sExtension;
if (m_aRBAccessTextFiles.IsChecked())
- sExtension = String::CreateFromAscii("txt");
+ sExtension = rtl::OUString("txt");
else if (m_aRBAccessCSVFiles.IsChecked())
- sExtension = String::CreateFromAscii("csv");
+ sExtension = rtl::OUString("csv");
else
{
sExtension = m_aETOwnExtension.GetText();
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index e19f92193f0d..3f859db90954 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -169,7 +169,7 @@ namespace dbaui
m_aControlDependencies.enableOnRadioCheck( m_aNamedPipeRadio, m_aNamedPipe );
m_aControlDependencies.addController( ::svt::PDialogController(
- new TextResetOperatorController( m_aHostName, String::CreateFromAscii( "localhost" ) )
+ new TextResetOperatorController( m_aHostName, rtl::OUString("localhost") )
) );
// sockets are available on Unix systems only, named pipes only on Windows
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 1a37952256ac..7c36e19528b1 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -328,26 +328,26 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
// create and initialize the defaults
_rppDefaults = new SfxPoolItem*[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1];
SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults
- *pCounter++ = new SfxStringItem(DSID_NAME, String());
- *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, String());
- *pCounter++ = new SfxStringItem(DSID_CONNECTURL, String());
+ *pCounter++ = new SfxStringItem(DSID_NAME, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_CONNECTURL, rtl::OUString());
*pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< ::rtl::OUString >(&sFilterAll, 1));
*pCounter++ = new DbuTypeCollectionItem(DSID_TYPECOLLECTION, _pTypeCollection);
*pCounter++ = new SfxBoolItem(DSID_INVALID_SELECTION, sal_False);
*pCounter++ = new SfxBoolItem(DSID_READONLY, sal_False);
- *pCounter++ = new SfxStringItem(DSID_USER, String());
- *pCounter++ = new SfxStringItem(DSID_PASSWORD, String());
- *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, String());
- *pCounter++ = new SfxStringItem(DSID_CHARSET, String());
+ *pCounter++ = new SfxStringItem(DSID_USER, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_PASSWORD, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_CHARSET, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_PASSWORDREQUIRED, sal_False);
*pCounter++ = new SfxBoolItem(DSID_SHOWDELETEDROWS, sal_False);
*pCounter++ = new SfxBoolItem(DSID_ALLOWLONGTABLENAMES, sal_False);
- *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, String());
+ *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, rtl::OUString());
*pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, ',');
*pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, '"');
*pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, '.');
- *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, String());
- *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, String::CreateFromAscii("txt"));
+ *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, rtl::OUString("txt"));
*pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, sal_True);
*pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, sal_False);
*pCounter++ = new SfxInt32Item(DSID_CONN_PORTNUMBER, 8100);
@@ -356,16 +356,16 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
*pCounter++ = new SfxBoolItem(DSID_CONN_SHUTSERVICE, sal_False);
*pCounter++ = new SfxInt32Item(DSID_CONN_DATAINC, 20);
*pCounter++ = new SfxInt32Item(DSID_CONN_CACHESIZE, 20);
- *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, String());
- *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, String());
+ *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_USECATALOG, sal_False);
- *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, String());
- *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, String());
+ *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, rtl::OUString());
*pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, 389);
*pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, 100);
*pCounter++ = new SfxBoolItem(DSID_SQL92CHECK, sal_False);
- *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, String());
- *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, String());
+ *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_AUTORETRIEVEENABLED, sal_False);
*pCounter++ = new SfxBoolItem(DSID_APPEND_TABLE_ALIAS, sal_False);
*pCounter++ = new SfxInt32Item(DSID_MYSQL_PORTNUMBER, 3306);
@@ -377,15 +377,15 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
*pCounter++ = new SfxBoolItem(DSID_SCHEMA, sal_True);
*pCounter++ = new SfxBoolItem(DSID_INDEXAPPENDIX, sal_True);
*pCounter++ = new SfxBoolItem(DSID_CONN_LDAP_USESSL, sal_False);
- *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, String());
+ *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_DOSLINEENDS, sal_False);
- *pCounter++ = new SfxStringItem(DSID_DATABASENAME, String());
+ *pCounter++ = new SfxStringItem(DSID_DATABASENAME, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, sal_True);
*pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, sal_True);
*pCounter++ = new SfxBoolItem(DSID_IGNORECURRENCY, sal_False);
- *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, String());
+ *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, sal_True);
- *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, String());
+ *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, rtl::OUString());
*pCounter++ = new OptionalBoolItem( DSID_PRIMARY_KEY_SUPPORT );
*pCounter++ = new SfxInt32Item(DSID_MAX_ROW_SCAN, 100);
*pCounter++ = new SfxBoolItem( DSID_RESPECTRESULTSETTYPE,sal_False );
@@ -457,7 +457,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
};
OSL_ENSURE(sizeof(aItemInfos)/sizeof(aItemInfos[0]) == DSID_LAST_ITEM_ID,"Invalid Ids!");
- _rpPool = new SfxItemPool(String::CreateFromAscii("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID,
+ _rpPool = new SfxItemPool(rtl::OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID,
aItemInfos, _rppDefaults);
_rpPool->FreezeIdRanges();
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 747ac1f5f401..2d8d4b2434c9 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -360,7 +360,7 @@ void ODbaseIndexDialog::Init()
OTableInfo& rTabInfo = m_aTableInfoList.back();
// open the INF file
- aURL.setExtension(String::CreateFromAscii("inf"));
+ aURL.setExtension(rtl::OUString::createFromAscii("inf"));
OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL);
Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) );
aInfFile.SetGroup( aGroupIdent );
@@ -471,7 +471,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
}
aURL.SetSmartURL(aDsn);
aURL.Append(aTableName);
- aURL.setExtension(String::CreateFromAscii("inf"));
+ aURL.setExtension(rtl::OUString::createFromAscii("inf"));
OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL);
Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) );
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 6fdbc0567a84..5c917f424b58 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -226,7 +226,7 @@ DBG_NAME(DirectSQLDialog)
OSL_ENSURE(xStatement.is(), "DirectSQLDialog::implExecuteStatement: no statement returned by the connection!");
// clear the output box
- m_aOutput.SetText(String::CreateFromAscii(""));
+ m_aOutput.SetText(rtl::OUString());
if (xStatement.is())
{
if (::rtl::OUString(_rStatement).toAsciiUpperCase().compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT")),6)==0 && m_pShowOutput->IsChecked())
@@ -287,9 +287,9 @@ DBG_NAME(DirectSQLDialog)
void DirectSQLDialog::addStatusText(const String& _rMessage)
{
String sAppendMessage = String::CreateFromInt32(m_nStatusCount++);
- sAppendMessage += String::CreateFromAscii(": ");
+ sAppendMessage += rtl::OUString(": ");
sAppendMessage += _rMessage;
- sAppendMessage += String::CreateFromAscii("\n\n");
+ sAppendMessage += rtl::OUString("\n\n");
String sCompleteMessage = m_aStatus.GetText();
sCompleteMessage += sAppendMessage;
@@ -302,7 +302,7 @@ DBG_NAME(DirectSQLDialog)
void DirectSQLDialog::addOutputText(const String& _rMessage)
{
String sAppendMessage = _rMessage;
- sAppendMessage += String::CreateFromAscii("\n");
+ sAppendMessage += rtl::OUString("\n");
String sCompleteMessage = m_aOutput.GetText();
sCompleteMessage += sAppendMessage;
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index c87eed4fa0bd..34939b9bdeea 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -597,7 +597,7 @@ namespace dbaui
{
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- 0, ::String::CreateFromAscii("sdatabase") );
+ 0, rtl::OUString::createFromAscii("sdatabase") );
const SfxFilter* pFilter = getStandardDatabaseFilter();
if ( pFilter )
{
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 840a86ecdef7..d5f5accf545c 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -222,7 +222,7 @@ DBG_NAME(OParameterDialog)
LocalResourceAccess aDummy(DLG_PARAMETERS, RSC_MODALDIALOG);
sMessage = String(ModuleRes(STR_COULD_NOT_CONVERT_PARAM));
}
- sMessage.SearchAndReplaceAll(String::CreateFromAscii("$name$"), sName);
+ sMessage.SearchAndReplaceAll(rtl::OUString("$name$"), sName);
ErrorBox(NULL, WB_OK, sMessage).Execute();
m_aParam.GrabFocus();
return 1L;
generated by cgit (git 2.34.1) at 2024-08-13 12:31:40 +0000