convert sc/inc/r*.hxx from String to OUString

Change-Id: Iaae69c0914917d9d5851f227be28ff5cd098da8b

23 files changed, 89 insertions, 125 deletions

diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 6ff6150d290f..785f7f476c1c 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -38,14 +38,11 @@ public:
     ScRangeList& operator=(const ScRangeList& rList);
     void Append( const ScRange& rRange );
 
-    sal_uInt16 Parse( const String&, ScDocument* = NULL,
+    sal_uInt16 Parse( const OUString&, ScDocument* = NULL,
                       sal_uInt16 nMask = SCA_VALID,
                       formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
                       SCTAB nDefaultTab = 0, sal_Unicode cDelimiter = 0 );
 
-    void            Format( String&, sal_uInt16 nFlags = 0, ScDocument* = NULL,
-                            formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
-                            sal_Unicode cDelimiter = 0 ) const;
     void            Format( OUString&, sal_uInt16 nFlags = 0, ScDocument* = NULL,
                             formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
                             sal_Unicode cDelimiter = 0 ) const;
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 007ed70861a2..9b61b0042739 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -116,7 +116,6 @@ public:
     RangeType       GetType() const                 { return eType; }
     bool            HasType( RangeType nType ) const;
     sal_uInt32      GetUnoType() const;
-    SC_DLLPUBLIC void GetSymbol( String& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
     SC_DLLPUBLIC void GetSymbol( OUString& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
     SC_DLLPUBLIC void GetSymbol( OUString& rSymbol, const ScAddress& rPos, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
     void            UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress&,
@@ -145,8 +144,8 @@ public:
 
     void            ValidateTabRefs();
 
-    static void     MakeValidName( String& rName );
-    SC_DLLPUBLIC static bool        IsNameValid( const String& rName, ScDocument* pDoc );
+    static void     MakeValidName( OUString& rName );
+    SC_DLLPUBLIC static bool        IsNameValid( const OUString& rName, ScDocument* pDoc );
 
     SCROW GetMaxRow() const;
     SCCOL GetMaxCol() const;
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index 486dab2bfc48..26fe5890f37b 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -46,45 +46,45 @@ public:
                 ScRangeUtil()  {}
                 ~ScRangeUtil() {}
 
-    sal_Bool    MakeArea            ( const String&     rAreaStr,
+    sal_Bool    MakeArea            ( const OUString&     rAreaStr,
                                   ScArea&           rArea,
                                   ScDocument*       pDoc,
                                   SCTAB         nTab,
                                   ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
 
-    void    CutPosString        ( const String&     theAreaStr,
-                                  String&           thePosStr ) const;
+    void    CutPosString        ( const OUString&     theAreaStr,
+                                  OUString&           thePosStr ) const;
 
-    sal_Bool    IsAbsTabArea        ( const String&     rAreaStr,
+    sal_Bool    IsAbsTabArea        ( const OUString&     rAreaStr,
                                   ScDocument*       pDoc,
                                   ScArea***         pppAreas    = 0,
                                   sal_uInt16*           pAreaCount  = 0,
                                   sal_Bool              bAcceptCellRef = false,
                                   ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
 
-    sal_Bool    IsAbsArea           ( const String& rAreaStr,
+    sal_Bool    IsAbsArea           ( const OUString& rAreaStr,
                                   ScDocument*   pDoc,
                                   SCTAB     nTab,
-                                  String*       pCompleteStr = 0,
+                                  OUString*     pCompleteStr = 0,
                                   ScRefAddress* pStartPos    = 0,
                                   ScRefAddress* pEndPos      = 0,
                                   ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
 
-    sal_Bool    IsRefArea           ( const String&,
+    sal_Bool    IsRefArea           ( const OUString&,
                                   ScDocument*,
                                   SCTAB,
-                                  String* = 0,
+                                  OUString* = 0,
                                   ScRefAddress* = 0 ) const
                                       { return false; }
 
-    sal_Bool    IsAbsPos            ( const String& rPosStr,
+    sal_Bool    IsAbsPos            ( const OUString& rPosStr,
                                   ScDocument*   pDoc,
                                   SCTAB     nTab,
-                                  String*       pCompleteStr = 0,
+                                  OUString*       pCompleteStr = 0,
                                   ScRefAddress* pPosTripel   = 0,
                                   ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
 
-    sal_Bool    MakeRangeFromName   ( const String& rName,
+    sal_Bool    MakeRangeFromName   ( const OUString& rName,
                                     ScDocument*     pDoc,
                                     SCTAB           nCurTab,
                                     ScRange&        rRange,
@@ -302,7 +302,6 @@ public:
             ~ScAreaNameIterator() {}
 
     bool Next( OUString& rName, ScRange& rRange );
-    bool Next( String& rName, ScRange& rRange );
     bool WasDBName() const { return !bFirstPass; }
 };
 
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 232b251c3c94..e1b6e5403525 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -179,11 +179,11 @@ ScRangeList::~ScRangeList()
     RemoveAll();
 }
 
-sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16 nMask,
+sal_uInt16 ScRangeList::Parse( const OUString& rStr, ScDocument* pDoc, sal_uInt16 nMask,
                            formula::FormulaGrammar::AddressConvention eConv,
                            SCTAB nDefaultTab, sal_Unicode cDelimiter )
 {
-    if ( rStr.Len() )
+    if ( !rStr.isEmpty() )
     {
         if (!cDelimiter)
             cDelimiter = ScCompiler::GetNativeSymbolChar(ocSep);
@@ -202,7 +202,7 @@ sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16
         sal_uInt16 nTCount = comphelper::string::getTokenCount(rStr, cDelimiter);
         for ( sal_uInt16 i=0; i<nTCount; i++ )
         {
-            aOne = rStr.GetToken( i, cDelimiter );
+            aOne = rStr.getToken( i, cDelimiter );
             aRange.aStart.SetTab( nTab );   // Default Tab wenn nicht angegeben
             sal_uInt16 nRes = aRange.ParseAny( aOne, pDoc, eConv );
             sal_uInt16 nEndRangeBits = SCA_VALID_COL2 | SCA_VALID_ROW2 | SCA_VALID_TAB2;
@@ -224,19 +224,6 @@ sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16
         return 0;
 }
 
-void ScRangeList::Format( String& rStr, sal_uInt16 nFlags, ScDocument* pDoc,
-                          formula::FormulaGrammar::AddressConvention eConv,
-                          sal_Unicode cDelimiter ) const
-{
-    rStr.Erase();
-
-    if (!cDelimiter)
-        cDelimiter = ScCompiler::GetNativeSymbolChar(ocSep);
-
-    FormatString func(rStr, nFlags, pDoc, eConv, cDelimiter);
-    for_each(maRanges.begin(), maRanges.end(), func);
-}
-
 void ScRangeList::Format( OUString& rStr, sal_uInt16 nFlags, ScDocument* pDoc,
                           formula::FormulaGrammar::AddressConvention eConv,
                           sal_Unicode cDelimiter ) const
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index f4668bd2c404..b963eab091ba 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -234,20 +234,11 @@ void ScRangeData::GuessPosition()
     aPos = ScAddress( (SCCOL)(-nMinCol), (SCROW)(-nMinRow), (SCTAB)(-nMinTab) );
 }
 
-void ScRangeData::GetSymbol( String& rSymbol, const FormulaGrammar::Grammar eGrammar ) const
+void ScRangeData::GetSymbol( OUString& rSymbol, const FormulaGrammar::Grammar eGrammar ) const
 {
     ScCompiler aComp(pDoc, aPos, *pCode);
     aComp.SetGrammar(eGrammar);
-    OUString aTmpSymbol (rSymbol);
-    aComp.CreateStringFromTokenArray( aTmpSymbol );
-    rSymbol = aTmpSymbol;
-}
-
-void ScRangeData::GetSymbol( OUString& rSymbol, const FormulaGrammar::Grammar eGrammar ) const
-{
-    String aStr;
-    GetSymbol(aStr, eGrammar);
-    rSymbol = aStr;
+    aComp.CreateStringFromTokenArray( rSymbol );
 }
 
 void ScRangeData::GetSymbol( OUString& rSymbol, const ScAddress& rPos, const FormulaGrammar::Grammar eGrammar ) const
@@ -417,27 +408,27 @@ void ScRangeData::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt, SCTAB nLocal
         rCxt.maUpdatedNames.setUpdatedName(nLocalTab, nIndex);
 }
 
-void ScRangeData::MakeValidName( String& rName )
+void ScRangeData::MakeValidName( OUString& rName )
 {
 
     // strip leading invalid characters
     xub_StrLen nPos = 0;
-    xub_StrLen nLen = rName.Len();
+    xub_StrLen nLen = rName.getLength();
     while ( nPos < nLen && !ScCompiler::IsCharFlagAllConventions( rName, nPos, SC_COMPILER_C_NAME) )
         ++nPos;
     if ( nPos>0 )
-        rName.Erase(0,nPos);
+        rName = rName.copy(nPos);
 
     // if the first character is an invalid start character, precede with '_'
-    if ( rName.Len() && !ScCompiler::IsCharFlagAllConventions( rName, 0, SC_COMPILER_C_CHAR_NAME ) )
-        rName.Insert('_',0);
+    if ( !rName.isEmpty() && !ScCompiler::IsCharFlagAllConventions( rName, 0, SC_COMPILER_C_CHAR_NAME ) )
+        rName = "_" + rName;
 
     // replace invalid with '_'
-    nLen = rName.Len();
+    nLen = rName.getLength();
     for (nPos=0; nPos<nLen; nPos++)
     {
         if ( !ScCompiler::IsCharFlagAllConventions( rName, nPos, SC_COMPILER_C_NAME) )
-            rName.SetChar( nPos, '_' );
+            rName = rName.replaceAt( nPos, 1, "_" );
     }
 
     // Ensure that the proposed name is not a reference under any convention,
@@ -453,21 +444,23 @@ void ScRangeData::MakeValidName( String& rName )
         {
             //! Range Parse is partially valid also with invalid sheet name,
             //! Address Parse dito, during compile name would generate a #REF!
-            if ( rName.SearchAndReplace( '.', '_' ) == STRING_NOTFOUND )
-                rName.Insert('_',0);
+            if ( rName.indexOf( '.' ) == -1 )
+                rName = rName.replaceFirst( ".", "_" );
+            else
+                rName = "_" + rName;
         }
     }
 }
 
-bool ScRangeData::IsNameValid( const String& rName, ScDocument* pDoc )
+bool ScRangeData::IsNameValid( const OUString& rName, ScDocument* pDoc )
 {
     /* XXX If changed, sc/source/filter/ftools/ftools.cxx
      * ScfTools::ConvertToScDefinedName needs to be changed too. */
     sal_Char a('.');
-    if (rName.Search(a, 0) != STRING_NOTFOUND)
+    if (rName.indexOf(a) != -1)
         return false;
     xub_StrLen nPos = 0;
-    xub_StrLen nLen = rName.Len();
+    xub_StrLen nLen = rName.getLength();
     if ( !nLen || !ScCompiler::IsCharFlagAllConventions( rName, nPos++, SC_COMPILER_C_CHAR_NAME ) )
         return false;
     while ( nPos < nLen )
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 9781dffe6af3..b81ce988981a 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -31,7 +31,7 @@
 using ::formula::FormulaGrammar;
 using namespace ::com::sun::star;
 
-sal_Bool ScRangeUtil::MakeArea( const String&   rAreaStr,
+sal_Bool ScRangeUtil::MakeArea( const OUString&   rAreaStr,
                             ScArea&         rArea,
                             ScDocument*     pDoc,
                             SCTAB           nTab,
@@ -43,18 +43,17 @@ sal_Bool ScRangeUtil::MakeArea( const String&   rAreaStr,
     // but it is only used in the consolidate dialog.  Ignore for now.
 
     sal_Bool        nSuccess    = false;
-    sal_uInt16      nPointPos   = rAreaStr.Search('.');
-    sal_uInt16      nColonPos   = rAreaStr.Search(':');
+    sal_Int32       nPointPos   = rAreaStr.indexOf('.');
+    sal_Int32       nColonPos   = rAreaStr.indexOf(':');
     String      aStrArea( rAreaStr );
     ScRefAddress    startPos;
     ScRefAddress    endPos;
 
-    if ( nColonPos == STRING_NOTFOUND )
-        if ( nPointPos != STRING_NOTFOUND )
-        {
-            aStrArea += ':';
-            aStrArea += rAreaStr.Copy( nPointPos+1 ); // do not include '.' in copy
-        }
+    if ( nColonPos == -1  && nPointPos != -1 )
+    {
+        aStrArea += ':';
+        aStrArea += rAreaStr.copy( nPointPos+1 ); // do not include '.' in copy
+    }
 
     nSuccess = ConvertDoubleRef( pDoc, aStrArea, nTab, startPos, endPos, rDetails );
 
@@ -66,24 +65,24 @@ sal_Bool ScRangeUtil::MakeArea( const String&   rAreaStr,
     return nSuccess;
 }
 
-void ScRangeUtil::CutPosString( const String&   theAreaStr,
-                                String&         thePosStr ) const
+void ScRangeUtil::CutPosString( const OUString&   theAreaStr,
+                                OUString&         thePosStr ) const
 {
     String  aPosStr;
     // BROKEN BROKEN BROKEN
     // but it is only used in the consolidate dialog.  Ignore for now.
 
-    sal_uInt16  nColonPos = theAreaStr.Search(':');
+    sal_Int32  nColonPos = theAreaStr.indexOf(':');
 
-    if ( nColonPos != STRING_NOTFOUND )
-        aPosStr = theAreaStr.Copy( 0, nColonPos ); // do not include ':' in copy
+    if ( nColonPos != -1 )
+        aPosStr = theAreaStr.copy( 0, nColonPos ); // do not include ':' in copy
     else
         aPosStr = theAreaStr;
 
     thePosStr = aPosStr;
 }
 
-sal_Bool ScRangeUtil::IsAbsTabArea( const String&   rAreaStr,
+sal_Bool ScRangeUtil::IsAbsTabArea( const OUString&   rAreaStr,
                                 ScDocument*     pDoc,
                                 ScArea***       pppAreas,
                                 sal_uInt16*         pAreaCount,
@@ -170,10 +169,10 @@ sal_Bool ScRangeUtil::IsAbsTabArea( const String&   rAreaStr,
     return bStrOk;
 }
 
-sal_Bool ScRangeUtil::IsAbsArea( const String&  rAreaStr,
+sal_Bool ScRangeUtil::IsAbsArea( const OUString&  rAreaStr,
                              ScDocument*    pDoc,
                              SCTAB          nTab,
-                             String*        pCompleteStr,
+                             OUString*      pCompleteStr,
                              ScRefAddress*  pStartPos,
                              ScRefAddress*  pEndPos,
                              ScAddress::Details const & rDetails ) const
@@ -195,7 +194,7 @@ sal_Bool ScRangeUtil::IsAbsArea( const String&  rAreaStr,
         if ( pCompleteStr )
         {
             *pCompleteStr  = startPos.GetRefString( pDoc, MAXTAB+1, rDetails );
-            *pCompleteStr += ':';
+            *pCompleteStr += ":";
             *pCompleteStr += endPos  .GetRefString( pDoc, nTab, rDetails );
         }
 
@@ -209,10 +208,10 @@ sal_Bool ScRangeUtil::IsAbsArea( const String&  rAreaStr,
     return bIsAbsArea;
 }
 
-sal_Bool ScRangeUtil::IsAbsPos( const String&   rPosStr,
+sal_Bool ScRangeUtil::IsAbsPos( const OUString&   rPosStr,
                             ScDocument*     pDoc,
                             SCTAB           nTab,
-                            String*         pCompleteStr,
+                            OUString*       pCompleteStr,
                             ScRefAddress*   pPosTripel,
                             ScAddress::Details const & rDetails ) const
 {
@@ -235,7 +234,7 @@ sal_Bool ScRangeUtil::IsAbsPos( const String&   rPosStr,
 }
 
 sal_Bool ScRangeUtil::MakeRangeFromName (
-    const String&   rName,
+    const OUString& rName,
     ScDocument*     pDoc,
     SCTAB           nCurTab,
     ScRange&        rRange,
@@ -276,7 +275,7 @@ sal_Bool ScRangeUtil::MakeRangeFromName (
             pData = pDoc->GetRangeName()->findByUpperName(ScGlobal::pCharClass->uppercase(aName));
         if (pData)
         {
-            String       aStrArea;
+            OUString         aStrArea;
             ScRefAddress     aStartPos;
             ScRefAddress     aEndPos;
 
@@ -1023,16 +1022,6 @@ ScAreaNameIterator::ScAreaNameIterator( ScDocument* pDoc ) :
 
 bool ScAreaNameIterator::Next( OUString& rName, ScRange& rRange )
 {
-    // Just a wrapper for OUString for now.  It should replace the method
-    // below eventually.
-    String aTmp;
-    bool bRet = Next(aTmp, rRange);
-    rName = aTmp;
-    return bRet;
-}
-
-bool ScAreaNameIterator::Next( String& rName, ScRange& rRange )
-{
     for (;;)
     {
         if ( bFirstPass )                                   // erst Bereichsnamen
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index a0b80b7dde9e..fc2b1d0ee050 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -396,7 +396,7 @@ sal_uInt16 XclExpNameManagerImpl::InsertBuiltInName( sal_Unicode cBuiltIn, XclTo
     XclExpNameRef xName( new XclExpName( GetRoot(), cBuiltIn ) );
     xName->SetTokenArray( xTokArr );
     xName->SetLocalTab( nScTab );
-    String sSymbol;
+    OUString sSymbol;
     rRangeList.Format( sSymbol, SCR_ABS_3D, GetDocPtr(), ::formula::FormulaGrammar::CONV_XL_A1 );
     xName->SetSymbol( sSymbol );
     return Append( xName );
@@ -564,7 +564,7 @@ sal_uInt16 XclExpNameManagerImpl::CreateName( SCTAB nTab, const ScRangeData& rRa
         XclTokenArrayRef xTokArr = GetFormulaCompiler().CreateFormula( EXC_FMLATYPE_NAME, *pScTokArr );
         xName->SetTokenArray( xTokArr );
 
-        String sSymbol;
+        OUString sSymbol;
         rRangeData.GetSymbol( sSymbol, formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 );
         xName->SetSymbol( sSymbol );
 
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 7c67f7729171..f8de9377f725 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -764,7 +764,7 @@ OString XclXmlUtils::ToOString( const ScRange& rRange )
 
 OString XclXmlUtils::ToOString( const ScRangeList& rRangeList )
 {
-    String s;
+    OUString s;
     rRangeList.Format(s, SCA_VALID, NULL, FormulaGrammar::CONV_XL_A1, ' ');
     return ToOString( s );
 }
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 45e2677ab92d..38050105616f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4092,7 +4092,7 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName)
                             FormulaGrammar::CONV_OOO, ' ', false, SCA_ABS_3D);
         AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, sBaseCellAddress);
 
-        String sSymbol;
+        OUString sSymbol;
         it->second->GetSymbol(sSymbol, pDoc->GetStorageGrammar());
         OUString sTempSymbol(sSymbol);
         ScRange aRange;
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index bc608f074540..364acca0500a 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -55,9 +55,9 @@ ScCondFormatManagerWindow::ScCondFormatManagerWindow(Window* pParent, ScDocument
 OUString ScCondFormatManagerWindow::createEntryString(const ScConditionalFormat& rFormat)
 {
     ScRangeList aRange = rFormat.GetRange();
-    String aStr;
+    OUString aStr;
     aRange.Format(aStr, SCA_VALID, mpDoc, mpDoc->GetAddressConvention());
-    aStr += '\t';
+    aStr += "\t";
     aStr += ScCondFormatHelper::GetExpression(rFormat, aRange.GetTopLeftCorner());
     return aStr;
 }
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 8094c1cf5ac1..569f94b0766c 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -208,7 +208,7 @@ void ScConsolidateDlg::Init()
     {
         pAreaData = new ScAreaData[nAreaDataCount];
 
-        String aStrName;
+        OUString aStrName;
         sal_uInt16 nAt = 0;
         ScRange aRange;
         ScAreaNameIterator aIter( pDoc );
@@ -330,9 +330,9 @@ sal_Bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
          ((pEd != pEdDataArea) && (pEd != pEdDestArea)) )
         return false;
 
-    SCTAB   nTab    = pViewData->GetTabNo();
-    sal_Bool    bEditOk = false;
-    String  theCompleteStr;
+    SCTAB    nTab    = pViewData->GetTabNo();
+    sal_Bool bEditOk = false;
+    OUString theCompleteStr;
     const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
 
     if ( pEd == pEdDataArea )
@@ -342,7 +342,7 @@ sal_Bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
     }
     else if ( pEd == pEdDestArea )
     {
-        String aPosStr;
+        OUString aPosStr;
 
         pRangeUtil->CutPosString( pEd->GetText(), aPosStr );
         bEditOk = pRangeUtil->IsAbsPos( aPosStr, pDoc,
@@ -532,7 +532,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
         {
             if ( static_cast<size_t>(nSelPos) <= nAreaDataCount )
             {
-                String aString( pAreaData[nSelPos-1].aStrArea );
+                OUString aString( pAreaData[nSelPos-1].aStrArea );
 
                 if ( pLb == pLbDestArea )
                     pRangeUtil->CutPosString( aString, aString );
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index f2f4e77581e3..978e8403241f 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -119,7 +119,7 @@ void ScFilterOptionsMgr::Init()
         pLbCopyArea->InsertEntry( rStrUndefined, 0 );
 
         ScAreaNameIterator aIter( pDoc );
-        String aName;
+        OUString aName;
         ScRange aRange;
         while ( aIter.Next( aName, aRange ) )
         {
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 44cfb2f9644d..fe16f96474c5 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4916,9 +4916,9 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
     ScDocument* pDoc = rDocShell.GetDocument();
     if (!pDoc->HasValueData( nPosX, nPosY, nTab ))
     {
-        String aName = pDoc->GetString(nPosX, nPosY, nTab);
+        OUString aName = pDoc->GetString(nPosX, nPosY, nTab);
         ScRangeData::MakeValidName(aName);
-        if (aName.Len())
+        if (!aName.isEmpty())
         {
             String aContent(ScRange( nX1, nY1, nTab, nX2, nY2, nTab ).Format(SCR_ABS_3D, pDoc));
 
@@ -4926,7 +4926,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
             ScRangeData* pOld = rList.findByUpperName(ScGlobal::pCharClass->uppercase(aName));
             if (pOld)
             {
-                String aOldStr;
+                OUString aOldStr;
                 pOld->GetSymbol( aOldStr );
                 if (aOldStr != aContent)
                 {
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index c5dd453f57aa..6d3d4eff98e1 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2158,7 +2158,7 @@ long ScDocShell::DdeSetData( const OUString& rItem,
     //  only check for valid item string - range is parsed again in ScServerObject ctor
 
     //  named range?
-    String aPos = rItem;
+    OUString aPos = rItem;
     ScRangeName* pRange = aDocument.GetRangeName();
     if( pRange )
     {
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 6ee849eb03f9..8548f06b9108 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -446,7 +446,7 @@ void ScExternalRefCache::Table::setCachedCellRange(SCCOL nCol1, SCROW nRow1, SCC
     else
         maCachedRanges.Join(aRange);
 
-    String aStr;
+    OUString aStr;
     maCachedRanges.Format(aStr, SCA_VALID);
 }
 
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 75bd6ace2454..40d3cba85545 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -145,7 +145,7 @@ ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos )
 
     SCTAB nTab = ScDocShell::GetCurTab();
     aRange.aStart.SetTab( nTab );
-    String aPos( rPos );
+    OUString aPos( rPos );
     //  Benannter Bereich?
     ScRangeName* pRange = pDoc->GetRangeName();
     if( pRange )
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 7c5b8434383a..1ab6671c7198 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -149,7 +149,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
                 pScDoc->LimitChartIfAll( aRangeListRef );               // limit whole columns/rows to used area
 
                 // update string from modified ranges.  The ranges must be in the current formula syntax.
-                String aTmpStr;
+                OUString aTmpStr;
                 aRangeListRef->Format( aTmpStr, SCR_ABS_3D, pScDoc, pScDoc->GetAddressConvention() );
                 aRangeString = aTmpStr;
 
@@ -468,7 +468,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
 
             ScRangeList aRanges;
             aMultiMark.FillRangeListWithMarks( &aRanges, false );
-            String aStr;
+            OUString aStr;
             ScDocument* pDocument = pViewSh->GetViewData()->GetDocument();
             aRanges.Format( aStr, SCR_ABS_3D, pDocument, pDocument->GetAddressConvention() );
             aRangeString = aStr;
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 7bcb55ffb538..18769782933f 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -696,10 +696,10 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
 
         ScRefAddress theStartPos;
         ScRefAddress theEndPos;
-        String       theAreaStr( mpEdCopyFrom->GetText() );
-        sal_Bool        bAreaOk = false;
+        OUString     theAreaStr( mpEdCopyFrom->GetText() );
+        sal_Bool     bAreaOk = false;
 
-        if ( theAreaStr.Len() > 0 )
+        if ( !theAreaStr.isEmpty() )
         {
             bAreaOk = pRangeUtil->IsAbsArea( theAreaStr,
                                              pDoc,
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index ca89a95a28ad..02f9c0b497cb 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -432,8 +432,8 @@ void ScPrintAreasDlg::Impl_FillLists()
     //------------------------------------------------------
     // Selektion holen und String in PrintArea-ListBox merken
     //------------------------------------------------------
-    ScRange aRange;
-    String  aStrRange;
+    ScRange  aRange;
+    OUString aStrRange;
     sal_Bool bSimple = sal_True;
 
     if ( pViewData )
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 927a81169e15..659e3a65da80 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -2595,9 +2595,9 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
                     break;
                 case SC_WID_UNO_ABSNAME:
                     {
-                        String sRet;
+                        OUString sRet;
                         aRanges.Format(sRet, SCR_ABS_3D, pDocShell->GetDocument());
-                        rAny <<= OUString(sRet);
+                        rAny <<= sRet;
                     }
             }
     }
@@ -4288,7 +4288,7 @@ OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString()
                                                 throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
-    String aString;
+    OUString aString;
     ScDocShell* pDocSh = GetDocShell();
     const ScRangeList& rRanges = GetRangeList();
     if (pDocSh)
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index e4b485e6591f..9869d974a492 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -248,14 +248,14 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName,
                 xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY );
             if( xReceiver.is())
             {
-                String sRangeStr;
+                OUString sRangeStr;
                 xNewRanges->Format(sRangeStr, SCR_ABS_3D, pDoc);
 
                 // connect
-                if( sRangeStr.Len() )
+                if( !sRangeStr.isEmpty() )
                     xReceiver->attachDataProvider( xDataProvider );
                 else
-                    sRangeStr = OUString("all");
+                    sRangeStr = "all";
 
                 uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( pDocShell->GetModel(), uno::UNO_QUERY );
                 xReceiver->attachNumberFormatsSupplier( xNumberFormatsSupplier );
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index ae7a342d1ede..a14584b10a07 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -176,7 +176,7 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p
     if (pNewName)
         aInsName = *pNewName;
 
-    String aContent;                            // Content string based =>
+    OUString aContent;                            // Content string based =>
     pOld->GetSymbol( aContent, eGrammar);   // no problems with changed positions and such.
     if (pNewContent)
         aContent = *pNewContent;
@@ -235,7 +235,7 @@ void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName )
 OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
-       String aContent;
+    OUString aContent;
     ScRangeData* pData = GetRangeData_Impl();
     if (pData)
         // GRAM_PODF_A1 for API compatibility.
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index cefd6b24b999..19fa2e3ae29e 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -66,7 +66,7 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent
 
 OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException)
 {
-    String aPrintArea;
+    OUString aPrintArea;
     uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW );
     uno::Sequence< table::CellRangeAddress > aSeq = xPrintAreas->getPrintAreas();
     sal_Int32 nCount = aSeq.getLength();