String to OUString

Change-Id: I32f35a34f031b1905b1b3955d6a8e6804bd4ce23

2 files changed, 10 insertions, 10 deletions

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index bf4ca53a0f74..1009df71de12 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -293,7 +293,7 @@ private:
 
 class SC_DLLPUBLIC ScCondFormatEntry : public ScConditionEntry
 {
-    String                  aStyleName;
+    rtl::OUString                  aStyleName;
 
     using ScConditionEntry::operator==;
 
@@ -316,8 +316,8 @@ public:
 
     int             operator== ( const ScCondFormatEntry& r ) const;
 
-    const String&   GetStyle() const        { return aStyleName; }
-    void            UpdateStyleName(const String& rNew)  { aStyleName=rNew; }
+    const rtl::OUString&   GetStyle() const        { return aStyleName; }
+    void            UpdateStyleName(const rtl::OUString& rNew)  { aStyleName=rNew; }
     virtual ScFormatEntry* Clone(ScDocument* pDoc) const;
 
 protected:
@@ -360,13 +360,13 @@ public:
                                 const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
     void            DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
     void            UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos );
-    void            RenameCellStyle( const String& rOld, const String& rNew );
+    void            RenameCellStyle( const rtl::OUString& rOld, const rtl::OUString& rNew );
 
     void            SourceChanged( const ScAddress& rAddr );
 
     const ScFormatEntry* GetEntry( sal_uInt16 nPos ) const;
 
-    const String&   GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const;
+    const rtl::OUString&   GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const;
 
     ScCondFormatData GetData( ScBaseCell* pCell, const ScAddress& rPos ) const;
 
@@ -422,7 +422,7 @@ public:
     void    CompileXML();
     void    UpdateReference( UpdateRefMode eUpdateRefMode,
                                 const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
-    void    RenameCellStyle( const String& rOld, const String& rNew );
+    void    RenameCellStyle( const rtl::OUString& rOld, const rtl::OUString& rNew );
     void    UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos );
     void    DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
 
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index ecece736a86a..12fe32974f47 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1707,7 +1707,7 @@ const ScFormatEntry* ScConditionalFormat::GetEntry( sal_uInt16 nPos ) const
         return NULL;
 }
 
-const String& ScConditionalFormat::GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const
+const rtl::OUString& ScConditionalFormat::GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const
 {
     for (CondFormatContainer::const_iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr)
     {
@@ -1719,7 +1719,7 @@ const String& ScConditionalFormat::GetCellStyle( ScBaseCell* pCell, const ScAddr
         }
     }
 
-    return EMPTY_STRING;
+    return EMPTY_OUSTRING;
 }
 
 ScCondFormatData ScConditionalFormat::GetData( ScBaseCell* pCell, const ScAddress& rPos ) const
@@ -1804,7 +1804,7 @@ void ScConditionalFormat::DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR
     maRanges.DeleteArea( nCol1, nRow1, nTab, nCol2, nRow2, nTab );
 }
 
-void ScConditionalFormat::RenameCellStyle(const String& rOld, const String& rNew)
+void ScConditionalFormat::RenameCellStyle(const rtl::OUString& rOld, const rtl::OUString& rNew)
 {
     for(CondFormatContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr)
         if(itr->GetType() == condformat::CONDITION)
@@ -1963,7 +1963,7 @@ void ScConditionalFormatList::UpdateReference( UpdateRefMode eUpdateRefMode,
     }
 }
 
-void ScConditionalFormatList::RenameCellStyle( const String& rOld, const String& rNew )
+void ScConditionalFormatList::RenameCellStyle( const rtl::OUString& rOld, const rtl::OUString& rNew )
 {
     for( iterator itr = begin(); itr != end(); ++itr)
         itr->RenameCellStyle(rOld,rNew);