Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

35 files changed, 112 insertions, 116 deletions

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 08f848d4773f..8a7367024902 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -332,7 +332,7 @@ private:
     virtual void SetError(sal_uInt16 nError);
     xub_StrLen NextSymbol(bool bInArray);
     bool IsValue( const String& );
-    bool IsOpCode( const String&, bool bInArray );
+    bool IsOpCode( const OUString&, bool bInArray );
     bool IsOpCode2( const String& );
     bool IsString();
     bool IsReference( const String& );
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index 242bb89a2bb2..a3114aab5ae7 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -21,6 +21,7 @@
 #define SC_SCDOCPOL_HXX
 
 #include <svl/itempool.hxx>
+#include <tools/string.hxx>
 #include "scdllapi.h"
 
 class ScStyleSheet;
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 72189af1ea9d..180912b147fb 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -671,7 +671,7 @@ SC_DLLPUBLIC    static xub_StrLen       FindUnquoted( const String& rString, sal
      */
 SC_DLLPUBLIC    static const sal_Unicode* FindUnquoted( const sal_Unicode* pString, sal_Unicode cChar, sal_Unicode cQuote = '\'' );
 
-    static  CharSet         GetCharsetValue( const String& rCharSet );
+    static  CharSet         GetCharsetValue( const OUString& rCharSet );
     static  String          GetCharsetString( CharSet eVal );
 
     /// a "ReadOnly" formatter for UNO/XML export
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index db7be4a5d450..4ea65bccb138 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -21,6 +21,7 @@
 #define SC_PROGRESS_HXX
 
 #include <sfx2/progress.hxx>
+#include <tools/string.hxx>
 #include "scdllapi.h"
 
 class ScDocument;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 744a589adc1a..04e02de4ae54 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -696,26 +696,26 @@ void ScGlobal::Clear()
 
 //------------------------------------------------------------------------
 
-CharSet ScGlobal::GetCharsetValue( const String& rCharSet )
+CharSet ScGlobal::GetCharsetValue( const OUString& rCharSet )
 {
     // new TextEncoding values
     if ( CharClass::isAsciiNumeric( rCharSet ) )
     {
-        sal_Int32 nVal = rCharSet.ToInt32();
+        sal_Int32 nVal = rCharSet.toInt32();
         if ( !nVal || nVal == RTL_TEXTENCODING_DONTKNOW )
             return osl_getThreadTextEncoding();
         return (CharSet) nVal;
     }
     // old CharSet values for compatibility
-    else if (rCharSet.EqualsIgnoreCaseAscii("ANSI")     ) return RTL_TEXTENCODING_MS_1252;
-    else if (rCharSet.EqualsIgnoreCaseAscii("MAC")      ) return RTL_TEXTENCODING_APPLE_ROMAN;
-    else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC")    ) return RTL_TEXTENCODING_IBM_850;
-    else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_437")) return RTL_TEXTENCODING_IBM_437;
-    else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_850")) return RTL_TEXTENCODING_IBM_850;
-    else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_860")) return RTL_TEXTENCODING_IBM_860;
-    else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_861")) return RTL_TEXTENCODING_IBM_861;
-    else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_863")) return RTL_TEXTENCODING_IBM_863;
-    else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_865")) return RTL_TEXTENCODING_IBM_865;
+    else if (rCharSet.equalsIgnoreAsciiCase("ANSI")     ) return RTL_TEXTENCODING_MS_1252;
+    else if (rCharSet.equalsIgnoreAsciiCase("MAC")      ) return RTL_TEXTENCODING_APPLE_ROMAN;
+    else if (rCharSet.equalsIgnoreAsciiCase("IBMPC")    ) return RTL_TEXTENCODING_IBM_850;
+    else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_437")) return RTL_TEXTENCODING_IBM_437;
+    else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_850")) return RTL_TEXTENCODING_IBM_850;
+    else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_860")) return RTL_TEXTENCODING_IBM_860;
+    else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_861")) return RTL_TEXTENCODING_IBM_861;
+    else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_863")) return RTL_TEXTENCODING_IBM_863;
+    else if (rCharSet.equalsIgnoreAsciiCase("IBMPC_865")) return RTL_TEXTENCODING_IBM_865;
     else return osl_getThreadTextEncoding();
 }
 
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 35bfbd788dc1..1a9a9a8c9884 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2382,7 +2382,7 @@ Label_MaskStateMachine:
 
 // Convert symbol to token
 
-bool ScCompiler::IsOpCode( const String& rName, bool bInArray )
+bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray )
 {
     OpCodeHashMap::const_iterator iLook( mxSymbols->getHashMap()->find( rName));
     bool bFound = (iLook != mxSymbols->getHashMap()->end());
@@ -2392,9 +2392,9 @@ bool ScCompiler::IsOpCode( const String& rName, bool bInArray )
         OpCode eOp = iLook->second;
         if (bInArray)
         {
-            if (rName.Equals(mxSymbols->getSymbol(ocArrayColSep)))
+            if (rName.equals(mxSymbols->getSymbol(ocArrayColSep)))
                 eOp = ocArrayColSep;
-            else if (rName.Equals(mxSymbols->getSymbol(ocArrayRowSep)))
+            else if (rName.equals(mxSymbols->getSymbol(ocArrayRowSep)))
                 eOp = ocArrayRowSep;
         }
         aToken.SetOpCode(eOp);
@@ -2424,7 +2424,7 @@ bool ScCompiler::IsOpCode( const String& rName, bool bInArray )
         static const size_t nOdffAliases = sizeof(aOdffAliases) / sizeof(aOdffAliases[0]);
         for (size_t i=0; i<nOdffAliases; ++i)
         {
-            if (rName.EqualsIgnoreCaseAscii( aOdffAliases[i].pName))
+            if (rName.equalsIgnoreAsciiCaseAscii( aOdffAliases[i].pName))
             {
                 ScRawToken aToken;
                 aToken.SetOpCode( aOdffAliases[i].eOp);
@@ -2819,7 +2819,7 @@ bool ScCompiler::IsMacro( const String& rName )
 
     return false;
 #else
-    String aName( rName);
+    OUString aName( rName);
     StarBASIC* pObj = 0;
     SfxObjectShell* pDocSh = pDoc->GetDocumentShell();
 
@@ -2834,8 +2834,8 @@ bool ScCompiler::IsMacro( const String& rName )
     // use only unprefixed name if encountered. BASIC doesn't allow '.' in a
     // function name so a function "USER.FOO" could not exist, and macro check
     // is assigned the lowest priority in function name check.
-    if (FormulaGrammar::isODFF( GetGrammar()) && aName.EqualsIgnoreCaseAscii( "USER.", 0, 5))
-        aName.Erase( 0, 5);
+    if (FormulaGrammar::isODFF( GetGrammar()) && aName.startsWithIgnoreAsciiCase("USER."))
+        aName = aName.copy(5);
 
     SbxMethod* pMeth = (SbxMethod*) pObj->Find( aName, SbxCLASS_METHOD );
     if( !pMeth )
@@ -2850,7 +2850,7 @@ bool ScCompiler::IsMacro( const String& rName )
         return false;
     }
     ScRawToken aToken;
-    aToken.SetExternal( aName.GetBuffer() );
+    aToken.SetExternal( aName.getStr() );
     aToken.eOp = ocMacro;
     pRawToken = aToken.Clone();
     return true;
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 961344a887b3..c914396a90ea 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -388,7 +388,7 @@ void ScInterpreter::ScGetDateDif()
 {
     if ( MustHaveParamCount( GetByte(), 3 ) )
     {
-        String aInterval = GetString();
+        OUString aInterval = GetString();
         double nDate2    = GetDouble();
         double nDate1    = GetDouble();
 
@@ -407,7 +407,7 @@ void ScInterpreter::ScGetDateDif()
 
         long dd = nDate2 - nDate1;
         // Zero difference or number of days can be returned immediately.
-        if (dd == 0 || aInterval.EqualsIgnoreCaseAscii( "d" ))
+        if (dd == 0 || aInterval.equalsIgnoreAsciiCase( "d" ))
         {
             PushDouble( dd );
             return;
@@ -426,7 +426,7 @@ void ScInterpreter::ScGetDateDif()
         m2 = aDate2.GetMonth();
         d2 = aDate2.GetDay();
 
-        if (  aInterval.EqualsIgnoreCaseAscii( "m" ) )
+        if (  aInterval.equalsIgnoreAsciiCase( "m" ) )
         {
             // Return number of months.
             int md = m2 - m1 + 12 * (y2 - y1);
@@ -434,7 +434,7 @@ void ScInterpreter::ScGetDateDif()
                 --md;
             PushInt( md );
         }
-        else if ( aInterval.EqualsIgnoreCaseAscii( "y" ) )
+        else if ( aInterval.equalsIgnoreAsciiCase( "y" ) )
         {
             // Return number of years.
             int yd;
@@ -453,7 +453,7 @@ void ScInterpreter::ScGetDateDif()
             }
             PushInt( yd );
         }
-        else if ( aInterval.EqualsIgnoreCaseAscii( "md" ) )
+        else if ( aInterval.equalsIgnoreAsciiCase( "md" ) )
         {
             // Return number of days, excluding months and years.
             // This is actually the remainder of days when subtracting years
@@ -491,7 +491,7 @@ void ScInterpreter::ScGetDateDif()
             }
             PushDouble( nd );
         }
-        else if ( aInterval.EqualsIgnoreCaseAscii( "ym" ) )
+        else if ( aInterval.equalsIgnoreAsciiCase( "ym" ) )
         {
             // Return number of months, excluding years.
             int md = m2 - m1 + 12 * (y2 - y1);
@@ -500,7 +500,7 @@ void ScInterpreter::ScGetDateDif()
             md %= 12;
             PushInt( md );
         }
-        else if ( aInterval.EqualsIgnoreCaseAscii( "yd" ) )
+        else if ( aInterval.equalsIgnoreAsciiCase( "yd" ) )
         {
             // Return number of days, excluding years.
 
@@ -2527,7 +2527,7 @@ void ScInterpreter::ScHyperLink()
     }
 }
 
-bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
+bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int& rnDec )
 {
     struct ConvertInfo
     {
@@ -2556,8 +2556,8 @@ bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
     };
 
     const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( aConvertTable[0] );
-    for ( size_t i = 0; i < nConversionCount; i++ )
-        if ( aSearchUnit.EqualsIgnoreCaseAscii( aConvertTable[i].pCurrText ) )
+    for ( size_t i = 0; i < nConversionCount; ++i )
+        if ( aSearchUnit.equalsIgnoreAsciiCaseAscii( aConvertTable[i].pCurrText ) )
         {
             rfRate = aConvertTable[i].fRate;
             rnDec  = aConvertTable[i].nDec;
@@ -2584,8 +2584,8 @@ void ScInterpreter::ScEuroConvert()
         bool bFullPrecision = false;
         if ( nParamCount >= 4 )
             bFullPrecision = GetBool();
-        String aToUnit( GetString() );
-        String aFromUnit( GetString() );
+        OUString aToUnit( GetString() );
+        OUString aFromUnit( GetString() );
         double fVal = GetDouble();
         if ( nGlobalError )
             PushError( nGlobalError);
@@ -2600,11 +2600,11 @@ void ScInterpreter::ScEuroConvert()
                 && lclConvertMoney( aToUnit, fToRate, nToDec ) )
             {
                 double fRes;
-                if ( aFromUnit.EqualsIgnoreCaseAscii( aToUnit ) )
+                if ( aFromUnit.equalsIgnoreAsciiCase( aToUnit ) )
                     fRes = fVal;
                 else
                 {
-                    if ( aFromUnit.EqualsIgnoreCaseAscii( aEur ) )
+                    if ( aFromUnit.equalsIgnoreAsciiCase( aEur ) )
                        fRes = fVal * fToRate;
                     else
                     {
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 92c3cfbdc356..02cfe1af9f62 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -56,8 +56,8 @@
 
 #include <svl/stritem.hxx>
 
-#include <tools/string.hxx>
 #include <rtl/math.hxx>
+#include <rtl/ustring.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/charclass.hxx>
 #include <drwlayer.hxx>
@@ -321,7 +321,7 @@ void ImportExcel8::ReadBasic( void )
             rFilterOpt.IsLoadExcelBasicExecutable() )
         {
             // see if we have the XCB stream
-            SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "XCB" ) ), STREAM_STD_READ | STREAM_NOCREATE  );
+            SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( OUString("XCB"), STREAM_STD_READ | STREAM_NOCREATE  );
             if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() )
             {
                 ScCTBWrapper wrapper;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index a06aac110735..4239a5e8e39f 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -597,7 +597,7 @@ void ImportExcel::Externname25( void )
 
     if( ( nOpt & 0x0001 ) || ( ( nOpt & 0xFFFE ) == 0x0000 ) )
     {// external name
-        ScfTools::ConvertToScDefinedName( aName );
+        aName = ScfTools::ConvertToScDefinedName( aName );
         pExcRoot->pExtNameBuff->AddName( aName, mnLastRefIdx );
     }
     else if( nOpt & 0x0010 )
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 486976c415e0..72fde6c096a2 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -719,7 +719,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference<
         {
             XclFontData aFontData;
             GetFontPropSetHelper().ReadFontProperties( aFontData, aCtrlProp, EXC_FONTPROPSET_CONTROL );
-            if( (aFontData.maName.Len() > 0) && (aFontData.mnHeight > 0) )
+            if( (!aFontData.maName.isEmpty() ) && (aFontData.mnHeight > 0) )
                 nXclFont = GetFontBuffer().Insert( aFontData, EXC_COLOR_CTRLTEXT );
         }
 
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 2c2ece8086b6..257a3dbe035b 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -945,7 +945,7 @@ namespace {
 
 sal_uInt32 lclCalcHash( const XclFontData& rFontData )
 {
-    sal_uInt32 nHash = rFontData.maName.Len();
+    sal_uInt32 nHash = rFontData.maName.getLength();
     nHash += rFontData.maColor.GetColor() * 2;
     nHash += rFontData.mnWeight * 3;
     nHash += rFontData.mnCharSet * 5;
@@ -975,7 +975,7 @@ XclExpFont::XclExpFont( const XclExpRoot& rRoot,
     // hash value for faster comparison
     mnHash = lclCalcHash( maData );
     // record size
-    sal_Size nStrLen = maData.maName.Len();
+    sal_Int32 nStrLen = maData.maName.getLength();
     SetRecSize( ((GetBiff() == EXC_BIFF8) ? (nStrLen * 2 + 1) : nStrLen) + 15 );
 }
 
@@ -1003,7 +1003,7 @@ void XclExpFont::WriteBody( XclExpStream& rStrm )
     ::set_flag( nAttr, EXC_FONTATTR_OUTLINE, maData.mbOutline );
     ::set_flag( nAttr, EXC_FONTATTR_SHADOW, maData.mbShadow );
 
-    OSL_ENSURE( maData.maName.Len() < 256, "XclExpFont::WriteBody - font name too long" );
+    OSL_ENSURE( maData.maName.getLength() < 256, "XclExpFont::WriteBody - font name too long" );
     XclExpString aFontName;
     if( GetBiff() <= EXC_BIFF5 )
         aFontName.AssignByte( maData.maName, GetTextEncoding(), EXC_STR_8BITLENGTH );
@@ -1142,7 +1142,7 @@ void XclExpFontBuffer::SaveXml( XclExpXmlStream& rStrm )
 void XclExpFontBuffer::InitDefaultFonts()
 {
     XclFontData aFontData;
-    aFontData.maName.AssignAscii( "Arial" );
+    aFontData.maName = "Arial";
     aFontData.SetScFamily( FAMILY_DONTKNOW );
     aFontData.SetFontEncoding( ScfTools::GetSystemTextEncoding() );
     aFontData.SetScHeight( 200 );   // 200 twips = 10 pt
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index 813b64dae119..c598c5af3867 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -342,12 +342,12 @@ XclImpExtName::XclImpExtName( const XclImpSupbook& rSupbook, XclImpStream& rStrm
             maName = rStrm.GetRoot().GetScAddInName( maName );
         }
         else if ( (eSubType == EXC_SBTYPE_EUROTOOL) &&
-                maName.EqualsIgnoreCaseAscii( "EUROCONVERT" ) )
+                maName.equalsIgnoreAsciiCase( "EUROCONVERT" ) )
             meType = xlExtEuroConvert;
         else
         {
             meType = xlExtName;
-            ScfTools::ConvertToScDefinedName( maName );
+            maName = ScfTools::ConvertToScDefinedName( maName );
         }
     }
     else
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index c3a39c2c351f..66bc030f8c66 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -124,8 +124,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
     else
     {
         // any other name
-        maScName = maXclName;
-        ScfTools::ConvertToScDefinedName( maScName );
+        maScName = ScfTools::ConvertToScDefinedName( maXclName );
     }
 
     // add index for local names
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index c1d9d361fb34..74cf2a429a53 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -300,7 +300,7 @@ void XclImpFont::FillToItemSet( SfxItemSet& rItemSet, XclFontItemType eType, boo
 
 // Font item
     // #i36997# do not set default Tahoma font from notes
-    bool bDefNoteFont = (eType == EXC_FONTITEM_NOTE) && (maData.maName.EqualsIgnoreCaseAscii( "Tahoma" ));
+    bool bDefNoteFont = (eType == EXC_FONTITEM_NOTE) && (maData.maName.equalsIgnoreAsciiCase( "Tahoma" ));
     if( mbFontNameUsed && !bDefNoteFont )
     {
         rtl_TextEncoding eFontEnc = maData.GetFontEncoding();
@@ -499,12 +499,12 @@ XclImpFontBuffer::XclImpFontBuffer( const XclImpRoot& rRoot ) :
         case EXC_BIFF3:
         case EXC_BIFF4:
         case EXC_BIFF5:
-            aCtrlFontData.maName.AssignAscii( "Helv" );
+            aCtrlFontData.maName = "Helv";
             aCtrlFontData.mnHeight = 160;
             aCtrlFontData.mnWeight = EXC_FONTWGHT_BOLD;
         break;
         case EXC_BIFF8:
-            aCtrlFontData.maName.AssignAscii( "Tahoma" );
+            aCtrlFontData.maName = "Tahoma";
             aCtrlFontData.mnHeight = 160;
             aCtrlFontData.mnWeight = EXC_FONTWGHT_NORMAL;
         break;
@@ -520,7 +520,7 @@ void XclImpFontBuffer::Initialize()
 
     // application font for column width calculation, later filled with first font from font list
     XclFontData aAppFontData;
-    aAppFontData.maName.AssignAscii( "Arial" );
+    aAppFontData.maName = "Arial";
     aAppFontData.mnHeight = 200;
     aAppFontData.mnWeight = EXC_FONTWGHT_NORMAL;
     UpdateAppFont( aAppFontData, false );
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 5364c79330ae..94a2550f165e 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -188,7 +188,7 @@ XclFontData::XclFontData( const SvxFont& rFont )
 
 void XclFontData::Clear()
 {
-    maName.Erase();
+    maName = "";
     maStyle.Erase();
     maColor.SetColor( COL_AUTO );
     mnHeight = 0;
@@ -239,7 +239,7 @@ FontFamily XclFontData::GetScFamily( rtl_TextEncoding eDefTextEnc ) const
         default:
             eScFamily =
                 ((eDefTextEnc == RTL_TEXTENCODING_APPLE_ROMAN) &&
-                (maName.EqualsIgnoreCaseAscii( "Geneva" ) || maName.EqualsIgnoreCaseAscii( "Chicago" ))) ?
+                (maName.equalsIgnoreAsciiCase( "Geneva" ) || maName.equalsIgnoreAsciiCase( "Chicago" ))) ?
                 FAMILY_SWISS : FAMILY_DONTKNOW;
     }
     return eScFamily;
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index b207769f8587..51b4278a14cd 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -503,13 +503,13 @@ OUString XclTools::GetBuiltInDefNameXml( sal_Unicode cBuiltIn )
 sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName )
 {
     sal_Int32 nPrefixLen = maDefNamePrefix.getLength();
-    if( String(rDefName).EqualsIgnoreCaseAscii( maDefNamePrefix, 0, nPrefixLen ) )
+    if( rDefName.startsWithIgnoreAsciiCase( maDefNamePrefix ) )
     {
         for( sal_Unicode cBuiltIn = 0; cBuiltIn < EXC_BUILTIN_UNKNOWN; ++cBuiltIn )
         {
             OUString aBuiltInName(GetXclBuiltInDefName(cBuiltIn));
             sal_Int32 nBuiltInLen = aBuiltInName.getLength();
-            if( String(rDefName).EqualsIgnoreCaseAscii( aBuiltInName, nPrefixLen, nBuiltInLen ) )
+            if( rDefName.matchIgnoreAsciiCase( aBuiltInName, nPrefixLen ) )
             {
                 // name can be followed by underline or space character
                 xub_StrLen nNextCharPos = nPrefixLen + nBuiltInLen;
@@ -583,9 +583,9 @@ bool XclTools::IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyl
     sal_Int32 nNextChar = 0;
 
     sal_Int32 nPrefixLen = 0;
-    if( String(rStyleName).EqualsIgnoreCaseAscii( maStyleNamePrefix1, 0, maStyleNamePrefix1.getLength() ) )
+    if( rStyleName.startsWithIgnoreAsciiCase( maStyleNamePrefix1 ) )
         nPrefixLen = maStyleNamePrefix1.getLength();
-    else if( String(rStyleName).EqualsIgnoreCaseAscii( maStyleNamePrefix2, 0, maStyleNamePrefix2.getLength() ) )
+    else if( rStyleName.startsWithIgnoreAsciiCase( maStyleNamePrefix2 ) )
         nPrefixLen = maStyleNamePrefix2.getLength();
     if( nPrefixLen > 0 )
     {
@@ -594,7 +594,7 @@ bool XclTools::IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyl
             if( nId != EXC_STYLE_NORMAL )
             {
                 OUString aShortName = OUString::createFromAscii(ppcStyleNames[nId]);
-                if( String(rStyleName).EqualsIgnoreCaseAscii( aShortName, nPrefixLen, aShortName.getLength() ) &&
+                if( rStyleName.matchIgnoreAsciiCase( aShortName, nPrefixLen ) &&
                     (nNextChar < nPrefixLen + aShortName.getLength()))
                 {
                     nFoundId = nId;
@@ -663,10 +663,10 @@ OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_
 
 bool XclTools::IsCondFormatStyleName( const OUString& rStyleName )
 {
-    if( String(rStyleName).EqualsIgnoreCaseAscii( maCFStyleNamePrefix1, 0, maCFStyleNamePrefix1.getLength() ) )
+    if( rStyleName.startsWithIgnoreAsciiCase( maCFStyleNamePrefix1 ) )
         return true;
 
-    if( String(rStyleName).EqualsIgnoreCaseAscii( maCFStyleNamePrefix2, 0, maCFStyleNamePrefix2.getLength() ) )
+    if( rStyleName.startsWithIgnoreAsciiCase( maCFStyleNamePrefix2 ) )
         return true;
 
     return false;
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 3623a7d6e054..496e6a7ec7fd 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -149,17 +149,18 @@ Color ScfTools::GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8
 
 /* XXX As in sc/source/core/tool/rangenam.cxx ScRangeData::IsValidName() */
 
-void ScfTools::ConvertToScDefinedName( String& rName )
+OUString ScfTools::ConvertToScDefinedName(const OUString& rName )
 {
     //fdo#37872: we don't allow points in range names any more
-    rName.SearchAndReplaceAll(static_cast<sal_Unicode>('.'),
+    String sName = rName.replace(static_cast<sal_Unicode>('.'),
         static_cast<sal_Unicode>('_'));
-    xub_StrLen nLen = rName.Len();
-    if( nLen && !ScCompiler::IsCharFlagAllConventions( rName, 0, SC_COMPILER_C_CHAR_NAME ) )
-        rName.SetChar( 0, '_' );
+    xub_StrLen nLen = sName.Len();
+    if( nLen && !ScCompiler::IsCharFlagAllConventions( sName, 0, SC_COMPILER_C_CHAR_NAME ) )
+        sName.SetChar( 0, '_' );
     for( xub_StrLen nPos = 1; nPos < nLen; ++nPos )
-        if( !ScCompiler::IsCharFlagAllConventions( rName, nPos, SC_COMPILER_C_NAME ) )
-            rName.SetChar( nPos, '_' );
+        if( !ScCompiler::IsCharFlagAllConventions( sName, nPos, SC_COMPILER_C_NAME ) )
+            sName.SetChar( nPos, '_' );
+    return sName;
 }
 
 // *** streams and storages *** -----------------------------------------------
@@ -331,17 +332,17 @@ bool ScfTools::IsHTMLTablesName( const OUString& rSource )
     return rSource.equalsIgnoreAsciiCase( GetHTMLTablesName() );
 }
 
-bool ScfTools::GetHTMLNameFromName( const String& rSource, OUString& rName )
+bool ScfTools::GetHTMLNameFromName( const OUString& rSource, OUString& rName )
 {
     rName = "";
-    if( rSource.EqualsIgnoreCaseAscii( GetHTMLNamePrefix(), 0, GetHTMLNamePrefix().Len() ) )
+    if( rSource.startsWithIgnoreAsciiCase( GetHTMLNamePrefix() ) )
     {
-        rName = rSource.Copy( GetHTMLNamePrefix().Len() );
+        rName = rSource.copy( GetHTMLNamePrefix().Len() );
         ScGlobal::AddQuotes( rName, '"', false );
     }
-    else if( rSource.EqualsIgnoreCaseAscii( GetHTMLIndexPrefix(), 0, GetHTMLIndexPrefix().Len() ) )
+    else if( rSource.startsWithIgnoreAsciiCase( GetHTMLIndexPrefix() ) )
     {
-        OUString aIndex( rSource.Copy( GetHTMLIndexPrefix().Len() ) );
+        OUString aIndex( rSource.copy( GetHTMLIndexPrefix().Len() ) );
         if( CharClass::isAsciiNumeric( aIndex ) && (aIndex.toInt32() > 0) )
             rName = aIndex;
     }
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index f28039b92baf..1a1775a10b51 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -2645,12 +2645,12 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo&
             case HTML_O_ALIGN:
             {
                 SvxCellHorJustify eVal = SVX_HOR_JUSTIFY_STANDARD;
-                const String& rOptVal = itr->GetString();
-                if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) )
+                const OUString& rOptVal = itr->GetString();
+                if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_right ) )
                     eVal = SVX_HOR_JUSTIFY_RIGHT;
-                else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) )
+                else if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_center ) )
                     eVal = SVX_HOR_JUSTIFY_CENTER;
-                else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_left ) )
+                else if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_left ) )
                     eVal = SVX_HOR_JUSTIFY_LEFT;
                 if( eVal != SVX_HOR_JUSTIFY_STANDARD )
                     rItemSet.Put( SvxHorJustifyItem( eVal, ATTR_HOR_JUSTIFY ) );
@@ -2660,12 +2660,12 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo&
             case HTML_O_VALIGN:
             {
                 SvxCellVerJustify eVal = SVX_VER_JUSTIFY_STANDARD;
-                const String& rOptVal = itr->GetString();
-                if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_VA_top ) )
+                const OUString& rOptVal = itr->GetString();
+                if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_top ) )
                     eVal = SVX_VER_JUSTIFY_TOP;
