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>

43 files changed, 183 insertions, 297 deletions

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 6c5d2fb80949..6df09af10d58 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -683,9 +683,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
     aCheckLB.SetUserData(  REPLACE_BULLETS, pUserData );
 
     nPercent = pOpt->nRightMargin;
-    sMargin = ' ';
-    sMargin += OUString::number( nPercent );
-    sMargin += '%';
+    sMargin = " " + OUString::number( nPercent ) + "%";
     pUserData = new ImpUserData(&sMargin, 0);
     aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
 
@@ -739,9 +737,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
         if(RET_OK == aDlg.Execute())
         {
             nPercent = (sal_uInt16)aDlg.GetPrcntFld().GetValue();
-            sMargin = ' ';
-            sMargin += OUString::number( nPercent );
-            sMargin += '%';
+            sMargin = " " + OUString::number( nPercent ) + "%";
         }
     }
     aCheckLB.Invalidate();
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++;
     }
 
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index c486f0d71099..e728d1968885 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -97,7 +97,7 @@ inline void SetValueProp( XubString& rStr, const sal_uInt16 nValue,
     if( 100 == nProp )
         rStr += OUString::number( nValue );
     else
-        ( rStr += OUString::number( nProp )) += sal_Unicode('%');
+        rStr += OUString::number(nProp) + "%";
 }
 
 inline void SetValueProp( XubString& rStr, const short nValue,
@@ -106,7 +106,7 @@ inline void SetValueProp( XubString& rStr, const short nValue,
     if( 100 == nProp )
         rStr += OUString::number( nValue );
     else
-        ( rStr += OUString::number( nProp )) += sal_Unicode('%');
+        rStr += OUString::number(nProp) + "%";
 }
 
 // -----------------------------------------------------------------------
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index d3e2c9746286..daaba33f2273 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -137,7 +137,7 @@ XubString GetSvxString( sal_uInt16 nId )
 
 XubString GetColorString( const Color& rCol )
 {
-    XubString sStr;
+    OUString sStr;
 
     ColorData nColData =
         RGB_COLORDATA( rCol.GetRed(), rCol.GetGreen(), rCol.GetBlue() );
@@ -158,16 +158,12 @@ XubString GetColorString( const Color& rCol )
     if ( nColor < sizeof(aColAry)/sizeof(ColorData) )
         sStr = EE_RESSTR( RID_SVXITEMS_COLOR_BEGIN + nColor + 1 );
 
-    if ( !sStr.Len() )
+    if ( sStr.isEmpty() )
     {
-        sStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "RGB" ));
-        sStr += sal_Unicode('(');
-        sStr += OUString::number( rCol.GetRed() );
-        sStr += cpDelim;
-        sStr += OUString::number( rCol.GetGreen() );
-        sStr += cpDelim;
-        sStr += OUString::number( rCol.GetBlue() );
-        sStr += sal_Unicode(')');
+        sStr += "RGB(" +
+                OUString::number( rCol.GetRed() )   + OUString(cpDelim) +
+                OUString::number( rCol.GetGreen() ) + OUString(cpDelim) +
+                OUString::number( rCol.GetBlue() )  + ")";
     }
     return sStr;
 }
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 6294aeaa5af2..e81286c8c5fb 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -715,7 +715,7 @@ void Outliner::ImplSetLevelDependendStyleSheet( sal_uInt16 nPara, SfxStyleSheet*
         DBG_ASSERT( pNewStyle, "AutoStyleSheetName - Style not found!" );
         if ( pNewStyle && ( pNewStyle != GetStyleSheet( nPara ) ) )
         {
-             SfxItemSet aOldAttrs( GetParaAttribs( nPara ) );
+            SfxItemSet aOldAttrs( GetParaAttribs( nPara ) );
             SetStyleSheet( nPara, pNewStyle );
             if ( aOldAttrs.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON )
             {
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 0d855957a9ac..ef9b490d946b 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -471,7 +471,7 @@ SfxItemPresentation ScRangeItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_COMPLETE:
-        rText = OUString(ScGlobal::GetRscString(STR_AREA)) + ": ";
+        rText = ScGlobal::GetRscString(STR_AREA) + ": ";
         /* !!! fall-through !!! */
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index e7f008c7bc87..f3001a5a6b8c 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -916,8 +916,8 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
 //                  break; // DURCHFALLEN!!!
                     case SFX_ITEM_PRESENTATION_NAMELESS:
                     {
-                        String aPages( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_PAGES ) );
-                        aPages.SearchAndReplaceAscii( "%1", OUString::number( nPagNo ) );
+                        OUString aPages( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_PAGES ) );
+                        aPages = aPages.replaceFirst( "%1", OUString::number( nPagNo ) );
                         rText += aPages;
                     }
                     break;
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index 17bb747fbcbc..dc78e3b687ca 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -50,9 +50,9 @@ const sal_uInt16 SC_DP_LEAPYEAR = 1648;     // arbitrary leap year for date calc
 
 rtl::OUString getTwoDigitString(sal_Int32 nValue)
 {
-    String aRet = OUString::number( nValue );
-    if ( aRet.Len() < 2 )
-        aRet.Insert( (sal_Unicode)'0', 0 );
+    OUString aRet = OUString::number( nValue );
+    if ( aRet.getLength() < 2 )
+        aRet = "0" + aRet;
     return aRet;
 }
 
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 3f2805fbb69b..e6f2d9ce1c74 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1728,7 +1728,7 @@ String ScDrawLayer::GetNewGraphicName( long* pnCounter ) const
     String aBase = ScGlobal::GetRscString(STR_GRAPHICNAME);
     aBase += ' ';
 
-    sal_Bool bThere = sal_True;
+    bool bThere = true;
     String aGraphicName;
     SCTAB nDummy;
     long nId = pnCounter ? *pnCounter : 0;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 8188b5deed28..22fc87cbc4ef 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -398,8 +398,7 @@ String ScGlobal::GetErrorString(sal_uInt16 nErrNumber)
         case errDivisionByZero     : nErrNumber = STR_DIV_ZERO; break;
         case errIllegalFPOperation : nErrNumber = STR_NUM_ERROR; break;
 
-        default          : sResStr = GetRscString(STR_ERROR_STR);
-                           sResStr += OUString::number( nErrNumber );
+        default          : sResStr = GetRscString(STR_ERROR_STR) + OUString::number( nErrNumber );
                            nErrNumber = 0;
                            break;
     }
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 80a3ebba5ab2..f7e7c43f85bb 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -126,22 +126,22 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16*
     return 0;
 }
 
