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>

9 files changed, 43 insertions, 78 deletions

diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index ee9028e6f31c..32222b46d5b5 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -656,12 +656,9 @@ void ScCellShell::GetState(SfxItemSet &rSet)
 
             case SID_STATUS_DOCPOS:
                 {
-                    String  aStr( ScGlobal::GetRscString( STR_TABLE ) );
-
-                    aStr += ' ';
-                    aStr += OUString::number( nTab + 1 );
-                    aStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
-                    aStr += OUString::number( nTabCount );
+                    OUString aStr = ScGlobal::GetRscString( STR_TABLE ) +
+                                    " "   + OUString::number( nTab + 1 ) +
+                                    " / " + OUString::number( nTabCount );
                     rSet.Put( SfxStringItem( nWhich, aStr ) );
                 }
                 break;
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index d6a0e81ec923..4d16931094ad 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -447,8 +447,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                         SCTAB nDummy;
                         do
                         {
-                            aName = aBaseName;
-                            aName += OUString::number( i );
+                            aName = aBaseName + OUString::number( i );
                             if (bPrefix)
                                 bValid = pDoc->ValidNewTabName( aName );
                             else
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 88fb66e636d8..5e2735554f56 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -557,10 +557,9 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord )
 //          Pivot
 //
 
-static String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber )
+static OUString lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber )
 {
-    String aName = rPrefix;
-    aName += OUString::number( nNumber );
+    OUString aName = rPrefix + OUString::number( nNumber );
     return aName;
 }
 
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 084f37db514f..f2b3ba1131ee 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1051,8 +1051,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                                 else
                                     nPageNo += ((long)nRowPos)*nColBreaks+nColPos;
 
-                                String aThisPageStr = aPageStr; // Don't modify the original string.
-                                aThisPageStr.SearchAndReplaceAscii("%1", OUString::number(nPageNo));
+                                OUString aThisPageStr = OUString(aPageStr).replaceFirst("%1", OUString::number(nPageNo));
 
                                 if ( pEditEng )
                                 {
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 033baccb84b4..b16bb417518b 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -660,15 +660,11 @@ String ScPreview::GetPosString()
         UpdateDrawView();       // The table eventually changes
     }
 
-    String aString( ScGlobal::GetRscString( STR_PAGE ) );
-    aString += ' ';
-    aString += OUString::number(nPageNo+1);
+    OUString aString = ScGlobal::GetRscString( STR_PAGE ) +
+                       " " + OUString::number(nPageNo+1);
 
     if (nTabsTested >= nTabCount)