-                else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_VA_middle ) )
+                else if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_middle ) )
                     eVal = SVX_VER_JUSTIFY_CENTER;
-                else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_VA_bottom ) )
+                else if( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_bottom ) )
                     eVal = SVX_VER_JUSTIFY_BOTTOM;
                 if( eVal != SVX_VER_JUSTIFY_STANDARD )
                     rItemSet.Put( SvxVerJustifyItem( eVal, ATTR_VER_JUSTIFY ) );
diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx
index 437c5c754bb6..8ff00864252e 100644
--- a/sc/source/filter/inc/dif.hxx
+++ b/sc/source/filter/inc/dif.hxx
@@ -22,7 +22,6 @@
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
-#include <tools/string.hxx>
 #include <rtl/ustring.hxx>
 
 #include "address.hxx"
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index f0de420a792c..0a6b7be537a7 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -20,9 +20,10 @@
 #ifndef SC_EXCRECDS_HXX
 #define SC_EXCRECDS_HXX
 
-#include <tools/solar.h>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/zforlist.hxx>
-#include <tools/string.hxx>
+#include <tools/solar.h>
 #include <vcl/vclenum.hxx>
 
 
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 9384d415cf87..1e232152315f 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -158,7 +158,7 @@ public:
         @descr  Defined names in Calc may contain letters, digits (*), underscores, periods (*),
         colons (*), question marks, and dollar signs.
         (*) = not allowed at first position. */
