convert sc/.../undoblk.hxx from String to OUString

Change-Id: If15afa4688f5b06bb5650ea76fc2679f98e45a3a

3 files changed, 39 insertions, 39 deletions

diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 293bb3997815..129e35ad4ddf 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -491,7 +491,7 @@ public:
                     ScUndoReplace( ScDocShell* pNewDocShell,
                                    const ScMarkData& rMark,
                                    SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
-                                   const String& rNewUndoStr, ScDocument* pNewUndoDoc,
+                                   const OUString& rNewUndoStr, ScDocument* pNewUndoDoc,
                                    const SvxSearchItem* pItem );
     virtual         ~ScUndoReplace();
 
@@ -505,7 +505,7 @@ public:
 private:
     ScAddress       aCursorPos;
     ScMarkData      aMarkData;
-    String          aUndoStr;           // Data at single selection
+    OUString        aUndoStr;           // Data at single selection
     ScDocument*     pUndoDoc;           // Block mark and deleted data
     SvxSearchItem*  pSearchItem;
     sal_uLong           nStartChangeAction;
@@ -641,7 +641,7 @@ public:
                     ScUndoUseScenario( ScDocShell* pNewDocShell,
                                        const ScMarkData& rMark,
                                        const ScArea& rDestArea, ScDocument* pNewUndoDoc,
-                                       const String& rNewName );
+                                       const OUString& rNewName );
     virtual         ~ScUndoUseScenario();
 
     virtual void    Undo();
@@ -655,7 +655,7 @@ private:
     ScDocument*     pUndoDoc;
     ScRange         aRange;
     ScMarkData      aMarkData;
-    String          aName;
+    OUString        aName;
 };
 
 
@@ -666,7 +666,7 @@ public:
                     ScUndoSelectionStyle( ScDocShell* pNewDocShell,
                                           const ScMarkData& rMark,
                                           const ScRange& rRange,
-                                          const String& rName,
+                                          const OUString& rName,
                                           ScDocument* pNewUndoDoc );
     virtual         ~ScUndoSelectionStyle();
 
@@ -681,7 +681,7 @@ public:
 private:
     ScMarkData      aMarkData;
     ScDocument*     pUndoDoc;
-    String          aStyleName;
+    OUString        aStyleName;
     ScRange         aRange;
 
     void            DoChange( const sal_Bool bUndo );
@@ -716,7 +716,7 @@ public:
                     ScUndoEnterMatrix( ScDocShell* pNewDocShell,
                                        const ScRange& rArea,
                                        ScDocument* pNewUndoDoc,
-                                       const String& rForm );
+                                       const OUString& rForm );
     virtual         ~ScUndoEnterMatrix();
 
     virtual void    Undo();
@@ -728,9 +728,9 @@ public:
 
 private:
     ScDocument*     pUndoDoc;
-    String          aFormula;
-    sal_uLong           nStartChangeAction;
-    sal_uLong           nEndChangeAction;
+    OUString        aFormula;
+    sal_uLong       nStartChangeAction;
+    sal_uLong       nEndChangeAction;
 
     void            SetChangeTrack();
 };
@@ -742,7 +742,7 @@ public:
                     TYPEINFO();
                     ScUndoInsertAreaLink( ScDocShell* pShell,
                                           const OUString& rDocName,
-                                          const OUString& rFltName, const String& rOptions,
+                                          const OUString& rFltName, const OUString& rOptions,
                                           const OUString& rAreaName, const ScRange& rDestRange,
                                           sal_uLong nRefreshDelay );
     virtual         ~ScUndoInsertAreaLink();
@@ -757,7 +757,7 @@ public:
 private:
     OUString        aDocName;
     OUString        aFltName;
-    String          aOptions;
+    OUString        aOptions;
     OUString        aAreaName;
     ScRange         aRange;
     sal_uLong           nRefreshDelay;
@@ -770,7 +770,7 @@ public:
                     TYPEINFO();
                     ScUndoRemoveAreaLink( ScDocShell* pShell,
                                           const OUString& rDocName,
-                                          const OUString& rFltName, const String& rOptions,
+                                          const OUString& rFltName, const OUString& rOptions,
                                           const OUString& rAreaName, const ScRange& rDestRange,
                                           sal_uLong nRefreshDelay );
     virtual         ~ScUndoRemoveAreaLink();
@@ -785,7 +785,7 @@ public:
 private:
     OUString        aDocName;
     OUString        aFltName;
-    String          aOptions;
+    OUString        aOptions;
     OUString        aAreaName;
     ScRange         aRange;
     sal_uLong           nRefreshDelay;
@@ -797,13 +797,13 @@ class ScUndoUpdateAreaLink : public ScSimpleUndo        //! also change BlockUnd
 public:
                     TYPEINFO();
                     ScUndoUpdateAreaLink( ScDocShell* pShell,
-                                          const String& rOldD,
-                                          const String& rOldF, const String& rOldO,
-                                          const String& rOldA, const ScRange& rOldR,
+                                          const OUString& rOldD,
+                                          const OUString& rOldF, const OUString& rOldO,
+                                          const OUString& rOldA, const ScRange& rOldR,
                                           sal_uLong nOldRD,
-                                          const String& rNewD,
-                                          const String& rNewF, const String& rNewO,
-                                          const String& rNewA, const ScRange& rNewR,
+                                          const OUString& rNewD,
+                                          const OUString& rNewF, const OUString& rNewO,
+                                          const OUString& rNewA, const ScRange& rNewR,
                                           sal_uLong nNewRD,
                                           ScDocument* pUndo, ScDocument* pRedo,
                                           sal_Bool bDoInsert );