-    {
-        aString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
-        aString += OUString::number(nTotalPages);
-    }
+        aString += " / " + OUString::number(nTotalPages);
 
     return aString;
 }
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index cc3fcc863a2a..a8537b66268d 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -445,7 +445,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
         {
             Point  aMousePos = pScroll->OutputToNormalizedScreenPixel( pScroll->GetPointerPosPixel() );
             Point  aPos      = pScroll->GetParent()->OutputToNormalizedScreenPixel( pScroll->GetPosPixel() );
-            String aHelpStr;
+            OUString aHelpStr;
             Rectangle aRect;
             sal_uInt16   nAlign;
 
@@ -456,12 +456,9 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
                 if( bIsDivide )
                     pPreview->SetPageNo( nPageNo );
 
-                aHelpStr = ScGlobal::GetRscString( STR_PAGE );
-                aHelpStr += ' ';
-                aHelpStr += OUString::number( nPageNo );
-
-                aHelpStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
-                aHelpStr += OUString::number( nTotalPages );
+                aHelpStr = ScGlobal::GetRscString( STR_PAGE ) +
+                           " " + OUString::number( nPageNo ) +
+                           " / "  + OUString::number( nTotalPages );
             }
             else if( nDelta > 0 )
             {
@@ -469,12 +466,9 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
                 if ( nTotalPages && ( nPageNo < nTotalPages || !bAllTested ) )
                     pPreview->SetPageNo( nPageNo );
 
-                aHelpStr = ScGlobal::GetRscString( STR_PAGE );
-                aHelpStr += ' ';
-                aHelpStr += OUString::number( nPageNo+1 );
-
-                aHelpStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
-                aHelpStr += OUString::number( nTotalPages );
+                aHelpStr = ScGlobal::GetRscString( STR_PAGE ) +
+                           " " + OUString::number( nPageNo+1 ) +
+                           " / "  + OUString::number( nTotalPages );
             }
 
             aRect.Left()    = aPos.X() - 8;
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 596f990981fd..0d3c92ce8613 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1102,9 +1102,8 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
             sal_uInt16 nAlign;
             if (bHoriz)
             {
-                aHelpStr = ScGlobal::GetRscString(STR_COLUMN);
-                aHelpStr += ' ';
-                aHelpStr += ScColToAlpha((SCCOL) nScrollPos);
+                aHelpStr = ScGlobal::GetRscString(STR_COLUMN) +
+                           " " + ScColToAlpha((SCCOL) nScrollPos);
 
                 aRect.Left() = aMousePos.X();
                 aRect.Top()  = aPos.Y() - 4;
@@ -1112,9 +1111,8 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
             }
             else
             {
-                aHelpStr = ScGlobal::GetRscString(STR_ROW);
-                aHelpStr += ' ';
-                aHelpStr += OUString::number(nScrollPos + 1);
+                aHelpStr = ScGlobal::GetRscString(STR_ROW) +
+                           " " + OUString::number(nScrollPos + 1);
 
                 // show quicktext always inside sheet area
                 aRect.Left() = bLayoutRTL ? (aPos.X() + aSize.Width() + 8) : (aPos.X() - 8);
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 2586b9f4b209..8d8de0fa4982 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -66,11 +66,9 @@ void ScTabView::ShowRefTip()
             SCCOL nCols = nEndX+1-nStartX;
             SCROW nRows = nEndY+1-nStartY;
 
-            String aHelp = ScGlobal::GetRscString( STR_QUICKHELP_REF );
-            aHelp.SearchAndReplace( rtl::OUString("%1"),
-                                    OUString::number(nRows) );
-            aHelp.SearchAndReplace( rtl::OUString("%2"),
-                                    OUString::number(nCols) );
+            OUString aHelp = ScGlobal::GetRscString( STR_QUICKHELP_REF );
+            aHelp = aHelp.replaceFirst("%1", OUString::number(nRows) );
+            aHelp = aHelp.replaceFirst("%2", OUString::number(nCols) );
 
             ScSplitPos eWhich = aViewData.GetActivePart();
             Window* pWin = pGridWin[eWhich];
@@ -252,7 +250,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
 
     if ( aViewData.GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() )
     {
-        String aHelpStr;
+        OUString aHelpStr;
         ScRange aMarkRange;
         aViewData.GetSimpleArea( aMarkRange );
         SCCOL nEndX = aViewData.GetRefEndX();
@@ -263,10 +261,8 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
             aHelpStr = ScGlobal::GetRscString( STR_TIP_RESIZEMATRIX );
             SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig
             SCROW nRows = nEndY + 1 - aViewData.GetRefStartY();
-            aHelpStr.SearchAndReplace( rtl::OUString("%1"),
-                                       OUString::number(nRows) );
-            aHelpStr.SearchAndReplace( rtl::OUString("%2"),
-                                       OUString::number(nCols) );
+            aHelpStr = aHelpStr.replaceFirst("%1", OUString::number(nRows) );
+            aHelpStr = aHelpStr.replaceFirst("%2", OUString::number(nCols) );
         }
         else if ( aViewData.GetDelMark( aDelRange ) )
             aHelpStr = ScGlobal::GetRscString( STR_QUICKHELP_DELETE );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 8ae56db9e2d6..746b23350fe2 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2183,21 +2183,16 @@ void ScViewData::WriteUserData(String& rData)
     //  wenn Zeilen groesser 8192, "+" statt "/"
 
     sal_uInt16 nZoom = (sal_uInt16)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator());