-    static void         ConvertToScDefinedName( String& rName );
+    static OUString  ConvertToScDefinedName( const OUString& rName );
 
 // *** streams and storages *** -----------------------------------------------
 
@@ -250,7 +250,7 @@ public:
         @param rSource  The string to be determined.
         @param rName  The HTML table name.
         @return  true, if conversion was successful. */
-    static bool         GetHTMLNameFromName( const String& rSource, OUString& rName );
+    static bool         GetHTMLNameFromName( const OUString& rSource, OUString& rName );
 
 private:
     /** Returns the prefix for table index names. */
diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx
index 8b292247b415..b0e2717f4739 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -21,7 +21,7 @@
 #define SC_LOTFNTBF_HXX
 
 #include <tools/solar.h>
-
+#include <tools/string.hxx>
 #include "scitems.hxx"
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx
index 06dd7af8247d..ae07457f1b68 100644
--- a/sc/source/filter/inc/lotform.hxx
+++ b/sc/source/filter/inc/lotform.hxx
@@ -21,10 +21,7 @@
 #define SC_LOTFORM_HXX
 
 #include "formel.hxx"
-#include <tools/string.hxx>
-
-
-
+#include <rtl/ustring.hxx>
 
 enum FUNC_TYPE
 {
diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx
index 8ed34291c8e2..4de38500df66 100644
--- a/sc/source/filter/inc/lotimpop.hxx
+++ b/sc/source/filter/inc/lotimpop.hxx
@@ -20,7 +20,7 @@
 #ifndef SC_LOTIMPOP_HXX
 #define SC_LOTIMPOP_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 #include "imp_op.hxx"
 #include "flttypes.hxx"
diff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx
index 4e6d376d5ba5..d6a654eff5e4 100644
--- a/sc/source/filter/inc/qpro.hxx
+++ b/sc/source/filter/inc/qpro.hxx
@@ -20,9 +20,9 @@
 #ifndef SC_QPRO_HXX
 #define SC_QPRO_HXX
 
+#include <rtl/ustring.hxx>
 #include <sal/config.h>
 #include "filter.hxx"
-#include <tools/string.hxx>
 
 #include "flttypes.hxx"
 #include "ftools.hxx"
diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx
index 145d14666d07..eb58bf816735 100644
--- a/sc/source/filter/inc/qprostyle.hxx
+++ b/sc/source/filter/inc/qprostyle.hxx
@@ -21,9 +21,9 @@
 #ifndef SC_QPROSTYLE_HXX
 #define SC_QPROSTYLE_HXX
 
+#include <rtl/ustring.hxx>
 #include <sal/config.h>
 #include "filter.hxx"
-#include <tools/string.hxx>
 
 #include "flttypes.hxx"
 #include "ftools.hxx"
diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx
index bacc26b7c4c6..4a0f23c3132d 100644
--- a/sc/source/filter/inc/xilink.hxx
+++ b/sc/source/filter/inc/xilink.hxx
@@ -140,9 +140,9 @@ public:
 
     bool                HasFormulaTokens() const;
 
-    inline XclImpExtNameType GetType() const { return meType; }
-    inline const String& GetName() const { return maName; }
-    inline sal_uInt32   GetStorageId() const { return mnStorageId; }
+    XclImpExtNameType GetType() const { return meType; }
+    const OUString& GetName() const { return maName; }
+    sal_uInt32   GetStorageId() const { return mnStorageId; }
 
 private:
     typedef ::std::auto_ptr< XclImpCachedMatrix > XclImpCachedMatrixPtr;
@@ -151,7 +151,7 @@ private:
     XclImpCachedMatrixPtr mxDdeMatrix;      /// Cached results of the DDE link.
     MOper*              mpMOper;            /// Cached values for OLE link
     TokenArrayPtr       mxArray;            /// Formula tokens for external name.
-    String              maName;             /// The name of the external name.
+    OUString            maName;             /// The name of the external name.
     sal_uInt32          mnStorageId;        /// Storage ID for OLE object storages.
     XclImpExtNameType   meType;             /// Type of the external name.
 };
diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx
index 8511f0782374..9cd2a2e3002f 100644
--- a/sc/source/filter/inc/xlstyle.hxx
+++ b/sc/source/filter/inc/xlstyle.hxx
@@ -287,7 +287,7 @@ class SvxFont;
  */
 struct XclFontData
 {
-    String              maName;         /// Font name.
+    OUString            maName;         /// Font name.
     String              maStyle;        /// String with styles (bold, italic).
     Color               maColor;        /// Font color.
     sal_uInt16          mnHeight;       /// Font height in twips (1/20 of a point).
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 152b1f01eddf..608a38ab6fc6 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -236,7 +236,7 @@ void OP_NamedRange( SvStream& r, sal_uInt16 /*n*/ )
 
         String        aTmp( cBuf, pLotusRoot->eCharsetQ );
 
-        ScfTools::ConvertToScDefinedName( aTmp );
+        aTmp = ScfTools::ConvertToScDefinedName( aTmp );
 
         pLotusRoot->pRangeNames->Append( pRange, aTmp );
     }
@@ -275,7 +275,7 @@ void OP_SymphNamedRange( SvStream& r, sal_uInt16 /*n*/ )
             strcpy( cBuf, cPuffer );           // #100211# - checked
 
         String    aTmp( cBuf, pLotusRoot->eCharsetQ );
