convert sc/source/ui/inc/a*.hxx from String to OUString

Change-Id: Ia127776aed43eb634b4a7b87d03000d0d53c3b64

14 files changed, 84 insertions, 84 deletions

diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 65f8778d50a2..08287635a055 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -1413,7 +1413,7 @@ sal_Int32 ScAccessibleCsvGrid::implGetSelColumn( sal_Int32 nSelColumn ) const
     return 0;
 }
 
-String ScAccessibleCsvGrid::implGetCellText( sal_Int32 nRow, sal_Int32 nColumn ) const
+OUString ScAccessibleCsvGrid::implGetCellText( sal_Int32 nRow, sal_Int32 nColumn ) const
 {
     ScCsvGrid& rGrid = implGetGrid();
     sal_Int32 nLine = nRow + rGrid.GetFirstVisLine() - 1;
@@ -1440,7 +1440,7 @@ DBG_NAME( ScAccessibleCsvCell )
 
 ScAccessibleCsvCell::ScAccessibleCsvCell(
         ScCsvGrid& rGrid,
-        const String& rCellText,
+        const OUString& rCellText,
         sal_Int32 nRow, sal_Int32 nColumn ) :
     ScAccessibleCsvControl( rGrid.GetAccessible(), rGrid, nCellRole ),
     AccessibleStaticTextBase( SvxEditSourcePtr( NULL ) ),
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index b190894f9aaf..1692e9aa689c 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -760,7 +760,7 @@ ScAccessibleTextData* ScAccessibleCellTextData::Clone() const
     return new ScAccessibleCellTextData( mpViewShell, aCellPos, meSplitPos, mpAccessibleCell );
 }
 
-void ScAccessibleCellTextData::GetCellText(const ScAddress& rCellPos, String& rText)
+void ScAccessibleCellTextData::GetCellText(const ScAddress& rCellPos, OUString& rText)
 {
 //  #104893#; don't use the input string
 //    ScCellTextData::GetCellText(rCellPos, rText);
@@ -781,7 +781,7 @@ void ScAccessibleCellTextData::GetCellText(const ScAddress& rCellPos, String& rT
             else if (!aOptions.GetOption( VOPT_NULLVALS ))
             {
                 if ((aCellType == CELLTYPE_VALUE || aCellType == CELLTYPE_FORMULA) && pDoc->GetValue(rCellPos) == 0.0)
-                    rText.Erase();
+                    rText = "";
             }
         }
     }
@@ -1323,7 +1323,7 @@ ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewSh
 //  ScAccessiblePreviewHeaderCellTextData: shared data between sub objects of a accessible cell text object
 
 ScAccessiblePreviewHeaderCellTextData::ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell,
-            const String& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader)
+            const OUString& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader)
     : ScAccessibleCellBaseTextData(GetDocShell(pViewShell), rP),
     mpViewForwarder(NULL),
     mpViewShell(pViewShell),
@@ -1387,7 +1387,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
     if (bDataValid)
         return pForwarder;
 
-    if (maText.Len() && pEditEngine)
+    if (!maText.isEmpty() && pEditEngine)
     {
 
         if ( mpViewShell  )
@@ -1544,7 +1544,7 @@ SvxViewForwarder* ScAccessibleHeaderTextData::GetViewForwarder()
 }
 
 ScAccessibleNoteTextData::ScAccessibleNoteTextData(ScPreviewShell* pViewShell,
-                            const String& sText, const ScAddress& aCellPos, sal_Bool bMarkNote)
+                            const OUString& sText, const ScAddress& aCellPos, sal_Bool bMarkNote)
     :
     mpViewForwarder(NULL),
     mpViewShell(pViewShell),
@@ -1620,7 +1620,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
     if (mbDataValid)
         return mpForwarder;
 
-    if (msText.Len() && mpEditEngine)
+    if (!msText.isEmpty() && mpEditEngine)
     {
 
         if ( mpViewShell  )
@@ -1708,7 +1708,7 @@ void ScCsvViewForwarder::SetInvalid()
 
 ScAccessibleCsvTextData::ScAccessibleCsvTextData(
         Window* pWindow, EditEngine* pEditEngine,
-        const String& rCellText, const Rectangle& rBoundBox, const Size& rCellSize ) :
+        const OUString& rCellText, const Rectangle& rBoundBox, const Size& rCellSize ) :
     mpWindow( pWindow ),
     mpEditEngine( pEditEngine ),
     maCellText( rCellText ),
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 0232367a7fca..ba7ee4ab45c3 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -179,7 +179,7 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
     return false;
 }
 
-static String lcl_decodeSepString( const String & rSepNums, bool & o_bMergeFieldSeps )
+static OUString lcl_decodeSepString( const String & rSepNums, bool & o_bMergeFieldSeps )
 {
     String aFieldSeps;
     xub_StrLen nSub = comphelper::string::getTokenCount( rSepNums, '/');
@@ -201,7 +201,7 @@ static String lcl_decodeSepString( const String & rSepNums, bool & o_bMergeField
 // The options string must not contain semicolons (because of the pick list),
 // use comma as separator.
 
-void ScAsciiOptions::ReadFromString( const String& rString )
+void ScAsciiOptions::ReadFromString( const OUString& rString )
 {
     xub_StrLen nCount = comphelper::string::getTokenCount(rString, ',');
     String aToken;
@@ -211,7 +211,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
     {
         bFixedLen = bMergeFieldSeps = false;
 
-        aToken = rString.GetToken(0,',');
+        aToken = rString.getToken(0,',');
         if ( aToken.EqualsAscii(pStrFix) )
             bFixedLen = true;
         aFieldSeps = lcl_decodeSepString( aToken, bMergeFieldSeps);
@@ -220,7 +220,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
     // Text separator.
     if ( nCount >= 2 )
     {
-        aToken = rString.GetToken(1,',');
+        aToken = rString.getToken(1,',');
         sal_Int32 nVal = aToken.ToInt32();
         cTextSep = (sal_Unicode) nVal;
     }
@@ -228,14 +228,14 @@ void ScAsciiOptions::ReadFromString( const String& rString )
     // Text encoding.
     if ( nCount >= 3 )
     {
-        aToken = rString.GetToken(2,',');
+        aToken = rString.getToken(2,',');
         eCharSet = ScGlobal::GetCharsetValue( aToken );
     }
 
     // Number of start row.
     if ( nCount >= 4 )
     {
-        aToken = rString.GetToken(3,',');
+        aToken = rString.getToken(3,',');
         nStartRow = aToken.ToInt32();
     }
 
@@ -245,7 +245,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
         delete[] pColStart;
         delete[] pColFormat;
 
-        aToken = rString.GetToken(4,',');
+        aToken = rString.getToken(4,',');
         xub_StrLen nSub = comphelper::string::getTokenCount(aToken, '/');
         nInfoCount = nSub / 2;
         if (nInfoCount)
@@ -268,21 +268,21 @@ void ScAsciiOptions::ReadFromString( const String& rString )
     // Language
     if (nCount >= 6)
     {
-        aToken = rString.GetToken(5, ',');
+        aToken = rString.getToken(5, ',');
         eLang = static_cast<LanguageType>(aToken.ToInt32());
     }
 
     // Import quoted field as text.
     if (nCount >= 7)
     {
-        aToken = rString.GetToken(6, ',');
+        aToken = rString.getToken(6, ',');
         bQuotedFieldAsText = aToken.EqualsAscii("true") ? true : false;
     }
 
     // Detect special numbers.
     if (nCount >= 8)
     {
-        aToken = rString.GetToken(7, ',');
+        aToken = rString.getToken(7, ',');
         bDetectSpecialNumber = aToken.EqualsAscii("true") ? true : false;
     }
     else
@@ -293,23 +293,23 @@ void ScAsciiOptions::ReadFromString( const String& rString )
 }
 
 
-String ScAsciiOptions::WriteToString() const
+OUString ScAsciiOptions::WriteToString() const
 {
     OUString aOutStr;
 
     // Field separator.
     if ( bFixedLen )
         aOutStr += pStrFix;
-    else if ( !aFieldSeps.Len() )
+    else if ( aFieldSeps.isEmpty() )
         aOutStr += "0";
     else
     {
-        xub_StrLen nLen = aFieldSeps.Len();
-        for (xub_StrLen i=0; i<nLen; i++)
+        sal_Int32 nLen = aFieldSeps.getLength();
+        for (sal_Int32 i=0; i<nLen; i++)
         {
             if (i)
                 aOutStr += "/";
-            aOutStr += OUString::number(aFieldSeps.GetChar(i));
+            aOutStr += OUString::number(aFieldSeps[i]);
         }
         if ( bMergeFieldSeps )
         {
@@ -359,7 +359,7 @@ String ScAsciiOptions::WriteToString() const
 }
 
 // static
-sal_Unicode ScAsciiOptions::GetWeightedFieldSep( const String & rFieldSeps, bool bDecodeNumbers )
+sal_Unicode ScAsciiOptions::GetWeightedFieldSep( const OUString & rFieldSeps, bool bDecodeNumbers )
 {
     bool bMergeFieldSeps = false;
     String aFieldSeps( bDecodeNumbers ? lcl_decodeSepString( rFieldSeps, bMergeFieldSeps) : rFieldSeps);
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index ed5ca1c2d8c5..06963ee669fd 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -93,8 +93,8 @@ ScAutoStyleList::~ScAutoStyleList()
 
 //  initial short delay (asynchronous call)
 
-void ScAutoStyleList::AddInitial( const ScRange& rRange, const String& rStyle1,
-                                    sal_uLong nTimeout, const String& rStyle2 )
+void ScAutoStyleList::AddInitial( const ScRange& rRange, const OUString& rStyle1,
+                                    sal_uLong nTimeout, const OUString& rStyle2 )
 {
     aInitials.push_back(new ScAutoStyleInitData( rRange, rStyle1, nTimeout, rStyle2 ));
     aInitTimer.Start();
@@ -118,7 +118,7 @@ IMPL_LINK_NOARG(ScAutoStyleList, InitHdl)
     return 0;
 }
 
-void ScAutoStyleList::AddEntry( sal_uLong nTimeout, const ScRange& rRange, const String& rStyle )
+void ScAutoStyleList::AddEntry( sal_uLong nTimeout, const ScRange& rRange, const OUString& rStyle )
 {
     aTimer.Stop();
     sal_uLong nNow = TimeNow();
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index bf2926eb4946..822aec9236bf 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -539,7 +539,7 @@ private:
     inline sal_Int32 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return nRow * implGetColumnCount() + nColumn; }
 
     /** Returns the contents of the specified cell (including header). Indexes must be valid. */
-    String implGetCellText( sal_Int32 nRow, sal_Int32 nColumn ) const;
+    OUString implGetCellText( sal_Int32 nRow, sal_Int32 nColumn ) const;
     /** Creates a new accessible object of the specified cell. Indexes must be valid. */
     ScAccessibleCsvControl* implCreateCellObj( sal_Int32 nRow, sal_Int32 nColumn ) const;
 };
@@ -556,7 +556,7 @@ protected:
     typedef ::std::auto_ptr< SvxEditSource >        SvxEditSourcePtr;
 
 private:
-    String                      maCellText; /// The text contents of this cell.
+    OUString                    maCellText; /// The text contents of this cell.
     sal_Int32                   mnLine;     /// The grid line index (core index).
     sal_uInt32                  mnColumn;   /// The grid column index (core index).
     sal_Int32                   mnIndex;    /// The index of the cell in the table.
@@ -564,7 +564,7 @@ private:
 public:
     explicit                    ScAccessibleCsvCell(
                                     ScCsvGrid& rGrid,
-                                    const String& rCellText,
+                                    const OUString& rCellText,
                                     sal_Int32 nRow, sal_Int32 nColumn );
     virtual                     ~ScAccessibleCsvCell();
 
diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx
index f7aefc32d277..e98d1336ead7 100644
--- a/sc/source/ui/inc/AccessibleText.hxx
+++ b/sc/source/ui/inc/AccessibleText.hxx
@@ -106,7 +106,7 @@ public:
 
     DECL_LINK( NotifyHdl, EENotify* );
 protected:
-    virtual void            GetCellText(const ScAddress& rCellPos, String& rText);
+    virtual void            GetCellText(const ScAddress& rCellPos, OUString& rText);
 private:
     ScViewForwarder* mpViewForwarder;
     ScEditViewForwarder* mpEditViewForwarder;
@@ -212,7 +212,7 @@ class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextDat
 {
 public:
                         ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell,
-                            const String& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader);
+                            const OUString& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader);
     virtual             ~ScAccessiblePreviewHeaderCellTextData();
 
     virtual ScAccessibleTextData* Clone() const;
@@ -226,7 +226,7 @@ public:
 private:
     ScPreviewViewForwarder* mpViewForwarder;
     ScPreviewShell* mpViewShell;
-    String          maText;
+    OUString        maText;
     sal_Bool        mbColHeader;
     sal_Bool        mbRowHeader;
 
@@ -277,7 +277,7 @@ class ScAccessibleNoteTextData : public ScAccessibleTextData
 {
 public:
                         ScAccessibleNoteTextData(ScPreviewShell* pViewShell,
-                            const String& sText, const ScAddress& aCellPos, sal_Bool bMarkNote);
+                            const OUString& sText, const ScAddress& aCellPos, sal_Bool bMarkNote);
     virtual             ~ScAccessibleNoteTextData();
 
     virtual ScAccessibleTextData* Clone() const;
@@ -297,7 +297,7 @@ private:
     ScEditEngineDefaulter*  mpEditEngine;
     SvxEditEngineForwarder* mpForwarder;
     ScDocShell*             mpDocSh;
-    String                  msText;
+    OUString                msText;
     ScAddress               maCellPos;
     sal_Bool                mbMarkNote;
     sal_Bool                mbDataValid;
@@ -316,7 +316,7 @@ private:
     EditEngine*                 mpEditEngine;
     TextForwarderPtr            mpTextForwarder;
     ViewForwarderPtr            mpViewForwarder;
-    String                      maCellText;
+    OUString                    maCellText;
     Rectangle                   maBoundBox;
     Size                        maCellSize;
 
@@ -324,7 +324,7 @@ public:
     explicit                    ScAccessibleCsvTextData(
                                     Window* pWindow,
                                     EditEngine* pEditEngine,
-                                    const String& rCellText,
+                                    const OUString& rCellText,
                                     const Rectangle& rBoundBox,
                                     const Size& rCellSize );
     virtual                     ~ScAccessibleCsvTextData();
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 5ef3382c6b78..d097dd8e3db9 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -48,27 +48,27 @@ class ScDocument;
 class ScViewEntryPtr
 {
 private:
-    String*         pAction;
-    String*         pPos;
-    String*         pAuthor;
-    String*         pDate;
-    String*         pComment;
+    OUString*       pAction;
+    OUString*       pPos;
+    OUString*       pAuthor;
+    OUString*       pDate;
+    OUString*       pComment;
     void*           pData;
 
 public:
 
-    String*         GetpAction()    {return pAction; }
-    String*         GetpPos()       {return pPos;    }
-    String*         GetpAuthor()    {return pAuthor; }
-    String*         GetpDate()      {return pDate;   }
-    String*         GetpComment()   {return pComment;}
+    OUString*       GetpAction()    {return pAction; }
+    OUString*       GetpPos()       {return pPos;    }
+    OUString*       GetpAuthor()    {return pAuthor; }
+    OUString*       GetpDate()      {return pDate;   }
+    OUString*       GetpComment()   {return pComment;}
     void*           GetpData()      {return pData;   }
 
-    void        SetpAction (String* pString)    {pAction= pString;}
-    void        SetpPos    (String* pString)    {pPos   = pString;}
-    void        SetpAuthor (String* pString)    {pAuthor= pString;}
-    void        SetpDate   (String* pString)    {pDate  = pString;}
-    void        SetpComment(String* pString)    {pComment=pString;}
+    void        SetpAction (OUString* pString)    {pAction= pString;}
+    void        SetpPos    (OUString* pString)    {pPos   = pString;}
+    void        SetpAuthor (OUString* pString)    {pAuthor= pString;}
+    void        SetpDate   (OUString* pString)    {pDate  = pString;}
+    void        SetpComment(OUString* pString)    {pComment=pString;}
     void        SetpData   (void*   pdata)      {pData   =pdata;}
 };
 
@@ -148,7 +148,7 @@ private:
     DECL_LINK( AcceptAllHandle, void*);
     DECL_LINK( ExpandingHandle, SvxRedlinTable*);
     DECL_LINK( SelectHandle, void*);
-    DECL_LINK( RefInfoHandle, String*);
+    DECL_LINK( RefInfoHandle, OUString*);
 
     DECL_LINK( UpdateSelectionHdl, void*);
     DECL_LINK( ChgTrackModHdl, ScChangeTrack*);
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index e26410f9403e..85f6d23c4e10 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -55,7 +55,7 @@ class ScFormulaReferenceHelper
     sal_Int32           m_nOldBorderWidth;      // border width for expanded dialog
     SCTAB               nRefTab;                // used for ShowReference
 
-    String              sOldDialogText;         // Original title of the dialog window
+    OUString            sOldDialogText;         // Original title of the dialog window
     Size                aOldDialogSize;         // Original size of the dialog window
     Point               aOldEditPos;            // Original position of the input field
     Size                aOldEditSize;           // Original size of the input field
@@ -77,7 +77,7 @@ public:
 
     void                ShowSimpleReference(const OUString& rStr);
     void                ShowFormulaReference(const OUString& rStr);
-    bool                ParseWithNames( ScRangeList& rRanges, const String& rStr, ScDocument* pDoc );
+    bool                ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc );
     void                Init();
 
     void                ShowReference(const OUString& rStr);
@@ -124,7 +124,7 @@ private:
 
     Window*             pActiveWin;
     Timer               aTimer;
-    String              aDocName;               // document on which the dialog was opened
+    OUString            aDocName;               // document on which the dialog was opened
 
     DECL_LINK( UpdateFocusHdl, void* );
 
@@ -139,7 +139,7 @@ protected:
     void                ShowSimpleReference(const OUString& rStr);
     void                ShowFormulaReference(const OUString& rStr);
 
-    bool                ParseWithNames( ScRangeList& rRanges, const String& rStr, ScDocument* pDoc );
+    bool                ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc );
 
     void preNotify(const NotifyEvent& rEvent, const bool bBindRef);
     void stateChanged(const StateChangedType nStateChange, const bool bBindRef);
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index bc1a41d612ba..3a40ae5c0734 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -40,7 +40,7 @@ class ScAsciiOptions
 {
 private:
     bool        bFixedLen;
-    String      aFieldSeps;
+    OUString    aFieldSeps;
     bool        bMergeFieldSeps;
     bool        bQuotedFieldAsText;
     bool        bDetectSpecialNumber;
@@ -64,14 +64,14 @@ public:
 
     bool            operator==( const ScAsciiOptions& rCmp ) const;
 
-    void            ReadFromString( const String& rString );
-    String          WriteToString() const;
+    void            ReadFromString( const OUString& rString );
+    OUString        WriteToString() const;
 
-    void            InterpretColumnList( const String& rString );
+    void            InterpretColumnList( const OUString& rString );
 
     CharSet             GetCharSet() const      { return eCharSet; }
     bool                GetCharSetSystem() const    { return bCharSetSystem; }
-    const String&       GetFieldSeps() const    { return aFieldSeps; }
+    const OUString&     GetFieldSeps() const    { return aFieldSeps; }
     bool                IsMergeSeps() const     { return bMergeFieldSeps; }
     bool                IsQuotedAsText() const  { return bQuotedFieldAsText; }
     bool                IsDetectSpecialNumber() const { return bDetectSpecialNumber; }
@@ -86,7 +86,7 @@ public:
     void    SetCharSet( CharSet eNew )          { eCharSet = eNew; }
     void    SetCharSetSystem( bool bSet )       { bCharSetSystem = bSet; }
     void    SetFixedLen( bool bSet )            { bFixedLen = bSet; }
-    void    SetFieldSeps( const String& rStr )  { aFieldSeps = rStr; }
+    void    SetFieldSeps( const OUString& rStr )  { aFieldSeps = rStr; }
     void    SetMergeSeps( bool bSet )           { bMergeFieldSeps = bSet; }
     void    SetQuotedAsText(bool bSet)          { bQuotedFieldAsText = bSet; }
     void    SetDetectSpecialNumber(bool bSet)   { bDetectSpecialNumber = bSet; }
@@ -108,7 +108,7 @@ public:
                 If FALSE, the string is taken as is and each character is
                 expected to be one separator.
      */
-    static sal_Unicode  GetWeightedFieldSep( const String & rFieldSeps, bool bDecodeNumbers );
+    static sal_Unicode  GetWeightedFieldSep( const OUString & rFieldSeps, bool bDecodeNumbers );
 };
 
 /// How ScImportAsciiDlg is called
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index 2c4c7b9dd893..775522b5d15e 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -69,13 +69,13 @@ private:
     long                    mnDataColWidth1;
     long                    mnDataColWidth2;
     long                    mnRowHeight;
-    const String            aStrJan;
-    const String            aStrFeb;
-    const String            aStrMar;
-    const String            aStrNorth;
-    const String            aStrMid;
-    const String            aStrSouth;
-    const String            aStrSum;
+    const OUString          aStrJan;
+    const OUString          aStrFeb;
+    const OUString          aStrMar;
+    const OUString          aStrNorth;
+    const OUString          aStrMid;
+    const OUString          aStrSouth;
+    const OUString          aStrSum;
     SvNumberFormatter*      pNumFmt;
     //-------------------------------------------
     SC_DLLPRIVATE void  Init            ();
@@ -101,7 +101,7 @@ private:
                               Font& rCJKFont,
                               Font& rCTLFont );
 
-    SC_DLLPRIVATE String    MakeNumberString( String cellString, sal_Bool bAddDec );
+    SC_DLLPRIVATE OUString MakeNumberString( OUString cellString, sal_Bool bAddDec );
     SC_DLLPRIVATE void  DrawFrameLine   ( const ::editeng::SvxBorderLine&   rLineD,
                               Point                 from,
                               Point                 to,
diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index 8aef06f0a154..d4498662867c 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -52,9 +52,9 @@ public:
             ScAutoStyleList(ScDocShell* pShell);
             ~ScAutoStyleList();
 
-    void    AddInitial( const ScRange& rRange, const String& rStyle1,
-                        sal_uLong nTimeout, const String& rStyle2 );
-    void    AddEntry( sal_uLong nTimeout, const ScRange& rRange, const String& rStyle );
+    void    AddInitial( const ScRange& rRange, const OUString& rStyle1,
+                        sal_uLong nTimeout, const OUString& rStyle2 );
+    void    AddEntry( sal_uLong nTimeout, const ScRange& rRange, const OUString& rStyle );
 
     void    ExecuteAllNow();
 };
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 1eb077a7a0ae..07258761667f 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -888,7 +888,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle)
     return 0;
 }
 
-IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, String*, pResult)
+IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult)
 {
     sal_uInt16 nId;
 
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 834485e4390a..de361eb2aa80 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -141,7 +141,7 @@ void ScFormulaReferenceHelper::ShowSimpleReference(const OUString& rStr)
     }
 }
 // -----------------------------------------------------------------------------
-bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const String& rStr, ScDocument* pDoc )
+bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc )
 {
     bool bError = false;
     rRanges.RemoveAll();
@@ -152,7 +152,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const Strin
     for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
     {
         ScRange aRange;
-        String aRangeStr( rStr.GetToken( nToken ) );
+        String aRangeStr( rStr.getToken( nToken, ';' ) );
 
         sal_uInt16 nFlags = aRange.ParseAny( aRangeStr, pDoc, aDetails );
         if ( nFlags & SCA_VALID )
@@ -898,7 +898,7 @@ sal_Bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const   // pDocSh ma
         aCmpName = pDocSh->GetTitle();
 
     //  if aDocName isn't initialized, allow
-    return ( aDocName.Len() == 0 || aDocName == aCmpName );
+    return ( aDocName.isEmpty() || aDocName == aCmpName );
 }
 
 //----------------------------------------------------------------------------
@@ -1004,7 +1004,7 @@ IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl)
     return 0;
 }
 // -----------------------------------------------------------------------------