-static String lcl_ValueString( sal_Int32 nValue, sal_uInt16 nMinDigits )
+static OUString lcl_ValueString( sal_Int32 nValue, sal_uInt16 nMinDigits )
 {
     if ( nMinDigits <= 1 )
         return OUString::number( nValue );           // simple case...
     else
     {
-        String aStr = OUString::number( Abs( nValue ) );
-        if ( aStr.Len() < nMinDigits )
+        OUString aStr = OUString::number( Abs( nValue ) );
+        if ( aStr.getLength() < nMinDigits )
         {
             OUStringBuffer aZero;
-            comphelper::string::padToLength(aZero, nMinDigits - aStr.Len(), '0');
-            aStr.Insert(aZero.makeStringAndClear(), 0);
+            comphelper::string::padToLength(aZero, nMinDigits - aStr.getLength(), '0');
+            aStr = aZero.makeStringAndClear() + aStr;
         }
         //  nMinDigits doesn't include the '-' sign -> add after inserting zeros
         if ( nValue < 0 )
-            aStr.Insert( '-', 0 );
+            aStr = "-" + aStr;
         return aStr;
     }
 }
@@ -824,7 +824,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                 // so nNextValue is now calculated ahead.
                                 sal_Int32 nNextValue = nStringValue+(sal_Int32)nDelta;
 
