covnert sc/source/filter/inc/namebuff.hxx from String to OUString

Change-Id: I08d7224df62723b70b46981f1b6d61379ab62747

4 files changed, 32 insertions, 32 deletions

diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index ae00ca9f7b30..b605741c914a 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -712,7 +712,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
                     if( pExtName && pExtName->IsDDE() &&
                         rR.pExtSheetBuff->IsLink( ( sal_uInt16 ) nINT16 ) )
                     {
-                        String          aAppl, aExtDoc;
+                        OUString        aAppl, aExtDoc;
                         TokenId         nPar1, nPar2;
 
                         rR.pExtSheetBuff->GetLink( ( sal_uInt16 ) nINT16 , aAppl, aExtDoc );
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index b3592972704a..7cfaa8a5d034 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -102,7 +102,7 @@ ScFormulaCellGroupRef SharedFormulaBuffer::Find( const ScAddress& rRefPos ) cons
     return it->second;
 }
 
-sal_Int16 ExtSheetBuffer::Add( const String& rFPAN, const String& rTN, const sal_Bool bSWB )
+sal_Int16 ExtSheetBuffer::Add( const OUString& rFPAN, const OUString& rTN, const sal_Bool bSWB )
 {
     maEntries.push_back( Cont( rFPAN, rTN, bSWB ) );
     // return 1-based index of EXTERNSHEET
@@ -177,7 +177,7 @@ sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const
 }
 
 
-sal_Bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, String& rAppl, String& rDoc ) const
+sal_Bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUString& rDoc ) const
 {
     OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index has to be >0!" );
 
@@ -219,14 +219,14 @@ ExtNameBuff::ExtNameBuff( const XclImpRoot& rRoot ) :
 }
 
 
-void ExtNameBuff::AddDDE( const String& rName, sal_Int16 nRefIdx )
+void ExtNameBuff::AddDDE( const OUString& rName, sal_Int16 nRefIdx )
 {
     ExtName aNew( rName, 0x0001 );
     maExtNames[ nRefIdx ].push_back( aNew );
 }
 
 
-void ExtNameBuff::AddOLE( const String& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId )
+void ExtNameBuff::AddOLE( const OUString& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId )
 {
     ExtName aNew( rName, 0x0002 );
     aNew.nStorageId = nStorageId;
@@ -234,7 +234,7 @@ void ExtNameBuff::AddOLE( const String& rName, sal_Int16 nRefIdx, sal_uInt32 nSt
 }
 
 
-void ExtNameBuff::AddName( const String& rName, sal_Int16 nRefIdx )
+void ExtNameBuff::AddName( const OUString& rName, sal_Int16 nRefIdx )
 {
     ExtName aNew( GetScAddInName( rName ), 0x0004 );
     maExtNames[ nRefIdx ].push_back( aNew );
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index edea04091d2f..bb27605a1f0f 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -175,17 +175,17 @@ private:
         {
         StringHashEntry     aStrHashEntry;
         ScComplexRefData        aScComplexRefDataRel;
-        String              aScAbsName;
+        OUString            aScAbsName;
         sal_uInt16              nAbsInd;        // == 0 -> noch keine Abs-Name!
         sal_uInt16              nRelInd;
         sal_Bool                bSingleRef;
-                            Entry( const String& rName, const String& rScName, const ScComplexRefData& rCRD ) :
+                            Entry( const OUString& rName, const OUString& rScName, const ScComplexRefData& rCRD ) :
                                 aStrHashEntry( rName ),
                                 aScComplexRefDataRel( rCRD ),
                                 aScAbsName( rScName )
                             {
                                 nAbsInd = 0;
-                                aScAbsName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_ABS" ) );
+                                aScAbsName = "_ABS";
                             }
         };
 
@@ -196,14 +196,14 @@ private:
 public:
                             RangeNameBufferWK3( void );
     virtual                 ~RangeNameBufferWK3();
-    void                    Add( const String& rName, const ScComplexRefData& rCRD );
-    inline void             Add( const String& rName, const ScRange& aScRange );
-    sal_Bool                    FindRel( const String& rRef, sal_uInt16& rIndex );
-    sal_Bool                    FindAbs( const String& rRef, sal_uInt16& rIndex );
+    void                    Add( const OUString& rName, const ScComplexRefData& rCRD );
+    inline void             Add( const OUString& rName, const ScRange& aScRange );
+    sal_Bool                    FindRel( const OUString& rRef, sal_uInt16& rIndex );
+    sal_Bool                    FindAbs( const OUString& rRef, sal_uInt16& rIndex );
 };
 
 
-inline void RangeNameBufferWK3::Add( const String& rName, const ScRange& aScRange )
+inline void RangeNameBufferWK3::Add( const OUString& rName, const ScRange& aScRange )
 {
     ScComplexRefData        aCRD;
     ScSingleRefData*        pSRD;
@@ -227,21 +227,21 @@ class ExtSheetBuffer : public ExcRoot
 private:
     struct Cont
         {
-        String      aFile;
-        String      aTab;
-        sal_uInt16      nTabNum;    // 0xFFFF -> noch nicht angelegt
+        OUString      aFile;
+        OUString      aTab;
+        sal_uInt16    nTabNum;    // 0xFFFF -> noch nicht angelegt
                                 // 0xFFFE -> versucht anzulegen, ging aber schief
                                 // 0xFFFD -> soll im selben Workbook sein, findet's aber nicht
         sal_Bool        bSWB;
         sal_Bool        bLink;
-                    Cont( const String& rFilePathAndName, const String& rTabName ) :
+                    Cont( const OUString& rFilePathAndName, const OUString& rTabName ) :
                         aFile( rFilePathAndName ),
                         aTab( rTabName )
                     {
                         nTabNum = 0xFFFF;   // -> Tabelle noch nicht erzeugt
                         bSWB = bLink = false;
                     }
-                    Cont( const String& rFilePathAndName, const String& rTabName,
+                    Cont( const OUString& rFilePathAndName, const OUString& rTabName,
                         const sal_Bool bSameWB ) :
                         aFile( rFilePathAndName ),
                         aTab( rTabName )
@@ -257,12 +257,12 @@ private:
 public:
     inline          ExtSheetBuffer( RootData* );
 
-    sal_Int16       Add( const String& rFilePathAndName,
-                        const String& rTabName, const sal_Bool bSameWorkbook = false );
+    sal_Int16       Add( const OUString& rFilePathAndName,
+                        const OUString& rTabName, const sal_Bool bSameWorkbook = false );
 
     sal_Bool            GetScTabIndex( sal_uInt16 nExcSheetIndex, sal_uInt16& rIn_LastTab_Out_ScIndex );
     sal_Bool            IsLink( const sal_uInt16 nExcSheetIndex ) const;
-    sal_Bool            GetLink( const sal_uInt16 nExcSheetIndex, String &rAppl, String &rDoc ) const;
+    sal_Bool            GetLink( const sal_uInt16 nExcSheetIndex, OUString &rAppl, OUString &rDoc ) const;
 
     void            Reset( void );
 };
@@ -277,11 +277,11 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p )
 
 struct ExtName
 {
-    String          aName;
-    sal_uInt32          nStorageId;
-    sal_uInt16          nFlags;
+    OUString          aName;
+    sal_uInt32        nStorageId;
+    sal_uInt16        nFlags;
 
-    inline          ExtName( const String& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {}
+    inline          ExtName( const OUString& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {}
 
     sal_Bool            IsDDE( void ) const;
     sal_Bool            IsOLE( void ) const;
@@ -295,9 +295,9 @@ class ExtNameBuff : protected XclImpRoot
 public:
     explicit        ExtNameBuff( const XclImpRoot& rRoot );
 
-    void            AddDDE( const String& rName, sal_Int16 nRefIdx );
-    void            AddOLE( const String& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId );
-    void            AddName( const String& rName, sal_Int16 nRefIdx );
+    void            AddDDE( const OUString& rName, sal_Int16 nRefIdx );
+    void            AddOLE( const OUString& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId );
+    void            AddName( const OUString& rName, sal_Int16 nRefIdx );
 
     const ExtName*  GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameIdx ) const;
 
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 216d5e81d486..04827a0ba7d4 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -504,7 +504,7 @@ RangeNameBufferWK3::~RangeNameBufferWK3()
 }
 
 
-void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rCRD )
+void RangeNameBufferWK3::Add( const OUString& rOrgName, const ScComplexRefData& rCRD )
 {
     String aScName = ScfTools::ConvertToScDefinedName(rOrgName);
 
@@ -538,7 +538,7 @@ void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rC
 }
 
 
-sal_Bool RangeNameBufferWK3::FindRel( const String& rRef, sal_uInt16& rIndex )
+sal_Bool RangeNameBufferWK3::FindRel( const OUString& rRef, sal_uInt16& rIndex )
 {
     StringHashEntry     aRef( rRef );
 
@@ -556,7 +556,7 @@ sal_Bool RangeNameBufferWK3::FindRel( const String& rRef, sal_uInt16& rIndex )
 }
 
 
-sal_Bool RangeNameBufferWK3::FindAbs( const String& rRef, sal_uInt16& rIndex )
+sal_Bool RangeNameBufferWK3::FindAbs( const OUString& rRef, sal_uInt16& rIndex )
 {
     String              aTmp( rRef );
     StringHashEntry     aRef( aTmp.Erase( 0, 1 ) ); // ohne '$' suchen!