convert sc/source/filter/inc/xcl97rec.hxx from String to OUString

Change-Id: Ia36bc65bcfdaf92e3a2b6738479ff80be0d4a8a8

sc/source/filter/inc/xcl97rec.hxx

@@ -206,7 +206,7 @@ class SdrTextObj;
 class XclTxo : public ExcRecord
 {
 public:
-                                XclTxo( const String& rString, sal_uInt16 nFontIx = EXC_FONT_APP );
+                                XclTxo( const OUString& rString, sal_uInt16 nFontIx = EXC_FONT_APP );
                                 XclTxo( const XclExpRoot& rRoot, const SdrTextObj& rEditObj );
                                 XclTxo( const XclExpRoot& rRoot, const EditTextObject& rEditObj, SdrObject* pCaption );
 
@@ -318,14 +318,14 @@ public:
 class ExcBundlesheet8 : public ExcBundlesheetBase
 {
 private:
-    String                      sUnicodeName;
+    OUString                    sUnicodeName;
     XclExpString                GetName() const;
 
     virtual void                SaveCont( XclExpStream& rStrm );
 
 public:
                                 ExcBundlesheet8( RootData& rRootData, SCTAB nTab );
-                                ExcBundlesheet8( const String& rString );
+                                ExcBundlesheet8( const OUString& rString );
 
     virtual sal_Size            GetLen() const;
 
@@ -351,7 +351,7 @@ private:
     XclExpString                aName;
     virtual void                SaveCont( XclExpStream& rStrm );
 public:
-                                XclCodename( const String& );
+                                XclCodename( const OUString& );
 
     virtual sal_uInt16              GetNum() const;
     virtual sal_Size            GetLen() const;
@@ -372,7 +372,7 @@ private:
 
 protected:
 public:
-                                ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const String& rTxt );
+                                ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const OUString& rTxt );
 
     inline sal_Size             GetStringBytes() const
                                     { return sText.GetSize(); }
@@ -396,7 +396,7 @@ private:
 
     std::vector<ExcEScenarioCell> aCells;
 
-    sal_Bool                        Append( sal_uInt16 nCol, sal_uInt16 nRow, const String& rTxt );
+    sal_Bool                        Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt );
 
     virtual void                SaveCont( XclExpStream& rStrm );
 

sc/source/filter/xcl97/xcl97rec.cxx

@@ -697,7 +697,7 @@ static sal_uInt8 lcl_GetVerAlignFromItemSet( const SfxItemSet& rItemSet )
     return nVerAlign;
 }
 
-XclTxo::XclTxo( const String& rString, sal_uInt16 nFontIx ) :
+XclTxo::XclTxo( const OUString& rString, sal_uInt16 nFontIx ) :
     mpString( new XclExpString( rString ) ),
     mnRotation( EXC_OBJ_ORIENT_NONE ),
     mnHorAlign( EXC_OBJ_HOR_LEFT ),
@@ -1077,7 +1077,7 @@ ExcBundlesheet8::ExcBundlesheet8( RootData& rRootData, SCTAB _nTab ) :
 }
 
 
-ExcBundlesheet8::ExcBundlesheet8( const String& rString ) :
+ExcBundlesheet8::ExcBundlesheet8( const OUString& rString ) :
     ExcBundlesheetBase(),
     sUnicodeName( rString )
 {
@@ -1144,7 +1144,7 @@ sal_Size XclObproj::GetLen() const
 
 // ---- class XclCodename --------------------------------------------
 
-XclCodename::XclCodename( const String& r ) : aName( r )
+XclCodename::XclCodename( const OUString& r ) : aName( r )
 {
 }
 
@@ -1170,7 +1170,7 @@ sal_Size XclCodename::GetLen() const
 
 // ---- Scenarios ----------------------------------------------------
 
-ExcEScenarioCell::ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const String& rTxt ) :
+ExcEScenarioCell::ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const OUString& rTxt ) :
         nCol( nC ),
         nRow( nR ),
         sText( rTxt, EXC_STR_DEFAULT, 255 )
@@ -1262,7 +1262,7 @@ ExcEScenario::~ExcEScenario()
 {
 }
 
-sal_Bool ExcEScenario::Append( sal_uInt16 nCol, sal_uInt16 nRow, const String& rTxt )
+sal_Bool ExcEScenario::Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt )
 {
     if( aCells.size() == EXC_SCEN_MAXCELL )
         return false;