convert svx/source/fmcomp/*.cxx from String to OUString

Change-Id: Iecc2d85f55124ecb026d2b7a63586ef39160752b

4 files changed, 13 insertions, 13 deletions

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index a683bc9c74e6..ff30e5928a50 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -543,7 +543,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
 
         if (bDateNTimeCol)
         {
-            String sRealName,sPurePostfix;
+            OUString sRealName,sPurePostfix;
 
             OUString aPostfix[] = {
                 SVX_RESSTR(RID_STR_POSTFIX_DATE),
@@ -556,7 +556,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
                 sPurePostfix = comphelper::string::stripStart(sPurePostfix, '(');
                 sPurePostfix = comphelper::string::stripEnd(sPurePostfix, ')');
                 sRealName = sFieldName;
-                sRealName += '_';
+                sRealName += "_";
                 sRealName += sPurePostfix;
                 if (i)
                     xSecondCol->setPropertyValue(FM_PROP_NAME, makeAny(OUString(sRealName)));
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 32350b7c851f..94ebe2298d58 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1422,8 +1422,8 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type
                 // Strings are dealt with directly by the GetFieldText
                 case TypeClass_STRING           :
                 {
-                    String sText = aColumns[ nModelPos ]->GetCellText( xPaintRow, pGrid->getNumberFormatter() );
-                    pReturnArray[i] <<= OUString(sText);
+                    OUString sText = aColumns[ nModelPos ]->GetCellText( xPaintRow, pGrid->getNumberFormatter() );
+                    pReturnArray[i] <<= sText;
                 }
                 break;
                 // everything else is requested in the DatabaseVariant
@@ -1491,7 +1491,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE
 
         if (evt.PropertyName == FM_PROP_LABEL)
         {
-            String aName = ::comphelper::getString(evt.NewValue);
+            OUString aName = ::comphelper::getString(evt.NewValue);
             if (aName != pGrid->GetColumnTitle(nId))
                 pGrid->SetColumnTitle(nId, aName);
         }
@@ -1810,7 +1810,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep
     addColumnListeners(xSet);
 
     Reference< XPropertySet >  xNewColumn(xSet);
-    String aName = ::comphelper::getString(xNewColumn->getPropertyValue(FM_PROP_LABEL));
+    OUString aName = ::comphelper::getString(xNewColumn->getPropertyValue(FM_PROP_LABEL));
     Any aWidth = xNewColumn->getPropertyValue(FM_PROP_WIDTH);
     sal_Int32 nWidth = 0;
     if (aWidth >>= nWidth)
@@ -1854,7 +1854,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep
     removeColumnListeners(xOldColumn);
     addColumnListeners(xNewColumn);
 
-    String aName = ::comphelper::getString(xNewColumn->getPropertyValue(FM_PROP_LABEL));
+    OUString aName = ::comphelper::getString(xNewColumn->getPropertyValue(FM_PROP_LABEL));
     Any aWidth = xNewColumn->getPropertyValue(FM_PROP_WIDTH);
     sal_Int32 nWidth = 0;
     if (aWidth >>= nWidth)
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 577e3e13cee6..a7dde067640b 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2688,7 +2688,7 @@ OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColum
                 if ( aPosSeq.getLength() )
                     sText = static_cast<ListBox*>(m_pWindow)->GetEntry(aPosSeq.getConstArray()[0]);
                 else
-                    sText = String();
+                    sText = "";
             }
         }
         catch( const Exception& )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 4869e16c8ff8..b7c3edfc152f 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -651,7 +651,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
         case NavigationBar::RECORD_COUNT:
         {
             pWnd = &m_aRecordCount;
-            String aText;
+            OUString aText;
             if (bAvailable)
             {
                 if (pParent->GetOptions() & DbGridControl::OPT_INSERT)
@@ -667,15 +667,15 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
                     aText += OUString(" *");
             }
             else
-                aText = String();
+                aText = "";
 
             // add the number of selected rows, if applicable
             if (pParent->GetSelectRowCount())
             {
-                String aExtendedInfo(aText);
-                aExtendedInfo.AppendAscii(" (");
+                OUString aExtendedInfo(aText);
+                aExtendedInfo += " (";
                 aExtendedInfo += m_aAbsolute.CreateFieldText(pParent->GetSelectRowCount());
-                aExtendedInfo += ')';
+                aExtendedInfo += ")";
                 pWnd->SetText(aExtendedInfo);
             }
             else