-    rData = OUString::number( nZoom );
-    rData += '/';
+    rData = OUString::number( nZoom ) + "/";
     nZoom = (sal_uInt16)((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator());
-    rData += OUString::number( nZoom );
-    rData += '/';
+    rData += OUString::number( nZoom ) + "/";
     if (bPagebreak)
         rData += '1';
     else
         rData += '0';
 
-    rData += ';';
-    rData += OUString::number( nTabNo );
-    rData += ';';
-    rData.AppendAscii(RTL_CONSTASCII_STRINGPARAM( TAG_TABBARWIDTH ));
-    rData += OUString::number( pView->GetTabBarWidth() );
+    rData += ";" + OUString::number( nTabNo ) + ";" + TAG_TABBARWIDTH +
+             OUString::number( pView->GetTabBarWidth() );
 
     SCTAB nTabCount = pDoc->GetTableCount();
     for (SCTAB i=0; i<nTabCount; i++)
@@ -2205,24 +2200,20 @@ void ScViewData::WriteUserData(String& rData)
         rData += ';';                   // Numerierung darf auf keinen Fall durcheinanderkommen
         if (i < static_cast<SCTAB>(maTabData.size()) && maTabData[i])
         {
-            sal_Unicode cTabSep = SC_OLD_TABSEP;                // wie 3.1
+            OUString cTabSep = OUString(SC_OLD_TABSEP);                // wie 3.1
             if ( maTabData[i]->nCurY > MAXROW_30 ||
                  maTabData[i]->nPosY[0] > MAXROW_30 || maTabData[i]->nPosY[1] > MAXROW_30 ||
                  ( maTabData[i]->eVSplitMode == SC_SPLIT_FIX &&
                     maTabData[i]->nFixPosY > MAXROW_30 ) )
             {
-                cTabSep = SC_NEW_TABSEP;        // um eine 3.1-Version nicht umzubringen
+                cTabSep = OUString(SC_NEW_TABSEP);        // um eine 3.1-Version nicht umzubringen
             }
 
 
-            rData += OUString::number( maTabData[i]->nCurX );
-            rData += cTabSep;
-            rData += OUString::number( maTabData[i]->nCurY );
-            rData += cTabSep;
-            rData += OUString::number( maTabData[i]->eHSplitMode );
-            rData += cTabSep;
-            rData += OUString::number( maTabData[i]->eVSplitMode );
-            rData += cTabSep;
+            rData += OUString::number( maTabData[i]->nCurX ) + cTabSep +
+                     OUString::number( maTabData[i]->nCurY ) + cTabSep +
+                     OUString::number( maTabData[i]->eHSplitMode ) + cTabSep +
+                     OUString::number( maTabData[i]->eVSplitMode ) + cTabSep;
             if ( maTabData[i]->eHSplitMode == SC_SPLIT_FIX )
                 rData += OUString::number( maTabData[i]->nFixPosX );
             else
@@ -2232,16 +2223,12 @@ void ScViewData::WriteUserData(String& rData)
                 rData += OUString::number( maTabData[i]->nFixPosY );
             else
                 rData += OUString::number( maTabData[i]->nVSplitPos );
-            rData += cTabSep;
-            rData += OUString::number( maTabData[i]->eWhichActive );
-            rData += cTabSep;
-            rData += OUString::number( maTabData[i]->nPosX[0] );
-            rData += cTabSep;
-            rData += OUString::number( maTabData[i]->nPosX[1] );
-            rData += cTabSep;
-            rData += OUString::number( maTabData[i]->nPosY[0] );
-            rData += cTabSep;
-            rData += OUString::number( maTabData[i]->nPosY[1] );
+            rData += cTabSep +
+                     OUString::number( maTabData[i]->eWhichActive ) + cTabSep +
+                     OUString::number( maTabData[i]->nPosX[0] ) + cTabSep +
+                     OUString::number( maTabData[i]->nPosX[1] ) + cTabSep +
+                     OUString::number( maTabData[i]->nPosY[0] ) + cTabSep +
+                     OUString::number( maTabData[i]->nPosY[1] );
         }
     }
 }