-bool ScRefHandler::ParseWithNames( ScRangeList& rRanges, const String& rStr, ScDocument* pDoc )
+bool ScRefHandler::ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc )
 {
     return m_aHelper.ParseWithNames( rRanges, rStr, pDoc );
 }
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 3976e21760f7..fd49c4129d69 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -952,7 +952,7 @@ ScCellEditSource* ScCellTextData::GetOriginalSource()
     return pOriginalSource;
 }
 
-void ScCellTextData::GetCellText(const ScAddress& rCellPos, String& rText)
+void ScCellTextData::GetCellText(const ScAddress& rCellPos, OUString& rText)
 {
     if (pDocShell)
     {
@@ -990,7 +990,7 @@ SvxTextForwarder* ScCellTextData::GetTextForwarder()
     if (bDataValid)
         return pForwarder;
 
-    String aText;
+    OUString aText;
 
     if (pDocShell)
     {
@@ -1013,7 +1013,7 @@ SvxTextForwarder* ScCellTextData::GetTextForwarder()
         else
         {
             GetCellText(aCellPos, aText);
-            if (aText.Len())
+            if (!aText.isEmpty())
                 pEditEngine->SetTextNewDefaults(aText, aDefaults);
             else
                 pEditEngine->SetDefaults(aDefaults);