convert more of dbaccess from String to OUString

seemed to have missed this the first time around

Change-Id: I8b7b78c95c576b178e3e181c7589da81e5189ee3

4 files changed, 16 insertions, 16 deletions

diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
index eabdf23c9c79..a9d4bc3f1fbe 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
@@ -94,24 +94,24 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
     Rectangle aSourcePos = pTopLine->GetSourceTextPos();
     Rectangle aDestPos = pTopLine->GetDestTextPos();
 
-    String aSourceText;
-    String aDestText;
+    OUString aSourceText;
+    OUString aDestText;
 
     switch( pData->GetCardinality() )
     {
     case CARDINAL_ONE_MANY:
-        aSourceText  ='1';
-        aDestText  ='n';
+        aSourceText = "1";
+        aDestText   = "n";
         break;
 
     case CARDINAL_MANY_ONE:
-        aSourceText  ='n';
-        aDestText  ='1';
+        aSourceText = "n";
+        aDestText   = "1";
         break;
 
     case CARDINAL_ONE_ONE:
-        aSourceText  ='1';
-        aDestText  ='1';
+        aSourceText = "1";
+        aDestText   = "1";
         break;
     }
 
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 354fd56f5bc6..709500697923 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -97,7 +97,7 @@ sal_Bool ORelationTableConnectionData::DropRelation()
             {
                 OUString sName;
                 xKey->getPropertyValue(PROPERTY_NAME) >>= sName;
-                if(String(sName) == m_aConnName)
+                if(sName == m_aConnName)
                 {
                     Reference< XDrop> xDrop(xKeys,UNO_QUERY);
                     OSL_ENSURE(xDrop.is(),"can't drop key because we haven't a drop interface!");
@@ -392,7 +392,7 @@ xKey.clear();
     if ( bDropRelation )
     {
         DropRelation();
-        String sError(ModuleRes(STR_QUERY_REL_COULD_NOT_CREATE));
+        OUString sError(ModuleRes(STR_QUERY_REL_COULD_NOT_CREATE));
         ::dbtools::throwGenericSQLException(sError,NULL);
     }
 
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 2cd7d52d8e40..c718a60abf15 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -158,7 +158,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue
                 OSL_ENSURE(isEditable(),"Slot ID_BROWSER_SAVEDOC should not be enabled!");
                 if(!::dbaui::checkDataSourceAvailable(::comphelper::getString(getDataSource()->getPropertyValue(PROPERTY_NAME)), getORB()))
                 {
-                    String aMessage(ModuleRes(STR_DATASOURCE_DELETED));
+                    OUString aMessage(ModuleRes(STR_DATASOURCE_DELETED));
                     OSQLWarningBox( getView(), aMessage ).Execute();
                 }
                 else
@@ -202,8 +202,8 @@ void ORelationController::impl_initialize()
         setEditable(sal_False);
         m_bRelationsPossible    = sal_False;
         {
-            String sTitle(ModuleRes(STR_RELATIONDESIGN));
-            sTitle.Erase(0,3);
+            OUString sTitle(ModuleRes(STR_RELATIONDESIGN));
+            sTitle = sTitle.copy(3);
             OSQLMessageBox aDlg(NULL,sTitle,ModuleRes(STR_RELATIONDESIGN_NOT_AVAILABLE));
             aDlg.Execute();
         }
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index a3d870a10c38..fecd015de5fb 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -345,9 +345,9 @@ void ORelationTableView::lookForUiActivities()
 {
     if(m_pExistingConnection)
     {
-        String sTitle(ModuleRes(STR_RELATIONDESIGN));
-        sTitle.Erase(0,3);
-        OSQLMessageBox aDlg(this,ModuleRes(STR_QUERY_REL_EDIT_RELATION),String(),0);
+        OUString sTitle(ModuleRes(STR_RELATIONDESIGN));
+        sTitle = sTitle.copy(3);
+        OSQLMessageBox aDlg(this,ModuleRes(STR_QUERY_REL_EDIT_RELATION),OUString(),0);
         aDlg.SetText(sTitle);
         aDlg.RemoveButton(aDlg.GetButtonId(0));
         aDlg.AddButton( ModuleRes(STR_QUERY_REL_EDIT), RET_OK, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON);