ByteString->rtl::OString

6 files changed, 34 insertions, 34 deletions

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 959a9f830224..6d49b4c9cfdd 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -151,8 +151,8 @@ public:
             SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
             SvMetaName();
 
-    virtual sal_Bool                SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
-    void                        SetDescription( const ByteString& rText )
+    virtual sal_Bool            SetName( const rtl::OString& rName, SvIdlDataBase * = NULL  );
+    void                        SetDescription( const rtl::OString& rText )
                                 { aDescription.setString(rText); }
     const SvHelpContext&        GetHelpContext() const { return aHelpContext; }
     virtual const SvString &    GetName() const { return aName; }
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 6449dfd7b9e6..733f0ebbdb93 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -40,12 +40,12 @@ class SvHashTable
     sal_uInt32       lAsk;                 // number of requests
     sal_uInt32       lTry;                 // number of tries
 protected:
-    sal_Bool        Test_Insert( const void *, sal_Bool bInsert, sal_uInt32 * pInsertPos );
+    sal_Bool        Test_Insert( const rtl::OString&, sal_Bool bInsert, sal_uInt32 * pInsertPos );
 
                             // compare element with entry
-    virtual StringCompare   Compare( const void * , sal_uInt32 ) const = 0;
+    virtual bool equals( const rtl::OString& , sal_uInt32 ) const = 0;
                             // get hash value from subclass
-    virtual sal_uInt32          HashFunc( const void * ) const = 0;
+    virtual sal_uInt32          HashFunc( const rtl::OString& ) const = 0;
 public:
                 SvHashTable( sal_uInt32 nMaxEntries );
                 virtual ~SvHashTable();
@@ -59,20 +59,20 @@ class SvStringHashTable;
 class SvStringHashEntry : public SvRefBase
 {
 friend class SvStringHashTable;
-    ByteString  aName;
+    rtl::OString aName;
     sal_uInt32  nHashId;
     sal_uLong   nValue;
     sal_Bool    bHasId;
 public:
                     SvStringHashEntry() : bHasId( sal_False ) {;}
-                    SvStringHashEntry( const ByteString & rName, sal_uInt32 nIdx )
+                    SvStringHashEntry( const rtl::OString& rName, sal_uInt32 nIdx )
                         : aName( rName )
                         , nHashId( nIdx )
                         , nValue( 0 )
                         , bHasId( sal_True ) {}
                     ~SvStringHashEntry();
 
-    const ByteString &  GetName() const { return aName; }
+    const rtl::OString& GetName() const { return aName; }
     sal_Bool            HasId() const { return bHasId; }
     sal_uInt32          GetId() const { return nHashId; }
 
@@ -101,17 +101,17 @@ class SvStringHashTable : public SvHashTable
 {
     SvStringHashEntry*      pEntries;
 protected:
-    virtual sal_uInt32          HashFunc( const void * pElement ) const;
-    virtual StringCompare   Compare( const void * pElement, sal_uInt32 nIndex ) const;
+    virtual sal_uInt32          HashFunc( const rtl::OString& rElement ) const;
+    virtual bool equals( const rtl::OString &rElement, sal_uInt32 nIndex ) const;
 public:
             SvStringHashTable( sal_uInt32 nMaxEntries );   // max size of hash-tabel
             virtual ~SvStringHashTable();
 
-    ByteString          GetNearString( const ByteString & rName ) const;
+    rtl::OString GetNearString( const rtl::OString& rName ) const;
     virtual sal_Bool    IsEntry( sal_uInt32 nIndex ) const;
 
-    sal_Bool    Insert( const ByteString & rStr, sal_uInt32 * pHash ); // insert string
-    sal_Bool    Test( const ByteString & rStr, sal_uInt32 * pHash ) const; // test of insert string
+    sal_Bool    Insert( const rtl::OString& rStr, sal_uInt32 * pHash ); // insert string
+    sal_Bool    Test( const rtl::OString& rStr, sal_uInt32 * pHash ) const; // test of insert string
     SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to string
     SvStringHashEntry & operator []( sal_uInt32 nPos ) const
             { return pEntries[ nPos ]; }
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 3b51dd848f2b..03b657890f71 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -45,13 +45,13 @@ class BigInt;
 class SvToken
 {
 friend class SvTokenStream;
-    sal_uLong                   nLine, nColumn;
+    sal_uLong               nLine, nColumn;
     SVTOKEN_ENUM            nType;
-    ByteString                  aString;
+    rtl::OString            aString;
     union
     {
-        sal_uLong               nLong;
-        sal_Bool                bBool;
+        sal_uLong           nLong;
+        sal_Bool            bBool;
         char                cChar;
         SvStringHashEntry * pHash;
     };
@@ -61,7 +61,7 @@ public:
             SvToken( sal_uLong n );
             SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
             SvToken( char c );
-            SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr );
+            SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr );
             SvToken( SVTOKEN_ENUM nTypeP );
 
     SvToken & operator = ( const SvToken & rObj );
@@ -91,7 +91,7 @@ public:
     sal_Bool        IsRttiBase() const  { return nType == SVTOKEN_RTTIBASE; }
     sal_Bool        IsEof() const       { return nType == SVTOKEN_EOF; }
 
-    const ByteString & GetString() const
+    const rtl::OString& GetString() const
                 {
                     return IsIdentifierHash()
                         ? pHash->GetName()
@@ -122,7 +122,7 @@ inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
 inline SvToken::SvToken( char c )
     : nType( SVTOKEN_CHAR ), cChar( c ) {}
 
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr )
+inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr )
     : nType( nTypeP ), aString( rStr ) {}
 
 inline SvToken::SvToken( SVTOKEN_ENUM nTypeP )
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 471a0a5d1c82..750914d206c9 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -70,7 +70,7 @@ public:
     const String &      GetIdlFileName() const { return aIdlFileName; }
     const rtl::OString& GetModulePrefix() const { return aModulePrefix.getString(); }
 