-                                String aStr;
+                                OUString aStr;
                                 if ( nHeadNoneTail < 0 )
                                 {
                                     aCol[nCol].Insert( static_cast<SCROW>(nRow),
@@ -834,8 +834,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                 }
                                 else
                                 {
-                                    aStr = aValue;
-                                    aStr += lcl_ValueString( nNextValue, nCellDigits );
+                                    aStr = aValue + lcl_ValueString( nNextValue, nCellDigits );
                                     aCol[nCol].Insert( static_cast<SCROW>(nRow),
                                             new ScStringCell( aStr));
                                 }
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 9da5caeff7ee..7b70845a9236 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1626,9 +1626,7 @@ lcl_r1c1_append_c ( String &r, int nCol, bool bIsAbs,
     {
         nCol -= rDetails.nCol;
         if (nCol != 0) {
-            r += '[';
-            r += OUString::number( nCol );
-            r += ']';
+            r += "[" + OUString::number( nCol ) + "]";
         }
     }
 }
@@ -1645,9 +1643,7 @@ lcl_r1c1_append_r ( String &r, int nRow, bool bIsAbs,
     {
         nRow -= rDetails.nRow;
         if (nRow != 0) {
-            r += '[';
-            r += OUString::number( nRow );
-            r += ']';
+            r += "[" + OUString::number( nRow ) + "]";
         }
     }
 }
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ba18b3aa88a0..ef7b7ed079a1 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1454,11 +1454,7 @@ r1c1_add_col( rtl::OUStringBuffer &rBuf, const ScSingleRefData& rRef )
     if( rRef.IsColRel() )
     {
         if (rRef.nRelCol != 0)
-        {
-            rBuf.append( sal_Unicode( '[' ) );
-            rBuf.append( OUString::number( rRef.nRelCol ) );
-            rBuf.append( sal_Unicode( ']' ) );
-        }
+            rBuf.append("[").append( OUString::number( rRef.nRelCol ) ).append("]");
     }
     else
         rBuf.append( OUString::number( rRef.nCol + 1 ) );
@@ -1471,9 +1467,7 @@ r1c1_add_row( rtl::OUStringBuffer &rBuf, const ScSingleRefData& rRef )
     {
         if (rRef.nRelRow != 0)
         {
-            rBuf.append( sal_Unicode( '[' ) );
-            rBuf.append( OUString::number( rRef.nRelRow ) );
-            rBuf.append( sal_Unicode( ']' ) );
+            rBuf.append("[").append( OUString::number( rRef.nRelRow ) ).append("]");
         }
     }
     else
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index abd325868e17..34718089d894 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -81,8 +81,7 @@ using namespace oox;
 
 static String lcl_GetVbaTabName( SCTAB n )
 {
-    String  aRet( RTL_CONSTASCII_USTRINGPARAM( "__VBA__" ) );
-    aRet += OUString::number( static_cast<sal_uInt16>(n) );
+    OUString aRet = "__VBA__"  + OUString::number( static_cast<sal_uInt16>(n) );
     return aRet;
 }
 
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index 293a2c8e9d1c..d1a330be96ff 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -140,16 +140,12 @@ sal_uInt16 ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
 
 String ShrfmlaBuffer::CreateName( const ScRange& r )
 {
-    String          aName( RTL_CONSTASCII_USTRINGPARAM( SHRFMLA_BASENAME ) );
-    aName += OUString::number( r.aStart.Col() );
-    aName.Append( '_' );
-    aName += OUString::number( r.aStart.Row() );
-    aName.Append( '_' );
-    aName += OUString::number( r.aEnd.Col() );
-    aName.Append( '_' );
-    aName += OUString::number( r.aEnd.Row() );
-    aName.Append( '_' );
-    aName += OUString::number( r.aStart.Tab() );
+    OUString aName = SHRFMLA_BASENAME +
+                     OUString::number( r.aStart.Col() ) + "_" +
+                     OUString::number( r.aStart.Row() ) + "_" +
+                     OUString::number( r.aEnd.Col() )   + "_" +
+                     OUString::number( r.aEnd.Row() )   + "_" +
+                     OUString::number( r.aStart.Tab() );
 
     return aName;
 }
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index be9f26818928..5b88cecd237e 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -304,8 +304,8 @@ const String& ScfTools::GetHTMLNamePrefix()
 
 String ScfTools::GetNameFromHTMLIndex( sal_uInt32 nIndex )
 {
-    String aName( GetHTMLIndexPrefix() );
-    aName += OUString::number( static_cast< sal_Int32 >( nIndex ) );
+    OUString aName = GetHTMLIndexPrefix() +
+                     OUString::number( static_cast< sal_Int32 >( nIndex ) );
     return aName;
 }
 
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index d5bcd41360fa..fbadc83613cc 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -636,9 +636,9 @@ void ScHTMLExport::WriteBody()
 void ScHTMLExport::WriteTables()
 {
     const SCTAB nTabCount = pDoc->GetTableCount();
-    const String    aStrTable( ScResId( SCSTR_TABLE ) );
+    const OUString  aStrTable( ScResId( SCSTR_TABLE ) );
     rtl::OUString   aStr;
-    String          aStrOut;
+    OUString        aStrOut;
     SCCOL           nStartCol;
     SCROW           nStartRow;
     SCTAB           nStartTab;
@@ -677,10 +677,7 @@ void ScHTMLExport::WriteTables()
 
             if ( nUsedTables > 1 )
             {
-                aStrOut  = aStrTable;
-                aStrOut.AppendAscii( " " );
-                aStrOut += OUString::number( nTableStrNum++ );
-                aStrOut.AppendAscii( ": " );
+                aStrOut = aStrTable + " "  + OUString::number( nTableStrNum++ ) + ": ";
 
                 OUT_HR();
 
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 1f6a96921bb7..26811c3a84d7 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -379,10 +379,7 @@ static void lcl_ChangeColor( sal_uInt16 nIndex, Color& rColor )
 
 static String lcl_MakeOldPageStyleFormatName( sal_uInt16 i )
 {
-    String  aName = ScGlobal::GetRscString( STR_PAGESTYLE );
-    aName.AppendAscii( " " );
-    aName += OUString::number( i + 1 );
-
+    OUString  aName = ScGlobal::GetRscString( STR_PAGESTYLE ) + " " + OUString::number( i + 1 );
     return aName;
 }
 
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 8c44c5a0ddc6..281fa8670050 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -213,9 +213,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
             OSL_FAIL(aError.getStr());
 #endif
 
-            String sErr( OUString::number( r.LineNumber ));
-            sErr += ',';
-            sErr += OUString::number( r.ColumnNumber );
+            String sErr = OUString::number( r.LineNumber ) +
+                          "," +
+                          OUString::number( r.ColumnNumber );
 
             if( !sDocName.isEmpty() )
             {
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 4700ecb573bb..a7f9db8d2d90 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -309,40 +309,35 @@ void ScAsciiOptions::ReadFromString( const String& rString )
 
 String ScAsciiOptions::WriteToString() const
 {
-    String aOutStr;
+    OUString aOutStr;
 
         //
         //  Feld-Trenner
         //
 
     if ( bFixedLen )
-        aOutStr.AppendAscii(pStrFix);
+        aOutStr += pStrFix;
     else if ( !aFieldSeps.Len() )
-        aOutStr += '0';
+        aOutStr += "0";
     else
     {
         xub_StrLen nLen = aFieldSeps.Len();
         for (xub_StrLen i=0; i<nLen; i++)
         {
             if (i)
-                aOutStr += '/';
+                aOutStr += "/";
             aOutStr += OUString::number(aFieldSeps.GetChar(i));
         }
         if ( bMergeFieldSeps )
         {
-            aOutStr += '/';
-            aOutStr.AppendAscii(pStrMrg);
+            aOutStr += "/";
+            aOutStr += pStrMrg;
         }
     }
 
-    aOutStr += ',';                 // Token-Ende
-
-        //
-        //  Text-Trenner
-        //
-
-    aOutStr += OUString::number(cTextSep);
-    aOutStr += ',';                 // Token-Ende
+    aOutStr += "," +
+               // Text-Trenner
+               OUString::number(cTextSep) + ",";
 
         //
         //  Zeichensatz
@@ -352,14 +347,9 @@ String ScAsciiOptions::WriteToString() const
         aOutStr += ScGlobal::GetCharsetString( RTL_TEXTENCODING_DONTKNOW );
     else
         aOutStr += ScGlobal::GetCharsetString( eCharSet );
-    aOutStr += ',';                 // Token-Ende
-
-        //
-        //  Startzeile
-        //
-
-    aOutStr += OUString::number(nStartRow);
-    aOutStr += ',';                 // Token-Ende
+    aOutStr += "," +
+               // Startzeile
+               OUString::number(nStartRow) + ",";
 
         //
         //  Spalten-Infos
@@ -369,27 +359,22 @@ String ScAsciiOptions::WriteToString() const
     for (sal_uInt16 nInfo=0; nInfo<nInfoCount; nInfo++)
     {
         if (nInfo)
-            aOutStr += '/';
-        aOutStr += OUString::number(pColStart[nInfo]);
-        aOutStr += '/';
-        aOutStr += OUString::number(pColFormat[nInfo]);
+            aOutStr += "/";
+        aOutStr += OUString::number(pColStart[nInfo]) +
+                   "/" +
+                   OUString::number(pColFormat[nInfo]);
     }
 
     // #i112025# the options string is used in macros and linked sheets,
     // so new options must be added at the end, to remain compatible
 
-    aOutStr += ',';
-
-    // Language
-    aOutStr += OUString::number(eLang);
-    aOutStr += ',';
-
-    // Import quoted field as text.
-    aOutStr += bQuotedFieldAsText ? rtl::OUString("true") : rtl::OUString("false");
-    aOutStr += ',';
-
-    // Detect special nubmers.
-    aOutStr += bDetectSpecialNumber ? rtl::OUString("true") : rtl::OUString("false");
+    aOutStr += "," +
+               // Language
+               OUString::number(eLang) + "," +
+               // Import quoted field as text.
+               OUString::boolean( bQuotedFieldAsText ) + ",";
+               // Detect special numbers.
+               OUString::boolean( bDetectSpecialNumber );
 
     // 9th token is used for "Save as shown" in export options
     // 10th token is used for "Save cell formulas" in export options
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index ffd05389b491..a077eb7efde5 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -70,16 +70,16 @@ static void load_FixedWidthList(ScCsvSplits &aSplits)
 }
 static void save_FixedWidthList(ScCsvSplits aSplits)
 {
-    String sSplits;
+    OUStringBuffer sSplits;
     // Create a semi-colon separated string to save the splits
     sal_uInt32 n = aSplits.Count();
     for (sal_uInt32 i = 0; i < n; ++i)
     {
-        sSplits.Append( OUString::number( aSplits[i] ) );
-        sSplits.Append((char)';');
+        sSplits.append( OUString::number( aSplits[i] ) );
+        sSplits.append(";");
     }
 
-    OUString sFixedWidthLists = OUString( sSplits );
+    OUString sFixedWidthLists = sSplits.makeStringAndClear();
     Sequence<Any> aValues;
     Any *pProperties;
     Sequence<OUString> aNames(1);
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 8860d6ddc2c7..f1dc8de134c2 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -79,23 +79,20 @@ ScImportOptions::ScImportOptions( const String& rStr )
 
 String ScImportOptions::BuildString() const
 {
-    String  aResult;
+    OUString aResult;
 
     if( bFixedWidth )
-        aResult.AppendAscii( pStrFix );
+        aResult += pStrFix;
     else
         aResult += OUString::number(nFieldSepCode);
-    aResult += ',';
-    aResult += OUString::number(nTextSepCode);
-    aResult += ',';
-    aResult += aStrFont;
-                                                            // use the same string format as ScAsciiOptions:
-    aResult.AppendAscii( ",1,,0," );                        // first row, no column info, default language
-    aResult.AppendAscii(bQuoteAllText ? "true" : "false");  // same as "quoted field as text" in ScAsciiOptions
-    aResult.AppendAscii( ",true," );                        // "detect special numbers"
-    aResult.AppendAscii(bSaveAsShown ? "true" : "false");   // "save as shown": not in ScAsciiOptions
-    aResult.AppendAscii( "," );
-    aResult.AppendAscii(bSaveFormulas ? "true" : "false");  // "save formulas": not in ScAsciiOptions
+    aResult += "," + OUString::number(nTextSepCode) + "," + aStrFont +
+                                                 // use the same string format as ScAsciiOptions:
+            ",1,,0," +                           // first row, no column info, default language
+            OUString::boolean( bQuoteAllText ) + // same as "quoted field as text" in ScAsciiOptions
+            ",true," +                           // "detect special numbers"
+            OUString::boolean( bSaveAsShown ) +  // "save as shown": not in ScAsciiOptions
+            "," +
+            OUString::boolean( bSaveFormulas );  // "save formulas": not in ScAsciiOptions
 
     return aResult;
 }
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx
index 944ff4220f09..18026e316389 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -90,8 +90,8 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber )
     ScSortKeyItem* pSortKeyItem = new ScSortKeyItem(m_pBox);
 
     // Set Sort key number
-    String aLine = pSortKeyItem->m_pFlSort->GetText();
-    aLine += OUString::number( nItemNumber );
+    OUString aLine = pSortKeyItem->m_pFlSort->GetText() +
+                     OUString::number( nItemNumber );
     pSortKeyItem->m_pFlSort->SetText( aLine );
 
     mrSortKeyItems.push_back(pSortKeyItem);
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index cc474931cbeb..82687c8458c1 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -383,33 +383,32 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet
         vector<long> aScales(nColCount, -1);
         for (i=0; i<nColCount; i++)
         {
-            String aHeader = xMeta->getColumnLabel( i+1 );
+            OUString aHeader = xMeta->getColumnLabel( i+1 );
 
             switch ( pTypeArr[i] )
             {
                 case sdbc::DataType::BIT:
-                    aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",L" ));
+                    aHeader += ",L";
                     break;
                 case sdbc::DataType::DATE:
-                    aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",D" ));
+                    aHeader += ",D";
                     break;
                 case sdbc::DataType::LONGVARCHAR:
-                    aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",M" ));
+                    aHeader += ",M";
                     break;
                 case sdbc::DataType::VARCHAR:
