String to rtl::OUString.

4 files changed, 26 insertions, 23 deletions

diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index fcd83da9ddd6..6266142d3ea6 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -273,6 +273,7 @@ public:
                             const SfxItemPool* pFromPool /* = NULL */ );
     void            GetData( const EditTextObject*& rpObject ) const;
     void            GetString( String& rString ) const;
+    void            GetString( rtl::OUString& rString ) const;
 
     const EditTextObject* GetData() const   { return pData; }
 
@@ -463,6 +464,7 @@ public:
     double          GetValue();
     double          GetValueAlways();   // ignore errors
     void            GetString( String& rString );
+    void            GetString( rtl::OUString& rString );
     const ScMatrix* GetMatrix();
     sal_Bool            GetMatrixOrigin( ScAddress& rPos ) const;
     void            GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index b10bb31aa9bb..6ca827a9ae23 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -524,11 +524,10 @@ public:
     SC_DLLPUBLIC void           SetVisibleTab(SCTAB nTab)   { nVisibleTab = nTab; }
 
     SC_DLLPUBLIC sal_Bool           HasTable( SCTAB nTab ) const;
-    SC_DLLPUBLIC bool           GetName( SCTAB nTab, String& rName ) const;
-    SC_DLLPUBLIC bool           GetName( SCTAB nTab, ::rtl::OUString& rName ) const;
-    SC_DLLPUBLIC sal_Bool           GetCodeName( SCTAB nTab, String& rName ) const;
-    SC_DLLPUBLIC sal_Bool                   SetCodeName( SCTAB nTab, const String& rName );
-    SC_DLLPUBLIC sal_Bool           GetTable( const String& rName, SCTAB& rTab ) const;
+    SC_DLLPUBLIC bool GetName( SCTAB nTab, rtl::OUString& rName ) const;
+    SC_DLLPUBLIC bool GetCodeName( SCTAB nTab, rtl::OUString& rName ) const;
+    SC_DLLPUBLIC bool SetCodeName( SCTAB nTab, const rtl::OUString& rName );
+    SC_DLLPUBLIC bool GetTable( const rtl::OUString& rName, SCTAB& rTab ) const;
 
     SC_DLLPUBLIC void            SetAnonymousDBData(SCTAB nTab, ScDBData* pDBData);
     SC_DLLPUBLIC ScDBData*       GetAnonymousDBData(SCTAB nTab);
@@ -573,6 +572,7 @@ public:
     SC_DLLPUBLIC sal_Bool           ValidNewTabName( const String& rName ) const;
     SC_DLLPUBLIC bool               ValidNewTabName( const std::vector<String>& rName ) const;
     SC_DLLPUBLIC void           CreateValidTabName(String& rName) const;
+    SC_DLLPUBLIC void           CreateValidTabName(rtl::OUString& rName) const;
     SC_DLLPUBLIC void           CreateValidTabNames(std::vector<rtl::OUString>& aNames, SCTAB nCount) const;
     SC_DLLPUBLIC sal_Bool           InsertTab( SCTAB nPos, const String& rName,
                                 sal_Bool bExternalDocument = false );
@@ -603,8 +603,8 @@ public:
     sal_Bool            IsNegativePage( SCTAB nTab ) const;
     SC_DLLPUBLIC void           SetScenario( SCTAB nTab, sal_Bool bFlag );
     SC_DLLPUBLIC sal_Bool           IsScenario( SCTAB nTab ) const;
-    SC_DLLPUBLIC void           GetScenarioData( SCTAB nTab, String& rComment,
-                                        Color& rColor, sal_uInt16& rFlags ) const;
+    SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, rtl::OUString& rComment,
+                                       Color& rColor, sal_uInt16& rFlags ) const;
     SC_DLLPUBLIC void           SetScenarioData( SCTAB nTab, const String& rComment,
                                         const Color& rColor, sal_uInt16 nFlags );
     SC_DLLPUBLIC Color GetTabBgColor( SCTAB nTab ) const;
@@ -771,6 +771,7 @@ public:
     SC_DLLPUBLIC void           GetString( SCCOL nCol, SCROW nRow, SCTAB nTab, rtl::OUString& rString );
     SC_DLLPUBLIC rtl::OUString  GetString( SCCOL nCol, SCROW nRow, SCTAB nTab) { rtl::OUString aString; GetString(nCol, nRow, nTab, aString); return aString;}
     SC_DLLPUBLIC void           GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString );
+    SC_DLLPUBLIC void           GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, rtl::OUString& rString );
     SC_DLLPUBLIC double         GetValue( const ScAddress& );
     SC_DLLPUBLIC double         GetValue( const SCCOL nCol, SCROW nRow, SCTAB nTab) { ScAddress aAdr(nCol, nRow, nTab); return GetValue(aAdr);}
     SC_DLLPUBLIC void           GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue );
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index cfdbdcfd365b..e474a4210876 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -276,10 +276,10 @@ class AbstractScNewScenarioDlg : public VclAbstractDialog  //add for ScNewScenar
 {
 public:
 
-    virtual void SetScenarioData( const String& rName, const String& rComment,
+    virtual void SetScenarioData( const rtl::OUString& rName, const rtl::OUString& rComment,
                             const Color& rColor, sal_uInt16 nFlags ) = 0;
 
-    virtual void GetScenarioData( String& rName, String& rComment,
+    virtual void GetScenarioData( rtl::OUString& rName, rtl::OUString& rComment,
                             Color& rColor, sal_uInt16& rFlags ) const = 0;
 };
 
@@ -296,7 +296,7 @@ public:
 class AbstractScStringInputDlg :  public VclAbstractDialog  //add for ScStringInputDlg
 {
 public:
-    virtual void GetInputString( String& rString ) const = 0;
+    virtual void GetInputString( rtl::OUString& rString ) const = 0;
 };
 
 class AbstractScTabBgColorDlg : public VclAbstractDialog  //add for ScTabBgColorDlg
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 07562dd3a3de..3cb62a39f7aa 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -104,9 +104,9 @@ private:
                                             //  data per table
     ScColumn        aCol[MAXCOLCOUNT];
 
-    String          aName;
-    String          aCodeName;
-    String          aComment;
+    rtl::OUString aName;
+    rtl::OUString aCodeName;
+    rtl::OUString aComment;
 
     String          aLinkDoc;
     String          aLinkFlt;
@@ -152,7 +152,7 @@ private:
     ScDocument*     pDocument;
     utl::TextSearch*    pSearchText;
 
-    mutable String  aUpperName;             // #i62977# filled only on demand, reset in SetName
+    mutable rtl::OUString aUpperName;             // #i62977# filled only on demand, reset in SetName
 
     ScAddress2DVecPtr mxUninitNotes;
 
@@ -201,8 +201,8 @@ friend class ScAttrRectIterator;
 
 
 public:
-                ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
-                            bool bColInfo = true, bool bRowInfo = true );
+                ScTable( ScDocument* pDoc, SCTAB nNewTab, const rtl::OUString& rNewName,
+                         bool bColInfo = true, bool bRowInfo = true );
                 ~ScTable();
 
     ScOutlineTable* GetOutlineTable()               { return pOutlineTable; }
@@ -243,8 +243,8 @@ public:
 
     bool        IsScenario() const                           { return bScenario; }
     void        SetScenario( bool bFlag );
-    void        GetScenarioComment( String& rComment) const  { rComment = aComment; }
-    void        SetScenarioComment( const String& rComment ) { aComment = rComment; }
+    void        GetScenarioComment( rtl::OUString& rComment) const  { rComment = aComment; }
+    void        SetScenarioComment( const rtl::OUString& rComment ) { aComment = rComment; }
     const Color& GetScenarioColor() const                    { return aScenarioColor; }
     void        SetScenarioColor(const Color& rNew)          { aScenarioColor = rNew; }
     const Color& GetTabBgColor() const;
@@ -265,16 +265,16 @@ public:
     void        SetLink( sal_uInt8 nMode, const String& rDoc, const String& rFlt,
                         const String& rOpt, const String& rTab, sal_uLong nRefreshDelay );
 
-    void        GetName( String& rName ) const;
-    void        SetName( const String& rNewName );
+    void        GetName( rtl::OUString& rName ) const;
+    void        SetName( const rtl::OUString& rNewName );
 
     void        SetAnonymousDBData(ScDBData* pDBData);
     ScDBData*   GetAnonymousDBData();
 
-    void        GetCodeName( String& rName ) const {  rName = aCodeName; }
-    void        SetCodeName( const String& rNewName ) { aCodeName = rNewName; }
+    void        GetCodeName( rtl::OUString& rName ) const {  rName = aCodeName; }
+    void        SetCodeName( const rtl::OUString& rNewName ) { aCodeName = rNewName; }
 
-    const String&   GetUpperName() const;
+    const rtl::OUString& GetUpperName() const;
 
     const String&   GetPageStyle() const                    { return aPageStyle; }
     void            SetPageStyle( const String& rName );