fdo#38838 Replaced some use of (Xub)String with OUString.

Change-Id: I5a8f2d1a5762c20d21d31b04778a9e2cac8df9cb
Reviewed-on: https://gerrit.libreoffice.org/2364
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

4 files changed, 12 insertions, 27 deletions

diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index a8f028fc3efe..c4342423d865 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -135,8 +135,7 @@ namespace
 
         if ( _pPortNumber )
         {
-            sNewUrl += OUString::createFromAscii(":");
-            sNewUrl += OUString::number(_pPortNumber->GetValue());
+            sNewUrl = sNewUrl + ":" + OUString::number(_pPortNumber->GetValue());
         }
 
         return sNewUrl;
@@ -472,7 +471,7 @@ sal_Bool ODbDataSourceAdministrationHelper::hasAuthentication(const SfxItemSet&
 // -----------------------------------------------------------------------------
 String ODbDataSourceAdministrationHelper::getConnectionURL() const
 {
-    String sNewUrl;
+    OUString sNewUrl;
 
     OUString eType = getDatasourceType(*m_pItemSetHelper->getOutputSet());
 
@@ -497,7 +496,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
                 OUString sNewFileName;
                 if ( ::osl::FileBase::getSystemPathFromFileURL( sFileName, sNewFileName ) == ::osl::FileBase::E_None )
                 {
-                    sNewUrl += String(sNewFileName);
+                    sNewUrl += sNewFileName;
                 }
             }
             break;
@@ -528,7 +527,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pDatabaseName, SfxStringItem, DSID_DATABASENAME, sal_True);
                 if ( pHostName && pHostName->GetValue().getLength() )
                 {
-                    sNewUrl = OUString("@") + lcl_createHostWithPort(pHostName,pPortNumber);
+                    sNewUrl = "@" + lcl_createHostWithPort(pHostName,pPortNumber);
                     OUString sDatabaseName = pDatabaseName ? pDatabaseName->GetValue() : OUString();
                     if ( !sDatabaseName.getLength() && pUrlItem )
                         sDatabaseName = pCollection->cutPrefix( pUrlItem->GetValue() );
@@ -546,8 +545,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
         case  ::dbaccess::DST_LDAP:
             {
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True);
-                sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue());
-                sNewUrl += lcl_createHostWithPort(NULL,pPortNumber);
+                sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue()) + lcl_createHostWithPort(NULL,pPortNumber);
             }
             break;
         case  ::dbaccess::DST_JDBC:
@@ -555,12 +553,8 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
         default:
             break;
     }
-    if ( sNewUrl.Len() )
-    {
-        String sUrl = pCollection->getPrefix(eType);
-        sUrl += sNewUrl;
-        sNewUrl = sUrl;
-    }
+    if ( !sNewUrl.isEmpty() )
+        sNewUrl = pCollection->getPrefix(eType) + sNewUrl;
     else
         sNewUrl = pUrlItem->GetValue();
 
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 21c5ab969a1e..9496a03807cc 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -286,16 +286,12 @@ DBG_NAME(DirectSQLDialog)
     //--------------------------------------------------------------------
     void DirectSQLDialog::addStatusText(const String& _rMessage)
     {
-        String sAppendMessage = OUString::number(m_nStatusCount++);
-        sAppendMessage += rtl::OUString(": ");
-        sAppendMessage += _rMessage;
-        sAppendMessage += rtl::OUString("\n\n");
+        OUString sAppendMessage = OUString::number(m_nStatusCount++) + ": " + _rMessage + "\n\n";
 
-        String sCompleteMessage = m_aStatus.GetText();
-        sCompleteMessage += sAppendMessage;
+        OUString sCompleteMessage = m_aStatus.GetText() + sAppendMessage;
         m_aStatus.SetText(sCompleteMessage);
 
-        m_aStatus.SetSelection(Selection(sCompleteMessage.Len(), sCompleteMessage.Len()));
+        m_aStatus.SetSelection(Selection(sCompleteMessage.getLength(), sCompleteMessage.getLength()));
     }
 
     //--------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index db886aada62b..d2e8dff532d5 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -255,11 +255,7 @@ sal_Int32 OQueryTableView::CountTableAlias(const String& rName, sal_Int32& rMax)
     OTableWindowMapIterator aIter = GetTabWinMap()->find(rName);
     while(aIter != GetTabWinMap()->end())
     {
-        String aNewName;
-        aNewName = rName;
-        aNewName += '_';
-        aNewName += OUString::number(++nRet);
-
+        OUString aNewName = OUString(rName) + "_" + OUString::number(++nRet);
         aIter = GetTabWinMap()->find(aNewName);
     }
 
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 0cc428eb55fc..be35644e2479 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -895,8 +895,7 @@ String OTableEditorCtrl::GenerateName( const String& rName )
     sal_Int32 i=1;
     while( HasFieldName(aFieldName) )
     {
-        aFieldName = aBaseName;
-        aFieldName += OUString::number(i);
+        aFieldName = aBaseName + OUString::number(i);
         i++;
     }