-                    aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",C," ));
-                    aHeader += OUString::number( xMeta->getColumnDisplaySize( i+1 ) );
+                    aHeader += ",C," + OUString::number( xMeta->getColumnDisplaySize( i+1 ) );
                     break;
                 case sdbc::DataType::DECIMAL:
                     {
                         long nPrec = xMeta->getPrecision( i+1 );
                         long nScale = xMeta->getScale( i+1 );
-                        aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",N," ));
-                        aHeader += OUString::number(
-                                    SvDbaseConverter::ConvertPrecisionToDbase(
-                                        nPrec, nScale ) );
-                        aHeader += ',';
-                        aHeader += OUString::number( nScale );
+                        aHeader += ",N," +
+                                    OUString::number(
+                                        SvDbaseConverter::ConvertPrecisionToDbase(
+                                            nPrec, nScale ) ) +
+                                    "," +
+                                    OUString::number( nScale );
                         aScales[i] = nScale;
                     }
                     break;
@@ -732,30 +731,27 @@ void lcl_GetColumnTypes(
         }
         if ( bUpdateTitles )
         {   // Angabe anpassen und ausgeben
-            String aOutString = aFieldName;
+            OUString aOutString = aFieldName;
             switch ( nDbType )
             {
                 case sdbc::DataType::BIT :
-                    aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",L" ));
+                    aOutString += ",L";
                     break;
                 case sdbc::DataType::DATE :