-        ScfTools::ConvertToScDefinedName( aTmp );
+        aTmp = ScfTools::ConvertToScDefinedName( aTmp );
 
         pLotusRoot->pRangeNames->Append( pRange, aTmp );
     }
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 3fc0c6e343f4..216d5e81d486 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -506,8 +506,7 @@ RangeNameBufferWK3::~RangeNameBufferWK3()
 
 void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rCRD )
 {
-    String              aScName( rOrgName );
-    ScfTools::ConvertToScDefinedName( aScName );
+    String aScName = ScfTools::ConvertToScDefinedName(rOrgName);
 
     Entry aInsert( rOrgName, aScName, rCRD );
 
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 90506f4f8954..31e5bea9521d 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -112,7 +112,6 @@
 #include <tools/date.hxx>
 #include <i18nlangtag/lang.h>
 #include <comphelper/extract.hxx>
-#include <tools/string.hxx>
 
 using namespace com::sun::star;
 using namespace xmloff::token;
@@ -1274,13 +1273,13 @@ namespace {
 OUString getOutputString( ScDocument* pDoc, const ScAddress& aCellPos )
 {
     if (!pDoc)
-        return EMPTY_OUSTRING;
+        return OUString();
 
     CellType eType = pDoc->GetCellType(aCellPos);
     switch (eType)
     {
         case CELLTYPE_NONE:
-            return EMPTY_OUSTRING;
+            return OUString();
         case CELLTYPE_EDIT:
         {
             //  GetString an der EditCell macht Leerzeichen aus Umbruechen,
@@ -1306,7 +1305,7 @@ OUString getOutputString( ScDocument* pDoc, const ScAddress& aCellPos )
         }
     }
 
-    return EMPTY_OUSTRING;
+    return OUString();
 }
 
 }
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index be8c9f64922f..73eb197b8d8f 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -48,8 +48,8 @@ ScImportOptions::ScImportOptions( const String& rStr )
     if ( nTokenCount >= 3 )
     {
         // first 3 tokens: common
-        String aToken( rStr.GetToken( 0, ',' ) );
-        if( aToken.EqualsIgnoreCaseAscii( pStrFix ) )
+        OUString aToken( rStr.GetToken( 0, ',' ) );
+        if( aToken.equalsIgnoreAsciiCase( pStrFix ) )
             bFixedWidth = sal_True;
         else
             nFieldSepCode = ScAsciiOptions::GetWeightedFieldSep( aToken, true);
diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx
index 03a887fee7ce..be2d6d6119e5 100644
--- a/sc/source/ui/inc/lnktrans.hxx
+++ b/sc/source/ui/inc/lnktrans.hxx
@@ -21,7 +21,7 @@
 #define SC_LNKTRANS_HXX
 
 #include <svtools/transfer.hxx>
-
+#include <tools/string.hxx>
 
 class ScLinkTransferObj : public TransferableHelper
 {
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index a051c104aa30..a40500c4eed4 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -259,8 +259,8 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
             //  ascii export (import is handled above)
 
             INetURLObject aURL( aFileName );
-            String aExt(aURL.getExtension());
-            if (aExt.EqualsIgnoreCaseAscii("CSV"))
+            OUString aExt(aURL.getExtension());
+            if (aExt.equalsIgnoreAsciiCase("CSV"))
                 cAsciiDel = ',';
             else
                 cAsciiDel = '\t';
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index c8f8bea3455e..2e9b3431f4f4 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -98,14 +98,13 @@ public:
     {
         SolarMutexGuard aGuard;
         maCachedObject = uno::Any(); // clear cached object
-        String sName = aName;
 
         ScDocument* pDoc = mpDocShell->GetDocument();
         if ( !pDoc )
             throw uno::RuntimeException();
-        // aName ( sName ) is generated from the stream name which can be different ( case-wise )
+        // aName is generated from the stream name which can be different ( case-wise )
         // from the code name
-        if( sName.EqualsIgnoreCaseAscii( pDoc->GetCodeName() ) )
+        if( aName.equalsIgnoreAsciiCase( pDoc->GetCodeName() ) )
             maCachedObject = maWorkbook;
         else
         {
@@ -114,9 +113,9 @@ public:
             for( SCTAB i = 0; i < nCount; i++ )
             {
                 pDoc->GetCodeName( i, sCodeName );
-                // aName ( sName ) is generated from the stream name which can be different ( case-wise )
+                // aName is generated from the stream name which can be different ( case-wise )
                 // from the code name
-                if( String(sCodeName).EqualsIgnoreCaseAscii( sName ) )
+                if( sCodeName.equalsIgnoreAsciiCase( aName ) )
                 {
                     OUString sSheetName;
                     if( pDoc->GetName( i, sSheetName ) )