-    virtual sal_Bool    SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
+    virtual sal_Bool    SetName( const rtl::OString& rName, SvIdlDataBase * = NULL  );
 
     const rtl::OString& GetHelpFileName() const { return aHelpFileName.getString(); }
     const rtl::OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); }
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 85e56ebe1617..50d5d08c638e 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -245,7 +245,7 @@ public:
     virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        WriteSvIdl( SvIdlDataBase & rBase,
                                     SvStream & rOutStm, sal_uInt16 nTab );
-    virtual void        Insert( SvSlotElementList&, const ByteString & rPrefix,
+    virtual void        Insert( SvSlotElementList&, const rtl::OString& rPrefix,
                                 SvIdlDataBase& );
     void                WriteSlotStubs( const rtl::OString& rShellName,
                                     ByteStringList & rList,
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index b0d5f21713e0..8db0b7ed48cd 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -115,7 +115,7 @@ public:
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
     sal_uLong           MakeSfx( rtl::OStringBuffer& rAtrrArray );
-    virtual void        Insert( SvSlotElementList&, const ByteString & rPrefix,
+    virtual void        Insert( SvSlotElementList&, const rtl::OString& rPrefix,
                                 SvIdlDataBase& );
     virtual void        WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
                                   Table * pIdTable );
@@ -123,7 +123,7 @@ public:
                                   Table * pIdTable );
     virtual void        WriteCSV( SvIdlDataBase&, SvStream& );
     void                FillIDTable(Table *pIDTable);
-    ByteString              Compare( SvMetaAttribute *pAttr );
+    rtl::OString        Compare( SvMetaAttribute *pAttr );
 };
 SV_IMPL_REF(SvMetaAttribute)
 SV_IMPL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *)
@@ -150,7 +150,7 @@ class SvMetaType : public SvMetaExtern
     sal_Bool                        bIsShell;
     char                        cParserChar;
 
-    void    WriteSfxItem( const ByteString & rItemName, SvIdlDataBase & rBase,
+    void    WriteSfxItem( const rtl::OString& rItemName, SvIdlDataBase & rBase,
                         SvStream & rOutStm );
 protected:
     sal_Bool        ReadNamesSvIdl( SvIdlDataBase & rBase,
@@ -208,7 +208,7 @@ public:
     void                SetCall1( int e);
     int                 GetCall1() const;
 
-    void                SetBasicName(const ByteString& rName)
+    void                SetBasicName(const rtl::OString& rName)
                         { aBasicName.setString(rName); }
 
     const rtl::OString& GetBasicName() const;
@@ -219,10 +219,10 @@ public:
     const rtl::OString& GetCName() const;
     char                GetParserChar() const { return cParserChar; }
 
-    virtual sal_Bool        SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+    virtual sal_Bool    SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
 
 
-    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool    ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        WriteSvIdl( SvIdlDataBase & rBase,
                                     SvStream & rOutStm, sal_uInt16 nTab );
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
@@ -240,7 +240,7 @@ public:
     void                WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
     rtl::OString GetParserString() const;
     void                WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                        const ByteString & rChief );
+                                        const rtl::OString& rChief );
 };
 SV_IMPL_REF(SvMetaType)
 SV_DECL_IMPL_PERSIST_LIST(SvMetaType,SvMetaType *)
@@ -258,10 +258,10 @@ SV_DECL_IMPL_PERSIST_LIST(SvMetaTypeString,SvMetaTypeString *)
 
 class SvMetaEnumValue : public SvMetaName
 {
-    ByteString      aEnumValue;
+    rtl::OString aEnumValue;
 public:
-            SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 )
-            SvMetaEnumValue();
+    SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 )
+    SvMetaEnumValue();
 
     virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
@@ -275,7 +275,7 @@ SV_DECL_IMPL_PERSIST_LIST(SvMetaEnumValue,SvMetaEnumValue *)
 class SvMetaTypeEnum : public SvMetaType
 {
     SvMetaEnumValueMemberList   aEnumValueList;
-    ByteString                      aPrefix;
+    rtl::OString aPrefix;
 protected:
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
@@ -288,7 +288,7 @@ public:
 
     sal_uInt16              GetMaxValue() const;
     sal_uLong               Count() const { return aEnumValueList.Count(); }
-    const ByteString &      GetPrefix() const { return aPrefix; }
+    const rtl::OString&     GetPrefix() const { return aPrefix; }
     SvMetaEnumValue *   GetObject( sal_uLong n ) const
                         { return aEnumValueList.GetObject( n ); }