convert sc/source/ui/dbgui/*.cxx from String to OUString

Change-Id: Iba489d8301f8885dee919e5a433281ce3761988f

15 files changed, 144 insertions, 148 deletions

diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index ba7ee4ab45c3..076b8f84cbab 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -179,20 +179,20 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
     return false;
 }
 
-static OUString lcl_decodeSepString( const String & rSepNums, bool & o_bMergeFieldSeps )
+static OUString lcl_decodeSepString( const OUString & rSepNums, bool & o_bMergeFieldSeps )
 {
-    String aFieldSeps;
+    OUString aFieldSeps;
     xub_StrLen nSub = comphelper::string::getTokenCount( rSepNums, '/');
     for (xub_StrLen i=0; i<nSub; ++i)
     {
-        String aCode = rSepNums.GetToken( i, '/' );
-        if ( aCode.EqualsAscii(pStrMrg) )
+        OUString aCode = rSepNums.getToken( i, '/' );
+        if ( aCode.equalsAscii(pStrMrg) )
             o_bMergeFieldSeps = true;
         else
         {
-            sal_Int32 nVal = aCode.ToInt32();
+            sal_Int32 nVal = aCode.toInt32();
             if ( nVal )
-                aFieldSeps += (sal_Unicode) nVal;
+                aFieldSeps += OUString((sal_Unicode) nVal);
         }
     }
     return aFieldSeps;
@@ -204,7 +204,7 @@ static OUString lcl_decodeSepString( const String & rSepNums, bool & o_bMergeFie
 void ScAsciiOptions::ReadFromString( const OUString& rString )
 {
     xub_StrLen nCount = comphelper::string::getTokenCount(rString, ',');
-    String aToken;
+    OUString aToken;
 
     // Field separator.
     if ( nCount >= 1 )
@@ -212,7 +212,7 @@ void ScAsciiOptions::ReadFromString( const OUString& rString )
         bFixedLen = bMergeFieldSeps = false;
 
         aToken = rString.getToken(0,',');
-        if ( aToken.EqualsAscii(pStrFix) )
+        if ( aToken.equalsAscii(pStrFix) )
             bFixedLen = true;
         aFieldSeps = lcl_decodeSepString( aToken, bMergeFieldSeps);
     }
@@ -221,7 +221,7 @@ void ScAsciiOptions::ReadFromString( const OUString& rString )
     if ( nCount >= 2 )
     {
         aToken = rString.getToken(1,',');
-        sal_Int32 nVal = aToken.ToInt32();
+        sal_Int32 nVal = aToken.toInt32();
         cTextSep = (sal_Unicode) nVal;
     }
 
@@ -236,7 +236,7 @@ void ScAsciiOptions::ReadFromString( const OUString& rString )
     if ( nCount >= 4 )
     {
         aToken = rString.getToken(3,',');
-        nStartRow = aToken.ToInt32();
+        nStartRow = aToken.toInt32();
     }
 
     // Column info.
@@ -254,8 +254,8 @@ void ScAsciiOptions::ReadFromString( const OUString& rString )
             pColFormat = new sal_uInt8[nInfoCount];
             for (sal_uInt16 nInfo=0; nInfo<nInfoCount; nInfo++)
             {
-                pColStart[nInfo]  = (sal_Int32) aToken.GetToken( 2*nInfo, '/' ).ToInt32();
-                pColFormat[nInfo] = (sal_uInt8) aToken.GetToken( 2*nInfo+1, '/' ).ToInt32();
+                pColStart[nInfo]  = (sal_Int32) aToken.getToken( 2*nInfo, '/' ).toInt32();
+                pColFormat[nInfo] = (sal_uInt8) aToken.getToken( 2*nInfo+1, '/' ).toInt32();
             }
         }
         else
@@ -269,21 +269,21 @@ void ScAsciiOptions::ReadFromString( const OUString& rString )
     if (nCount >= 6)
     {
         aToken = rString.getToken(5, ',');
-        eLang = static_cast<LanguageType>(aToken.ToInt32());
+        eLang = static_cast<LanguageType>(aToken.toInt32());
     }
 
     // Import quoted field as text.
     if (nCount >= 7)
     {
         aToken = rString.getToken(6, ',');
-        bQuotedFieldAsText = aToken.EqualsAscii("true") ? true : false;
+        bQuotedFieldAsText = aToken.equalsAscii("true") ? true : false;
     }
 
     // Detect special numbers.
     if (nCount >= 8)
     {
         aToken = rString.getToken(7, ',');
-        bDetectSpecialNumber = aToken.EqualsAscii("true") ? true : false;
+        bDetectSpecialNumber = aToken.equalsAscii("true") ? true : false;
     }
     else
         bDetectSpecialNumber = true;    // default of versions that didn't add the parameter
@@ -362,22 +362,22 @@ OUString ScAsciiOptions::WriteToString() const
 sal_Unicode ScAsciiOptions::GetWeightedFieldSep( const OUString & rFieldSeps, bool bDecodeNumbers )
 {
     bool bMergeFieldSeps = false;
-    String aFieldSeps( bDecodeNumbers ? lcl_decodeSepString( rFieldSeps, bMergeFieldSeps) : rFieldSeps);
-    if (aFieldSeps.Len() <= 1)
-        return aFieldSeps.GetChar(0);
+    OUString aFieldSeps( bDecodeNumbers ? lcl_decodeSepString( rFieldSeps, bMergeFieldSeps) : rFieldSeps);
+    if (aFieldSeps.getLength() <= 1)
+        return aFieldSeps[0];
     else
     {
         // There can be only one separator for output. See also fdo#53449
-        if (aFieldSeps.Search(',') != STRING_NOTFOUND)
+        if (aFieldSeps.indexOf(',') != -1)
             return ',';
-        else if (aFieldSeps.Search('\t') != STRING_NOTFOUND)
+        else if (aFieldSeps.indexOf('\t') != -1)
             return '\t';
-        else if (aFieldSeps.Search(';') != STRING_NOTFOUND)
+        else if (aFieldSeps.indexOf(';') != -1)
             return ';';
-        else if (aFieldSeps.Search(' ') != STRING_NOTFOUND)
+        else if (aFieldSeps.indexOf(' ') != -1)
             return ' ';
         else
-            return aFieldSeps.GetChar(0);
+            return aFieldSeps[0];
     }
 }
 
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 569f94b0766c..cc0001c24810 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -47,16 +47,16 @@ public:
     ScAreaData()  {}
     ~ScAreaData() {}
 
-    void Set( const String& rName, const String& rArea, sal_Bool bDb )
+    void Set( const OUString& rName, const OUString& rArea, sal_Bool bDb )
                 {
                     aStrName  = rName;
                     aStrArea  = rArea;
                     bIsDbArea = bDb;
                 }
 
-    String  aStrName;
-    String  aStrArea;
-    sal_Bool    bIsDbArea;
+    OUString  aStrName;
+    OUString  aStrArea;
+    sal_Bool  bIsDbArea;
 };
 
 
@@ -126,7 +126,7 @@ void ScConsolidateDlg::Init()
 {
     OSL_ENSURE( pViewData && pDoc && pRangeUtil, "Error in Ctor" );
 
-    String aStr;
+    OUString aStr;
     sal_uInt16 i=0;
 
     pRbDataArea->SetReferences(this, pEdDataArea);
@@ -214,7 +214,7 @@ void ScConsolidateDlg::Init()
         ScAreaNameIterator aIter( pDoc );
         while ( aIter.Next( aStrName, aRange ) )
         {
-            String aStrArea(aRange.Format(SCA_ABS_3D, pDoc, eConv));
+            OUString aStrArea(aRange.Format(SCA_ABS_3D, pDoc, eConv));
             pAreaData[nAt++].Set( aStrName, aStrArea, aIter.WasDBName() );
         }
     }
@@ -243,7 +243,7 @@ void ScConsolidateDlg::FillAreaLists()
     if ( pRangeUtil && pAreaData && (nAreaDataCount > 0) )
     {
         for ( size_t i=0;
-              (i<nAreaDataCount) && (pAreaData[i].aStrName.Len()>0);
+              (i<nAreaDataCount) && (!pAreaData[i].aStrName.isEmpty());
               i++ )
         {
             pLbDataArea->InsertEntry( pAreaData[i].aStrName, i+1 );
@@ -267,7 +267,7 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
         if ( rRef.aStart != rRef.aEnd )
             RefInputStart( pRefInputEdit );
 
-        String      aStr;
+        OUString      aStr;
         sal_uInt16      nFmt = SCR_ABS_3D;       //!!! nCurTab fehlt noch
         const formula::FormulaGrammar::AddressConvention eConv = pDocP->GetAddressConvention();
 
@@ -389,7 +389,7 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl)
     {
         ScRefAddress aDestAddress;
         SCTAB       nTab = pViewData->GetTabNo();
-        String      aDestPosStr( pEdDestArea->GetText() );
+        OUString    aDestPosStr( pEdDestArea->GetText() );
         const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
 
         if ( pRangeUtil->IsAbsPos( aDestPosStr, pDoc, nTab, NULL, &aDestAddress, eConv ) )
@@ -451,7 +451,7 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
     {
         if ( !pEdDataArea->GetText().isEmpty() )
         {
-            String      aNewEntry( pEdDataArea->GetText() );
+            OUString    aNewEntry( pEdDataArea->GetText() );
             ScArea**    ppAreas = NULL;
             sal_uInt16      nAreaCount = 0;
             const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
@@ -464,7 +464,7 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
 
                 for ( sal_uInt16 i=0; i<nAreaCount; i++ )
                 {
-                    String aNewArea;
+                    OUString aNewArea;
 
                     if ( ppAreas[i] )
                     {
@@ -485,7 +485,7 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
             }
             else if ( VerifyEdit( pEdDataArea ) )
             {
-                String aNewArea( pEdDataArea->GetText() );
+                OUString aNewArea( pEdDataArea->GetText() );
 
                 if ( pLbConsAreas->GetEntryPos( aNewArea ) == LISTBOX_ENTRY_NOTFOUND )
                     pLbConsAreas->InsertEntry( aNewArea );
@@ -560,8 +560,8 @@ IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd )
 {
     if ( pEd == pEdDataArea )
     {
-        String aAreaStr( pEd->GetText() );
-        if ( aAreaStr.Len() > 0 )
+        OUString aAreaStr( pEd->GetText() );
+        if ( !aAreaStr.isEmpty() )
         {
             pBtnAdd->Enable();
         }
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 42e09d8b93d6..2fdf462d6e19 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1063,9 +1063,9 @@ void ScCsvGrid::ImplDrawColumnHeader( OutputDevice& rOutDev, sal_uInt32 nColInde
 
 void ScCsvGrid::ImplDrawCellText( const Point& rPos, const OUString& rText )
 {
-    String aPlainText( rText );
-    aPlainText.SearchAndReplaceAll( '\t', ' ' );
-    aPlainText.SearchAndReplaceAll( '\n', ' ' );
+    OUString aPlainText( rText );
+    aPlainText = aPlainText.replaceAll( "\t", " " );
+    aPlainText = aPlainText.replaceAll( "\n", " " );
     mpEditEngine->SetPaperSize( maEdEngSize );
 
     /*  #i60296# If string contains mixed script types, the space character
@@ -1076,8 +1076,8 @@ void ScCsvGrid::ImplDrawCellText( const Point& rPos, const OUString& rText )
     for( xub_StrLen nToken = 0; nToken < nTokenCount; ++nToken )
     {
         sal_Int32 nBeginIx = nCharIxInt;
-        String aToken = aPlainText.GetToken( 0, ' ', nCharIxInt );
-        if( aToken.Len() > 0 )
+        OUString aToken = aPlainText.getToken( 0, ' ', nCharIxInt );
+        if( !aToken.isEmpty() )
         {
             sal_Int32 nX = rPos.X() + GetCharWidth() * nBeginIx;
             mpEditEngine->SetText( aToken );
@@ -1160,7 +1160,7 @@ void ScCsvGrid::ImplDrawColumnBackgr( sal_uInt32 nColIndex )
         StringVec& rStrVec = maTexts[ nLine ];
         if( (nColIndex < rStrVec.size()) && (rStrVec[ nColIndex ].getLength() > nStrPos) )
         {
-            String aText( rStrVec[ nColIndex ], nStrPos, nStrLen );
+            OUString aText = rStrVec[ nColIndex ].copy( nStrPos, nStrLen );
             ImplDrawCellText( Point( nStrX, GetY( GetFirstVisLine() + nLine ) ), aText );
         }
     }
@@ -1190,7 +1190,7 @@ void ScCsvGrid::ImplDrawRowHeaders()
     sal_Int32 nLastLine = GetLastVisLine();
     for( sal_Int32 nLine = GetFirstVisLine(); nLine <= nLastLine; ++nLine )
     {
-        String aText( OUString::number( nLine + 1 ) );
+        OUString aText( OUString::number( nLine + 1 ) );
         sal_Int32 nX = GetHdrX() + (GetHdrWidth() - maBackgrDev.GetTextWidth( aText )) / 2;
         maBackgrDev.DrawText( Point( nX, GetY( nLine ) ), aText );
     }
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 7267a41a8050..3ea0d517fc18 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -41,7 +41,7 @@ using namespace com::sun::star::uno;
 
 static void load_FixedWidthList(ScCsvSplits &aSplits)
 {
-    String sSplits;
+    OUString sSplits;
     OUString sFixedWidthLists;
 
     Sequence<Any>aValues;
@@ -59,12 +59,12 @@ static void load_FixedWidthList(ScCsvSplits &aSplits)
         aSplits.Clear();
         pProperties[0] >>= sFixedWidthLists;
 
-        sSplits = String( sFixedWidthLists );
+        sSplits = sFixedWidthLists;
 
         // String ends with a semi-colon so there is no 'int' after the last one.
         xub_StrLen n = comphelper::string::getTokenCount(sSplits, ';') - 1;
         for (xub_StrLen i = 0; i < n; ++i)
-            aSplits.Insert( sSplits.GetToken(i).ToInt32() );
+            aSplits.Insert( sSplits.getToken(i, ';').toInt32() );
     }
 }
 static void save_FixedWidthList(ScCsvSplits aSplits)
@@ -590,7 +590,7 @@ void ScCsvRuler::ImplDrawBackgrDev()
     maBackgrDev.SetTextFillColor();
     for( nPos = ((nFirstPos + 9) / 10) * 10; nPos <= nLastPos; nPos += 10 )
     {
-        String aText( OUString::number( nPos ) );
+        OUString aText( OUString::number( nPos ) );
         sal_Int32 nTextWidth = maBackgrDev.GetTextWidth( aText );
         sal_Int32 nTextX = GetX( nPos ) - nTextWidth / 2;
         ImplDrawArea( nTextX - 1, nTextWidth + 2 );
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 3e15e44ce149..fe5fff628a5a 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -83,7 +83,7 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) :
         const OUString* pArray = aNames.getConstArray();
         for (long nPos = 0; nPos < nCount; nPos++)
         {
-            String aName = pArray[nPos];
+            OUString aName = pArray[nPos];
             aLbDatabase.InsertEntry( aName );
         }
     }
@@ -134,8 +134,8 @@ void ScDataPilotDatabaseDlg::FillObjects()
 {
     aCbObject.Clear();
 
-    String aDatabaseName = aLbDatabase.GetSelectEntry();
-    if (!aDatabaseName.Len())
+    OUString aDatabaseName = aLbDatabase.GetSelectEntry();
+    if (aDatabaseName.isEmpty())
         return;
 
     sal_uInt16 nSelect = aLbType.GetSelectEntryPos();
@@ -192,7 +192,7 @@ void ScDataPilotDatabaseDlg::FillObjects()
         const OUString* pArray = aNames.getConstArray();
         for( long nPos=0; nPos<nCount; nPos++ )
         {
-            String aName = pArray[nPos];
+            OUString aName = pArray[nPos];
             aCbObject.InsertEntry( aName );
         }
     }
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 22ed0fc76b6e..495ea0df0829 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -126,7 +126,7 @@ ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent,
     const OUString* pArray = rServices.getConstArray();
     for (long i=0; i<nCount; i++)
     {
-        String aName = pArray[i];
+        OUString aName = pArray[i];
         aLbService.InsertEntry( aName );
     }
     aLbService.SelectEntryPos( 0 );
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 12c7f8ac682e..b732f65d9ba2 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -67,7 +67,7 @@ private:
     CheckBox&   rBtnFormat;
     CheckBox&   rBtnStrip;
     ScRange&    rCurArea;
-    String      aStr;
+    OUString    aStr;
     ScRange     aArea;
     sal_Bool        bHeader:1;
     sal_Bool        bSize:1;
@@ -182,7 +182,7 @@ void ScDbNameDlg::Init()
     m_pEdAssign->SetModifyHdl  ( LINK( this, ScDbNameDlg, AssModifyHdl ) );
     UpdateNames();
 
-    String  theAreaStr;
+    OUString  theAreaStr;
 
     if ( pViewData && pDoc )
     {
@@ -413,16 +413,16 @@ IMPL_LINK_NOARG_INLINE_END(ScDbNameDlg, CancelBtnHdl)
 
 IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl)
 {
-    String  aNewName = comphelper::string::strip(m_pEdName->GetText(), ' ');
-    String  aNewArea = m_pEdAssign->GetText();
+    OUString  aNewName = comphelper::string::strip(m_pEdName->GetText(), ' ');
+    OUString  aNewArea = m_pEdAssign->GetText();
 
-    if ( aNewName.Len() > 0 && aNewArea.Len() > 0 )
+    if ( !aNewName.isEmpty() > 0 && !aNewArea.isEmpty() )
     {
-        if ( ScRangeData::IsNameValid( aNewName, pDoc ) && !aNewName.EqualsAscii(STR_DB_LOCAL_NONAME) )
+        if ( ScRangeData::IsNameValid( aNewName, pDoc ) && !aNewName.equalsAscii(STR_DB_LOCAL_NONAME) )
         {
             //  weil jetzt editiert werden kann, muss erst geparst werden
             ScRange aTmpRange;
-            String aText = m_pEdAssign->GetText();
+            OUString aText = m_pEdAssign->GetText();
             if ( aTmpRange.ParseAny( aText, pDoc, aAddrDetails ) & SCA_VALID )
             {
                 theCurArea = aTmpRange;
@@ -516,12 +516,12 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl)
 
     if (itr != rDBs.end())
     {
-        String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY );
+        OUString aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY );
 
         OUStringBuffer aBuf;
-        aBuf.append(aStrDelMsg.GetToken(0, '#'));
+        aBuf.append(aStrDelMsg.getToken(0, '#'));
         aBuf.append(aStrEntry);
-        aBuf.append(aStrDelMsg.GetToken(1, '#'));
+        aBuf.append(aStrDelMsg.getToken(1, '#'));
         QueryBox aBox(this, WinBits(WB_YES_NO|WB_DEF_YES), aBuf.makeStringAndClear());
 
         if (RET_YES == aBox.Execute())
@@ -631,7 +631,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl)
     //  hier parsen fuer Save() etc.
 
     ScRange aTmpRange;
-    String aText = m_pEdAssign->GetText();
+    OUString aText = m_pEdAssign->GetText();
     if ( aTmpRange.ParseAny( aText, pDoc, aAddrDetails ) & SCA_VALID )
         theCurArea = aTmpRange;
 
diff --git a/sc/source/ui/dbgui/expftext.cxx b/sc/source/ui/dbgui/expftext.cxx
index cd15cb0864a2..95017bfd9d1e 100644
--- a/sc/source/ui/dbgui/expftext.cxx
+++ b/sc/source/ui/dbgui/expftext.cxx
@@ -59,7 +59,7 @@ ScExpandedFixedText::ScExpandedFixedText( Window* pParent,
 
 void ScExpandedFixedText::RequestHelp(const HelpEvent& rEvt)
 {
-    String  aTxtStr = GetText();
+    OUString  aTxtStr = GetText();
     long    nTxtWidth = GetTextWidth(aTxtStr);
     if ( ( rEvt.GetMode() & HELPMODE_QUICK ) == HELPMODE_QUICK &&
          nTxtWidth > GetSizePixel().Width())
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 3db8470bf34f..00b4f6af2298 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -436,7 +436,7 @@ void ScDPFieldControlBase::MouseMove( const MouseEvent& rMEvt )
     {
         Point aPos = OutputToScreenPixel( rMEvt.GetPosPixel() );
         Rectangle   aRect( aPos, GetSizePixel() );
-        String aHelpText = GetFieldText(nIndex);
+        OUString aHelpText = GetFieldText(nIndex);
         Help::ShowQuickHelp( this, aRect, aHelpText );
     }
 }
@@ -584,7 +584,7 @@ void ScDPFieldControlBase::DrawBackground( OutputDevice& rDev )
     sal_Int32 nStringIx = 0;
     for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
     {
-        String aLine( GetText().getToken( 0, '\n', nStringIx ) );
+        OUString aLine( GetText().getToken( 0, '\n', nStringIx ) );
         Point aLinePos( (aSize.Width() - rDev.GetCtrlTextWidth( aLine )) / 2, nY );
         rDev.DrawCtrlText( aLinePos, aLine );
         nY += rDev.GetTextHeight();
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 978e8403241f..7e49508a8271 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -126,7 +126,7 @@ void ScFilterOptionsMgr::Init()
             sal_uInt16 nInsert = pLbCopyArea->InsertEntry( aName );
 
             OUString aRefStr(aRange.aStart.Format(SCA_ABS_3D, pDoc, eConv));
-            pLbCopyArea->SetEntryData( nInsert, new String( aRefStr ) );
+            pLbCopyArea->SetEntryData( nInsert, new OUString( aRefStr ) );
         }
 
         pBtnDestPers->Check( sal_True );         // beim Aufruf immer an
@@ -208,11 +208,11 @@ void ScFilterOptionsMgr::Init()
 
 sal_Bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const
 {
-    String aPosStr( rPosStr );
-    xub_StrLen nColonPos = aPosStr.Search( ':' );
+    OUString aPosStr( rPosStr );
+    sal_Int32 nColonPos = aPosStr.indexOf( ':' );
 
-    if ( STRING_NOTFOUND != nColonPos )
-        aPosStr.Erase( nColonPos );
+    if ( -1 != nColonPos )
+        aPosStr = aPosStr.copy( 0, nColonPos );
 
     sal_uInt16 nResult = ScAddress().Parse( aPosStr, pDoc, pDoc->GetAddressConvention() );
 
@@ -228,7 +228,7 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb )
 {
     if ( pLb == pLbCopyArea )
     {
-        String aString;
+        OUString aString;
         sal_uInt16 nSelPos = pLbCopyArea->GetSelectEntryPos();
 
         if ( nSelPos > 0 )
@@ -247,19 +247,19 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd )
 {
     if ( pEd == pEdCopyArea )
     {
-        String  theCurPosStr = pEd->GetText();
+        OUString  theCurPosStr = pEd->GetText();
         sal_uInt16  nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
 
         if ( SCA_VALID == (nResult & SCA_VALID) )
         {
-            String* pStr    = NULL;
+            OUString* pStr    = NULL;
             sal_Bool    bFound  = false;
             sal_uInt16  i       = 0;
             sal_uInt16  nCount  = pLbCopyArea->GetEntryCount();
 
             for ( i=2; i<nCount && !bFound; i++ )
             {
-                pStr = (String*)pLbCopyArea->GetEntryData( i );
+                pStr = (OUString*)pLbCopyArea->GetEntryData( i );
                 bFound = (theCurPosStr == *pStr);
             }
 
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 0034688f8bed..b1705dae3141 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -824,7 +824,7 @@ OUString ScDPShowDetailDlg::GetDimensionName() const
 {
     // Look up the internal dimension name which may be different from the
     // displayed field name.
-    String aSelectedName = maLbDims.GetSelectEntry();
+    OUString aSelectedName = maLbDims.GetSelectEntry();
     DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName);
     if (itr == maNameIndexMap.end())
         // This should never happen!
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 4a7a9d00efa7..787f9607fdaf 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -59,46 +59,46 @@ using namespace com::sun::star::uno;
 
 // ============================================================================
 
-static void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect )
+static void lcl_FillCombo( ComboBox& rCombo, const OUString& rList, sal_Unicode cSelect )
 {
     xub_StrLen i;
     xub_StrLen nCount = comphelper::string::getTokenCount(rList, '\t');
     for ( i=0; i<nCount; i+=2 )
-        rCombo.InsertEntry( rList.GetToken(i,'\t') );
+        rCombo.InsertEntry( rList.getToken(i,'\t') );
 
     if ( cSelect )
     {
-        String aStr;
+        OUString aStr;
         for ( i=0; i<nCount; i+=2 )
-            if ( (sal_Unicode)rList.GetToken(i+1,'\t').ToInt32() == cSelect )
-                aStr = rList.GetToken(i,'\t');
-        if (!aStr.Len())
-            aStr = cSelect;         // Ascii
+            if ( (sal_Unicode)rList.getToken(i+1,'\t').toInt32() == cSelect )
+                aStr = rList.getToken(i,'\t');
+        if (aStr.isEmpty())
+            aStr = OUString(cSelect);         // Ascii
 
         rCombo.SetText(aStr);
     }
 }
 
-static sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList )
+static sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const OUString& rList )
 {
     sal_Unicode c = 0;
-    String aStr = rCombo.GetText();
-    if ( aStr.Len() )
+    OUString aStr = rCombo.GetText();
+    if ( !aStr.isEmpty() )
     {
         xub_StrLen nCount = comphelper::string::getTokenCount(rList, '\t');
         for ( xub_StrLen i=0; i<nCount; i+=2 )
         {
-            if ( ScGlobal::GetpTransliteration()->isEqual( aStr, rList.GetToken(i,'\t') ) )
-                c = (sal_Unicode)rList.GetToken(i+1,'\t').ToInt32();
+            if ( ScGlobal::GetpTransliteration()->isEqual( aStr, rList.getToken(i,'\t') ) )
+                c = (sal_Unicode)rList.getToken(i+1,'\t').toInt32();
         }
-        if (!c && aStr.Len())
+        if (!c && !aStr.isEmpty())
         {
-            sal_Unicode cFirst = aStr.GetChar( 0 );
+            sal_Unicode cFirst = aStr[0];
             // #i24235# first try the first character of the string directly
-            if( (aStr.Len() == 1) || (cFirst < '0') || (cFirst > '9') )
+            if( (aStr.getLength() == 1) || (cFirst < '0') || (cFirst > '9') )
                 c = cFirst;
             else    // keep old behaviour for compatibility (i.e. "39" -> "'")
-                c = (sal_Unicode) aStr.ToInt32();       // Ascii
+                c = (sal_Unicode) aStr.toInt32();       // Ascii
         }
     }
     return c;
@@ -176,7 +176,7 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato
 }
 
 static void save_Separators(
-    String maSeparators, String maTxtSep, bool bMergeDelimiters, bool bQuotedAsText,
+    OUString maSeparators, OUString maTxtSep, bool bMergeDelimiters, bool bQuotedAsText,
     bool bDetectSpecialNum, bool bFixedWidth, sal_Int32 nFromRow,
     sal_Int32 nCharSet, sal_Int32 nLanguage, ScImportAsciiCall eCall )
 {
@@ -275,16 +275,14 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName,
     get(pLbType, "columntype");
     get(mpTableBox, "scrolledwindowcolumntype");
 
-    String aName = GetText();
+    OUString aName = GetText();
     switch (meCall)
     {
         case SC_TEXTTOCOLUMNS:
             SetText( get<FixedText>("textalttitle")->GetText() );
             break;
         case SC_IMPORTFILE:
-            aName.AppendAscii(RTL_CONSTASCII_STRINGPARAM(" - ["));
-            aName += aDatName;
-            aName += ']';
+            aName += " - [" + aDatName + "]";
         default:
             SetText( aName );
     }
@@ -302,7 +300,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName,
     load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters,
                          bQuotedFieldAsText, bDetectSpecialNum, bFixedWidth, nFromRow, nCharSet, nLanguage, meCall);
     // load from saved settings
-    maFieldSeparators = String(sFieldSeparators);
+    maFieldSeparators = OUString(sFieldSeparators);
 
     if( bMergeDelimiters )
         pCkbAsOnce->Check();
@@ -658,7 +656,7 @@ IMPL_LINK( ScImportAsciiDlg, SeparatorHdl, Control*, pCtrl )
     else if( pCtrl == pEdOther )
         pCkbOther->Check( !pEdOther->GetText().isEmpty() );
 
-    String aOldFldSeps( maFieldSeparators);
+    OUString aOldFldSeps( maFieldSeparators);
     maFieldSeparators = GetSeparators();
     sal_Unicode cOldSep = mcTextSep;
     mcTextSep = lcl_CharFromCombo( *pCbTextSep, aTextSepList );
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 1670ca267ca8..1c63b1b0329a 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -36,21 +36,21 @@
 class ScDelimiterTable
 {
 public:
-        ScDelimiterTable( const String& rDelTab )
+        ScDelimiterTable( const OUString& rDelTab )
             :   theDelTab ( rDelTab ),
                 cSep      ( '\t' ),
                 nCount    ( comphelper::string::getTokenCount(rDelTab, '\t') ),
                 nIter     ( 0 )
             {}
 
-    sal_uInt16  GetCode( const String& rDelimiter ) const;
-    String  GetDelimiter( sal_Unicode nCode ) const;
+    sal_uInt16  GetCode( const OUString& rDelimiter ) const;
+    OUString  GetDelimiter( sal_Unicode nCode ) const;
 
-    String  FirstDel()  { nIter = 0; return theDelTab.GetToken( nIter, cSep ); }
-    String  NextDel()   { nIter +=2; return theDelTab.GetToken( nIter, cSep ); }
+    OUString  FirstDel()  { nIter = 0; return theDelTab.getToken( nIter, cSep ); }
+    OUString  NextDel()   { nIter +=2; return theDelTab.getToken( nIter, cSep ); }
 
 private:
-    const String        theDelTab;
+    const OUString      theDelTab;
     const sal_Unicode   cSep;
     const xub_StrLen    nCount;
     xub_StrLen          nIter;
@@ -58,7 +58,7 @@ private:
 
 //------------------------------------------------------------------------
 
-sal_uInt16 ScDelimiterTable::GetCode( const String& rDel ) const
+sal_uInt16 ScDelimiterTable::GetCode( const OUString& rDel ) const
 {
     sal_Unicode nCode = 0;
 
@@ -67,9 +67,9 @@ sal_uInt16 ScDelimiterTable::GetCode( const String& rDel ) const
         xub_StrLen i = 0;
         while ( i<nCount )
         {
-            if ( rDel == theDelTab.GetToken( i, cSep ) )
+            if ( rDel == theDelTab.getToken( i, cSep ) )
             {
-                nCode = (sal_Unicode) theDelTab.GetToken( i+1, cSep ).ToInt32();
+                nCode = (sal_Unicode) theDelTab.getToken( i+1, cSep ).toInt32();
                 i     = nCount;
             }
             else
@@ -82,18 +82,18 @@ sal_uInt16 ScDelimiterTable::GetCode( const String& rDel ) const
 
 //------------------------------------------------------------------------
 
-String ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const
+OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const
 {
-    String aStrDel;
+    OUString aStrDel;
 
     if ( nCount >= 2 )
     {
         xub_StrLen i = 0;
         while ( i<nCount )
         {
-            if ( nCode == (sal_Unicode) theDelTab.GetToken( i+1, cSep ).ToInt32() )
+            if ( nCode == (sal_Unicode) theDelTab.getToken( i+1, cSep ).toInt32() )
             {
-                aStrDel = theDelTab.GetToken( i, cSep );
+                aStrDel = theDelTab.getToken( i, cSep );
                 i       = nCount;
             }
             else
@@ -139,12 +139,12 @@ ScImportOptionsDlg::ScImportOptionsDlg(
 
     // im Ctor-Initializer nicht moeglich (MSC kann das nicht):
     pFieldSepTab = new ScDelimiterTable( sFieldSep );
-    pTextSepTab  = new ScDelimiterTable( String(ScResId(SCSTR_TEXTSEP)) );
+    pTextSepTab  = new ScDelimiterTable( OUString(ScResId(SCSTR_TEXTSEP)) );
 
-    String aStr = pFieldSepTab->FirstDel();
+    OUString aStr = pFieldSepTab->FirstDel();
     sal_Unicode nCode;
 
-    while ( aStr.Len() > 0 )
+    while ( !aStr.isEmpty() )
     {
         aEdFieldSep.InsertEntry( aStr );
         aStr = pFieldSepTab->NextDel();
@@ -152,7 +152,7 @@ ScImportOptionsDlg::ScImportOptionsDlg(
 
     aStr = pTextSepTab->FirstDel();
 
-    while ( aStr.Len() > 0 )
+    while ( !aStr.isEmpty() )
     {
         aEdTextSep.InsertEntry( aStr );
         aStr = pTextSepTab->NextDel();
@@ -184,7 +184,7 @@ ScImportOptionsDlg::ScImportOptionsDlg(
             nCode = pOptions->nFieldSepCode;
             aStr  = pFieldSepTab->GetDelimiter( nCode );
 
-            if ( !aStr.Len() )
+            if ( aStr.isEmpty() )
                 aEdFieldSep.SetText( OUString((sal_Unicode)nCode) );
             else
                 aEdFieldSep.SetText( aStr );
@@ -192,7 +192,7 @@ ScImportOptionsDlg::ScImportOptionsDlg(
             nCode = pOptions->nTextSepCode;
             aStr  = pTextSepTab->GetDelimiter( nCode );
 
-            if ( !aStr.Len() )
+            if ( aStr.isEmpty() )
                 aEdTextSep.SetText( OUString((sal_Unicode)nCode) );
             else
                 aEdTextSep.SetText( aStr );
@@ -278,7 +278,7 @@ void ScImportOptionsDlg::GetImportOptions( ScImportOptions& rOptions ) const
 sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
 {
     ScDelimiterTable* pTab;
-    String  aStr( rEd.GetText() );
+    OUString  aStr( rEd.GetText() );
     sal_uInt16  nCode;
 
     if ( &rEd == &aEdTextSep )
@@ -286,7 +286,7 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
     else
         pTab = pFieldSepTab;
 
-    if ( !aStr.Len() )
+    if ( aStr.isEmpty() )
     {
         nCode = 0;          // kein Trennzeichen
     }
@@ -295,7 +295,7 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
         nCode = pTab->GetCode( aStr );
 
         if ( nCode == 0 )
-            nCode = (sal_uInt16)aStr.GetChar(0);
+            nCode = (sal_uInt16)aStr[0];
     }
 
     return nCode;
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 793691e39fff..5dc381a86c16 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -109,7 +109,7 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg()
     sal_uInt16 i;
 
     for ( i=1; i<nEntries; i++ )
-        delete (String*)pLbFilterArea->GetEntryData( i );
+        delete (OUString*)pLbFilterArea->GetEntryData( i );
 
     delete pOptionsMgr;
 
@@ -159,7 +159,7 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
                 nInsert = pLbFilterArea->InsertEntry(itr->second->GetName());
                 OUString aSymbol;
                 itr->second->GetSymbol(aSymbol);
-                pLbFilterArea->SetEntryData(nInsert, new String(aSymbol));
+                pLbFilterArea->SetEntryData(nInsert, new OUString(aSymbol));
             }
         }
 
@@ -295,8 +295,8 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
 
     if ( (pBtn == pBtnOk) && pDoc && pViewData )
     {
-        String          theCopyStr( pEdCopyArea->GetText() );
-        String          theAreaStr( pEdFilterArea->GetText() );
+        OUString          theCopyStr( pEdCopyArea->GetText() );
+        OUString          theAreaStr( pEdFilterArea->GetText() );
         ScQueryParam    theOutParam( theQueryData );
         ScAddress       theAdrCopy;
         sal_Bool            bEditInputOk    = true;
@@ -306,10 +306,10 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
 
         if ( pBtnCopyResult->IsChecked() )
         {
-            xub_StrLen nColonPos = theCopyStr.Search( ':' );
+            sal_Int32 nColonPos = theCopyStr.indexOf( ':' );
 
-            if ( STRING_NOTFOUND != nColonPos )
-                theCopyStr.Erase( nColonPos );
+            if ( -1 != nColonPos )
+                theCopyStr = theCopyStr.copy( 0, nColonPos );
 
             sal_uInt16 nResult = theAdrCopy.Parse( theCopyStr, pDoc, eConv );
 
@@ -443,11 +443,11 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb )
 {
     if ( pLb == pLbFilterArea )
     {
-        String  aString;
+        OUString  aString;
         sal_uInt16  nSelPos = pLbFilterArea->GetSelectEntryPos();
 
         if ( nSelPos > 0 )
-            aString = *(String*)pLbFilterArea->GetEntryData( nSelPos );
+            aString = *(OUString*)pLbFilterArea->GetEntryData( nSelPos );
 
         pEdFilterArea->SetText( aString );
     }
@@ -464,19 +464,19 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd )
     {
         if ( pDoc && pViewData )
         {
-            String  theCurAreaStr = pEd->GetText();
+            OUString  theCurAreaStr = pEd->GetText();
             sal_uInt16  nResult = ScRange().Parse( theCurAreaStr, pDoc );
 
             if ( SCA_VALID == (nResult & SCA_VALID) )
             {
-                String* pStr    = NULL;
+                OUString* pStr    = NULL;
                 sal_Bool    bFound  = false;
                 sal_uInt16  i       = 0;
                 sal_uInt16  nCount  = pLbFilterArea->GetEntryCount();
 
                 for ( i=1; i<nCount && !bFound; i++ )
                 {
-                    pStr = (String*)pLbFilterArea->GetEntryData( i );
+                    pStr = (OUString*)pLbFilterArea->GetEntryData( i );
                     bFound = (theCurAreaStr == *pStr);
                 }
 
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index e541a1a7e908..0dfd8fccb84d 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -619,7 +619,7 @@ void ScTabPageSortOptions::Init()
         // Check whether the field that is passed on is a database field:
 
         ScAddress aScAddress( aSortData.nCol1, aSortData.nRow1, nCurTab );
-        String theArea =
+        OUString theArea =
             ScRange( aScAddress,
                  ScAddress( aSortData.nCol2, aSortData.nRow2, nCurTab )
                ).Format(SCR_ABS, pDoc, eConv);
@@ -637,9 +637,7 @@ void ScTabPageSortOptions::Init()
             }
         }
 
-        theArea.AppendAscii(RTL_CONSTASCII_STRINGPARAM(" ("));
-        theArea += theDbName;
-        theArea += ')';
+        theArea += " (" + theDbName + ")";
 
         m_pBtnHeader->SetText( aStrColLabel );
     }
@@ -813,12 +811,12 @@ int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
 
     if ( m_pBtnCopyResult->IsChecked() )
     {
-        String      thePosStr = m_pEdOutPos->GetText();
+        OUString    thePosStr = m_pEdOutPos->GetText();
         ScAddress   thePos;
-        xub_StrLen  nColonPos = thePosStr.Search( ':' );
+        sal_Int32   nColonPos = thePosStr.indexOf( ':' );
 
-        if ( STRING_NOTFOUND != nColonPos )
-            thePosStr.Erase( nColonPos );
+        if ( -1 != nColonPos )
+            thePosStr = thePosStr.copy( 0, nColonPos );
 
         if ( pViewData )
         {
@@ -917,7 +915,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb )
         sal_uInt16  nSelPos = m_pLbOutPos->GetSelectEntryPos();
 
         if ( nSelPos > 0 )
-            aString = *(String*)m_pLbOutPos->GetEntryData( nSelPos );
+            aString = *(OUString*)m_pLbOutPos->GetEntryData( nSelPos );
 
         m_pEdOutPos->SetText( aString );
     }
@@ -945,19 +943,19 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
 {
     if (pEd == m_pEdOutPos)
     {
-       String  theCurPosStr = m_pEdOutPos->GetText();
+        OUString  theCurPosStr = m_pEdOutPos->GetText();
         sal_uInt16  nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
 
         if ( SCA_VALID == (nResult & SCA_VALID) )
         {
-            String* pStr    = NULL;
+            OUString* pStr    = NULL;
             sal_Bool    bFound  = false;
             sal_uInt16  i       = 0;
             sal_uInt16  nCount  = m_pLbOutPos->GetEntryCount();
 
             for ( i=2; i<nCount && !bFound; i++ )
             {
-                pStr = (String*)m_pLbOutPos->GetEntryData( i );
+                pStr = (OUString*)m_pLbOutPos->GetEntryData( i );
                 bFound = (theCurPosStr == *pStr);
             }
 
@@ -994,8 +992,8 @@ IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl)
         const OUString* pArray = aAlgos.getConstArray();
         for (long i=0; i<nCount; i++)
         {
-            String sAlg = pArray[i];
-            String sUser = pColRes->GetTranslation( sAlg );
+            OUString sAlg = pArray[i];
+            OUString sUser = pColRes->GetTranslation( sAlg );
             m_pLbAlgorithm->InsertEntry( sUser, LISTBOX_APPEND );
         }
         m_pLbAlgorithm->SelectEntryPos( 0 );       // first entry is default