-                    aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",D" ));
+                    aOutString += ",D";
                     break;
                 case sdbc::DataType::LONGVARCHAR :
-                    aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",M" ));
+                    aOutString += ",M";
                     break;
                 case sdbc::DataType::VARCHAR :
-                    aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",C," ));
-                    aOutString += OUString::number( nFieldLen );
+                    aOutString += ",C," + OUString::number( nFieldLen );
                     break;
                 case sdbc::DataType::DECIMAL :
-                    aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",N," ));
-                    aOutString += OUString::number( nFieldLen );
-                    aOutString += ',';
-                    aOutString += OUString::number( nPrecision );
+                    aOutString += ",N,"  + OUString::number( nFieldLen ) +
+                                  "," + OUString::number( nPrecision );
                     break;
             }
-            if ( !aOutString.EqualsIgnoreCaseAscii( aString ) )
+            if ( !aOutString.equalsIgnoreAsciiCase( aString ) )
             {
                 pDoc->SetString( nCol, nFirstRow, nTab, aOutString );
                 rDocShell.PostPaint( nCol, nFirstRow, nTab, nCol, nFirstRow, nTab, PAINT_GRID );
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 1dd0fe09acd1..13776b6ec488 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -1103,11 +1103,9 @@ void ScFunctionDockWin::FillInfo(SfxChildWinInfo& rInfo) const
 {
     SfxDockingWindow::FillInfo(rInfo);
     Point aPoint=aPrivatSplit.GetPosPixel();
-    rInfo.aExtraString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "ScFuncList:(" ));
-    rInfo.aExtraString += OUString::number(aPoint.Y());
-    rInfo.aExtraString += ';';
-    rInfo.aExtraString += OUString::number(aCatBox.GetSelectEntryPos());
-    rInfo.aExtraString += ')';
+    rInfo.aExtraString += "ScFuncList:(" +
+                          OUString::number(aPoint.Y()) + ";" +
+                          OUString::number(aCatBox.GetSelectEntryPos()) + ")";
 }
 
 void ScFunctionDockWin::UseSplitterInitPos()
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index b6bbbe2803ab..dbe35264d898 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -69,10 +69,8 @@ void ScSolverProgressDialog::HideTimeLimit()
 
 void ScSolverProgressDialog::SetTimeLimit( sal_Int32 nSeconds )
 {
-    String aOld = maFtTime.GetText();
-    String aNew = aOld.GetToken(0,'#');
-    aNew += OUString::number( nSeconds );
-    aNew += aOld.GetToken(1,'#');
+    OUString aOld = maFtTime.GetText();
+    OUString aNew = aOld.getToken(0,'#') + OUString::number( nSeconds ) + aOld.getToken(1,'#');
     maFtTime.SetText( aNew );
 }
 
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index e87d467bd19c..efb2abbcaa11 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -124,7 +124,7 @@ void ScShareDocumentDlg::UpdateView()
                 {
                     if ( pUsersData[i].getLength() > SHARED_EDITTIME_ID )
                     {
-                        String aUser;
+                        OUString aUser;
                         if ( !pUsersData[i][SHARED_OOOUSERNAME_ID].isEmpty() )
                         {
                             aUser = pUsersData[i][SHARED_OOOUSERNAME_ID];
@@ -135,9 +135,7 @@ void ScShareDocumentDlg::UpdateView()
                         }
                         else
                         {
-                            aUser = maStrUnkownUser;
-                            aUser += ' ';
-                            aUser += OUString::number( nUnknownUser++ );
+                            aUser = OUString(maStrUnkownUser) + " " + OUString::number( nUnknownUser++ );
                         }
 
                         // parse the edit time string of the format "DD.MM.YYYY hh:mm"
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 4653c359e823..d74d32decda1 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -504,27 +504,26 @@ void ScContentTree::Command( const CommandEvent& rCEvt )
 
 void ScContentTree::RequestHelp( const HelpEvent& rHEvt )
 {
-    sal_Bool bDone = false;
+    bool bDone = false;
     if( rHEvt.GetMode() & HELPMODE_QUICK )
     {
         Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() ));
         SvTreeListEntry* pEntry = GetEntry( aPos );
         if ( pEntry )
         {
-            sal_Bool bRet = false;
-            String aHelpText;
+            bool bRet = false;
+            OUString aHelpText;
             SvTreeListEntry* pParent = GetParent(pEntry);
             if ( !pParent )                                 // Top-Level ?
             {
-                aHelpText = OUString::number( GetChildCount(pEntry) );
-                aHelpText += ' ';
-                aHelpText += GetEntryText(pEntry);
-                bRet = sal_True;
+                aHelpText = OUString::number( GetChildCount(pEntry) ) +
+                            " " + GetEntryText(pEntry);
+                bRet = true;
             }
             else if ( pParent == pRootNodes[SC_CONTENT_NOTE] )
             {
                 aHelpText = GetEntryText(pEntry);           // Notizen als Help-Text
-                bRet = sal_True;
+                bRet = true;
             }
             else if ( pParent == pRootNodes[SC_CONTENT_AREALINK] )
             {
@@ -535,7 +534,7 @@ void ScContentTree::RequestHelp( const HelpEvent& rHEvt )
                     if (pLink)
                     {
                         aHelpText = pLink->GetFile();           // Source-Datei als Help-Text
-                        bRet = sal_True;
+                        bRet = true;
                     }
                 }
             }
@@ -553,7 +552,7 @@ void ScContentTree::RequestHelp( const HelpEvent& rHEvt )
 
                     Rectangle aItemRect( aPos, aSize );
                     Help::ShowQuickHelp( this, aItemRect, aHelpText );
-                    bDone = sal_True;
+                    bDone = true;
                 }
             }
         }
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index edd3e41f894b..7c41141da0e6 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3187,9 +3187,8 @@ public:
             {
                 if (meOrigin != chart2::data::LabelOrigin_LONG_SIDE)
                 {
-                    String aString = ScGlobal::GetRscString(STR_ROW);
-                    aString += ' ';
-                    aString += OUString::number( nRow+1 );
+                    OUString aString = ScGlobal::GetRscString(STR_ROW) +
+                                       " " + OUString::number( nRow+1 );
                     pArr[mnCount] = aString;
                 }
                 else //only indices for categories
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 09af947ab0fb..e7f36f843808 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -112,14 +112,13 @@ static void getNewSpreadsheetName (rtl::OUString &aNewName, rtl::OUString aOldNa
 {
     if (!xSpreadDoc.is())
         throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface  >(), 1 );
-    static rtl::OUString aUnderScre( RTL_CONSTASCII_USTRINGPARAM( "_" ) );
+    static OUString aUnderScore( "_" );
     int currentNum =2;
-    aNewName = aOldName + aUnderScre+ OUString::number(currentNum) ;
+    aNewName = aOldName + aUnderScore + OUString::number(currentNum) ;
     SCTAB nTab = 0;
     while ( ScVbaWorksheets::nameExists(xSpreadDoc,aNewName, nTab ) )
     {
-        aNewName = aOldName + aUnderScre +
-        OUString::number(++currentNum) ;
+        aNewName = aOldName + aUnderScore + OUString::number(++currentNum);
     }
 }
 
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 707c1bc54860..a2d3524159fa 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -273,13 +273,11 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
     uno::Any result;
     for (SCTAB i=0; i < nNewSheets; i++, nSheetName++)
     {
-        String aStringName = aStringBase;
-        aStringName += OUString::number(nSheetName);
+        OUString aStringName = aStringBase + OUString::number(nSheetName);
         while (m_xNameAccess->hasByName(aStringName))
         {
             nSheetName++;
-            aStringName = aStringBase;
-            aStringName += OUString::number(nSheetName);
+            aStringName = aStringBase + OUString::number(nSheetName);
         }
         m_xSheets->insertNewByName(aStringName, nSheetIndex + i);
         result = getItemByStringIndex( aStringName );
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] );
         }
     }
 }