@@ -817,15 +817,15 @@ public:
     virtual OUString GetComment() const;
 
 private:
-    String          aOldDoc;
-    String          aOldFlt;
-    String          aOldOpt;
-    String          aOldArea;
+    OUString        aOldDoc;
+    OUString        aOldFlt;
+    OUString        aOldOpt;
+    OUString        aOldArea;
     ScRange         aOldRange;
-    String          aNewDoc;
-    String          aNewFlt;
-    String          aNewOpt;
-    String          aNewArea;
+    OUString        aNewDoc;
+    OUString        aNewFlt;
+    OUString        aNewOpt;
+    OUString        aNewArea;
     ScRange         aNewRange;
     ScDocument*     pUndoDoc;
     ScDocument*     pRedoDoc;
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index ce78a8f7ae57..b8571a909c1a 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -1408,7 +1408,7 @@ ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell,
                         const ScMarkData& rMark,
 /*C*/                   const ScArea& rDestArea,
                               ScDocument* pNewUndoDoc,
-                        const String& rNewName ) :
+                        const OUString& rNewName ) :
     ScSimpleUndo( pNewDocShell ),
     pUndoDoc( pNewUndoDoc ),
     aMarkData( rMark ),
@@ -1527,7 +1527,7 @@ bool ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const
 ScUndoSelectionStyle::ScUndoSelectionStyle( ScDocShell* pNewDocShell,
                                       const ScMarkData& rMark,
                                       const ScRange& rRange,
-                                      const String& rName,
+                                      const OUString& rName,
                                             ScDocument* pNewUndoDoc ) :
     ScSimpleUndo( pNewDocShell ),
     aMarkData( rMark ),
@@ -1635,7 +1635,7 @@ sal_uInt16 ScUndoSelectionStyle::GetId() const
 }
 
 ScUndoEnterMatrix::ScUndoEnterMatrix( ScDocShell* pNewDocShell, const ScRange& rArea,
-                                      ScDocument* pNewUndoDoc, const String& rForm ) :
+                                      ScDocument* pNewUndoDoc, const OUString& rForm ) :
     ScBlockUndo( pNewDocShell, rArea, SC_UNDO_SIMPLE ),
     pUndoDoc( pNewUndoDoc ),
     aFormula( rForm )
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index e16d5f0d6ea3..d1ca63b30121 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -915,7 +915,7 @@ bool ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const
 
 ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark,
                                     SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
-                                    const String& rNewUndoStr, ScDocument* pNewUndoDoc,
+                                    const OUString& rNewUndoStr, ScDocument* pNewUndoDoc,
                                     const SvxSearchItem* pItem )
     :   ScSimpleUndo( pNewDocShell ),
         aCursorPos  ( nCurX, nCurY, nCurZ ),
@@ -1024,7 +1024,7 @@ void ScUndoReplace::Undo()
     else
     {
         // aUndoStr may contain line breaks
-        if ( aUndoStr.Search('\n') != STRING_NOTFOUND )
+        if ( aUndoStr.indexOf('\n') != -1 )
         {
             ScFieldEditEngine& rEngine = pDoc->GetEditEngine();
             rEngine.SetText(aUndoStr);
@@ -1490,7 +1490,7 @@ static ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const Stri
 
 ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell,
                             const OUString& rDoc,
-                            const OUString& rFlt, const String& rOpt,
+                            const OUString& rFlt, const OUString& rOpt,
                             const OUString& rArea, const ScRange& rDestRange,
                             sal_uLong nRefresh )
     :   ScSimpleUndo    ( pShell ),
@@ -1552,7 +1552,7 @@ bool ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 }
 
 ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell,
-                            const OUString& rDoc, const OUString& rFlt, const String& rOpt,
+                            const OUString& rDoc, const OUString& rFlt, const OUString& rOpt,
                             const OUString& rArea, const ScRange& rDestRange,
                             sal_uLong nRefresh )
     :   ScSimpleUndo    ( pShell ),
@@ -1614,10 +1614,10 @@ bool ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 }
 
 ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
-                            const String& rOldD, const String& rOldF, const String& rOldO,
-                            const String& rOldA, const ScRange& rOldR, sal_uLong nOldRD,
-                            const String& rNewD, const String& rNewF, const String& rNewO,
-                            const String& rNewA, const ScRange& rNewR, sal_uLong nNewRD,
+                            const OUString& rOldD, const OUString& rOldF, const OUString& rOldO,
+                            const OUString& rOldA, const ScRange& rOldR, sal_uLong nOldRD,
+                            const OUString& rNewD, const OUString& rNewF, const OUString& rNewO,
+                            const OUString& rNewA, const ScRange& rNewR, sal_uLong nNewRD,
                             ScDocument* pUndo, ScDocument* pRedo, sal_Bool bDoInsert )
     :   ScSimpleUndo( pShell ),
         aOldDoc     ( rOldD ),