mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

10 files changed, 99 insertions, 99 deletions

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index cc6343744aa7..0bb8a79d93a4 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -125,8 +125,8 @@ public:
             SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
             SvMetaName();
 
-    virtual sal_Bool            SetName( const rtl::OString& rName, SvIdlDataBase * = NULL  );
-    void                        SetDescription( const rtl::OString& rText )
+    virtual sal_Bool            SetName( const OString& rName, SvIdlDataBase * = NULL  );
+    void                        SetDescription( const OString& rText )
                                 { aDescription.setString(rText); }
     const SvHelpContext&        GetHelpContext() const { return aHelpContext; }
     virtual const SvString &    GetName() const { return aName; }
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index b3efec4a0115..f97672372dc4 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -92,23 +92,23 @@ public:
 
     sal_Bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
     sal_Bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
-    rtl::OString    GetSvIdlString( SvStringHashEntry * pName );
+    OString    GetSvIdlString( SvStringHashEntry * pName );
 };
 
 
 class SvIdentifier
 {
 private:
-    rtl::OString m_aStr;
+    OString m_aStr;
 public:
     SvIdentifier()
     {
     }
-    void setString(const rtl::OString& rStr)
+    void setString(const OString& rStr)
     {
         m_aStr = rStr;
     }
-    const rtl::OString& getString() const
+    const OString& getString() const
     {
         return m_aStr;
     }
@@ -150,14 +150,14 @@ public:
 class SvString
 {
 private:
-    rtl::OString m_aStr;
+    OString m_aStr;
 public:
     SvString() {}
-    void setString(const rtl::OString& rStr)
+    void setString(const OString& rStr)
     {
         m_aStr = rStr;
     }
-    const rtl::OString& getString() const
+    const OString& getString() const
     {
         return m_aStr;
     }
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index b77ab2fcb9c7..23a646f4fad3 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -25,7 +25,7 @@
 #include <vector>
 
 typedef ::std::vector< String* > StringList;
-typedef ::std::vector< rtl::OString* > ByteStringList;
+typedef ::std::vector< OString* > ByteStringList;
 
 class SvCommand
 {
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 8c314d2ac06b..1702ed77618f 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -33,7 +33,7 @@ class SvCommand;
 
 class SvIdlError
 {
-    rtl::OString aText;
+    OString aText;
 public:
     sal_uInt32  nLine, nColumn;
 
@@ -41,8 +41,8 @@ public:
             SvIdlError( sal_uInt32 nL, sal_uInt32 nC )
                 : nLine(nL), nColumn(nC) {}
 
-    const rtl::OString&  GetText() const { return aText; }
-    void SetText( const rtl::OString& rT ) { aText = rT; }
+    const OString&  GetText() const { return aText; }
+    void SetText( const OString& rT ) { aText = rT; }
     sal_Bool            IsError() const { return nLine != 0; }
     void            Clear() { nLine = nColumn = 0; }
     SvIdlError &    operator = ( const SvIdlError & rRef )
@@ -71,14 +71,14 @@ class SvIdlDataBase
     SvMetaTypeMemberList        aTmpTypeList; // not persistent
 
 protected:
-    ::std::set< ::rtl::OUString > m_DepFiles;
+    ::std::set< OUString > m_DepFiles;
     SvMetaObjectMemberStack     aContextStack;
     String                      aPath;
     SvIdlError                  aError;
     void WriteReset()
     {
         aUsedTypes.clear();
-        aIFaceName = rtl::OString();
+        aIFaceName = OString();
     }
 public:
                 explicit SvIdlDataBase( const SvCommand& rCmd );
@@ -93,11 +93,11 @@ public:
     SvMetaTypeMemberList &    GetTypeList();
     SvMetaClassMemberList &   GetClassList()  { return aClassList; }
     SvMetaModuleMemberList &  GetModuleList() { return aModuleList; }
-    SvMetaModule *            GetModule( const rtl::OString& rName );
+    SvMetaModule *            GetModule( const OString& rName );
 
     // list of used types while writing
     SvMetaTypeMemberList    aUsedTypes;
-    rtl::OString            aIFaceName;
+    OString            aIFaceName;
     SvNumberIdentifier      aStructSlotId;
 
     void                    StartNewFile( const String& rName );
@@ -111,13 +111,13 @@ public:
     const String &            GetPath() const { return aPath; }
     SvMetaObjectMemberStack & GetStack()      { return aContextStack; }
 
-    void                    Write(const rtl::OString& rText);
-    void                    WriteError(const rtl::OString& rErrWrn,
-                                    const rtl::OString& rFileName,
-                                    const rtl::OString& rErrorText,
+    void                    Write(const OString& rText);
+    void                    WriteError(const OString& rErrWrn,
+                                    const OString& rFileName,
+                                    const OString& rErrorText,
                                     sal_uLong nRow = 0, sal_uLong nColumn = 0 ) const;
     void                    WriteError( SvTokenStream & rInStm );
-    void                    SetError( const rtl::OString& rError, SvToken * pTok );
+    void                    SetError( const OString& rError, SvToken * pTok );
     void                    Push( SvMetaObject * pObj );
     sal_Bool                    Pop( sal_Bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos )
                             {
@@ -129,11 +129,11 @@ public:
                                 return bOk;
                             }
     sal_uInt32              GetUniqueId() { return ++nUniqueId; }
-    sal_Bool                FindId( const rtl::OString& rIdName, sal_uLong * pVal );
-    sal_Bool                InsertId( const rtl::OString& rIdName, sal_uLong nVal );
+    sal_Bool                FindId( const OString& rIdName, sal_uLong * pVal );
+    sal_Bool                InsertId( const OString& rIdName, sal_uLong nVal );
     sal_Bool                    ReadIdFile( const String & rFileName );
 
-    SvMetaType *            FindType( const rtl::OString& rName );
+    SvMetaType *            FindType( const OString& rName );
     static SvMetaType *     FindType( const SvMetaType *, SvMetaTypeMemberList & );
 
     SvMetaType *            ReadKnownType( SvTokenStream & rInStm );
@@ -142,7 +142,7 @@ public:
     SvMetaAttribute *       SearchKnownAttr( const SvNumberIdentifier& );
     SvMetaClass *           ReadKnownClass( SvTokenStream & rInStm );
     void AddDepFile(String const& rFileName);
-    bool WriteDepFile(SvFileStream & rStream, ::rtl::OUString const& rTarget);
+    bool WriteDepFile(SvFileStream & rStream, OUString const& rTarget);
 };
 
 class SvIdlWorkingBase : public SvIdlDataBase
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index d5297a825a87..115d09e82df0 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -31,12 +31,12 @@ class SvHashTable
     sal_uInt32       lAsk;                 // number of requests
     sal_uInt32       lTry;                 // number of tries
 protected:
-    sal_Bool        Test_Insert( const rtl::OString&, sal_Bool bInsert, sal_uInt32 * pInsertPos );
+    sal_Bool        Test_Insert( const OString&, sal_Bool bInsert, sal_uInt32 * pInsertPos );
 
                             // compare element with entry
-    virtual bool equals( const rtl::OString& , sal_uInt32 ) const = 0;
+    virtual bool equals( const OString& , sal_uInt32 ) const = 0;
                             // get hash value from subclass
-    virtual sal_uInt32          HashFunc( const rtl::OString& ) const = 0;
+    virtual sal_uInt32          HashFunc( const OString& ) const = 0;
 public:
                 SvHashTable( sal_uInt32 nMaxEntries );
                 virtual ~SvHashTable();
@@ -50,20 +50,20 @@ class SvStringHashTable;
 class SvStringHashEntry : public SvRefBase
 {
 friend class SvStringHashTable;
-    rtl::OString aName;
+    OString aName;
     sal_uInt32  nHashId;
     sal_uLong   nValue;
     sal_Bool    bHasId;
 public:
                     SvStringHashEntry() : bHasId( sal_False ) {;}
-                    SvStringHashEntry( const rtl::OString& rName, sal_uInt32 nIdx )
+                    SvStringHashEntry( const OString& rName, sal_uInt32 nIdx )
                         : aName( rName )
                         , nHashId( nIdx )
                         , nValue( 0 )
                         , bHasId( sal_True ) {}
                     ~SvStringHashEntry();
 
-    const rtl::OString& GetName() const { return aName; }
+    const OString& GetName() const { return aName; }
     sal_Bool            HasId() const { return bHasId; }
     sal_uInt32          GetId() const { return nHashId; }
 
@@ -92,17 +92,17 @@ class SvStringHashTable : public SvHashTable
 {
     SvStringHashEntry*      pEntries;
 protected:
-    virtual sal_uInt32          HashFunc( const rtl::OString& rElement ) const;
-    virtual bool equals( const rtl::OString &rElement, sal_uInt32 nIndex ) const;
+    virtual sal_uInt32          HashFunc( const OString& rElement ) const;
+    virtual bool equals( const OString &rElement, sal_uInt32 nIndex ) const;
 public:
             SvStringHashTable( sal_uInt32 nMaxEntries );   // max size of hash-tabel
             virtual ~SvStringHashTable();
 
-    rtl::OString GetNearString( const rtl::OString& rName ) const;
+    OString GetNearString( const OString& rName ) const;
     virtual sal_Bool    IsEntry( sal_uInt32 nIndex ) const;
 
-    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
+    sal_Bool    Insert( const OString& rStr, sal_uInt32 * pHash ); // insert string
+    sal_Bool    Test( const 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 37d75e0d0d1d..7dd36f4e530e 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -37,7 +37,7 @@ class SvToken
 friend class SvTokenStream;
     sal_uLong               nLine, nColumn;
     SVTOKEN_ENUM            nType;
-    rtl::OString            aString;
+    OString            aString;
     union
     {
         sal_uLong           nLong;
@@ -51,12 +51,12 @@ public:
             SvToken( sal_uLong n );
             SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
             SvToken( char c );
-            SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr );
+            SvToken( SVTOKEN_ENUM nTypeP, const OString& rStr );
             SvToken( SVTOKEN_ENUM nTypeP );
 
     SvToken & operator = ( const SvToken & rObj );
 
-    rtl::OString GetTokenAsString() const;
+    OString GetTokenAsString() const;
     SVTOKEN_ENUM    GetType() const { return nType; }
 
     void        SetLine( sal_uLong nLineP )     { nLine = nLineP;       }
@@ -81,7 +81,7 @@ public:
     sal_Bool        IsRttiBase() const  { return nType == SVTOKEN_RTTIBASE; }
     sal_Bool        IsEof() const       { return nType == SVTOKEN_EOF; }
 
-    const rtl::OString& GetString() const
+    const OString& GetString() const
                 {
                     return IsIdentifierHash()
                         ? pHash->GetName()
@@ -112,7 +112,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 rtl::OString& rStr )
+inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const OString& rStr )
     : nType( nTypeP ), aString( rStr ) {}
 
 inline SvToken::SvToken( SVTOKEN_ENUM nTypeP )
@@ -124,8 +124,8 @@ class SvTokenStream
     int         nBufPos;
     int         c;          // next character
     sal_uInt16      nTabSize;   // length of tabulator
-    rtl::OString    aStrTrue;
-    rtl::OString    aStrFalse;
+    OString    aStrTrue;
+    OString    aStrFalse;
     sal_uLong       nMaxPos;
 
     SvFileStream *  pInStream;
@@ -136,7 +136,7 @@ class SvTokenStream
 
     void        InitCtor();
 
-    rtl::OString aBufStr;
+    OString aBufStr;
     int             GetNextChar();
     int             GetFastNextChar()
                     {
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 386b216a61ed..7d42b7559b27 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -59,12 +59,12 @@ public:
                         SvMetaModule();
 
     const String &      GetIdlFileName() const { return aIdlFileName; }
-    const rtl::OString& GetModulePrefix() const { return aModulePrefix.getString(); }
+    const OString& GetModulePrefix() const { return aModulePrefix.getString(); }
 
-    virtual sal_Bool    SetName( const rtl::OString& rName, SvIdlDataBase * = NULL  );
+    virtual sal_Bool    SetName( const OString& rName, SvIdlDataBase * = NULL  );
 
-    const rtl::OString& GetHelpFileName() const { return aHelpFileName.getString(); }
-    const rtl::OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); }
+    const OString& GetHelpFileName() const { return aHelpFileName.getString(); }
+    const OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); }
 
     const SvMetaAttributeMemberList & GetAttrList() const { return aAttrList; }
     const SvMetaTypeMemberList & GetTypeList() const { return aTypeList; }
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index cbe4d31bd680..69c1eb1a6da8 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -27,8 +27,8 @@
 struct SvSlotElement
 {
     SvMetaSlotRef   xSlot;
-    rtl::OString aPrefix;
-    SvSlotElement( SvMetaSlot * pS, const rtl::OString& rPrefix )
+    OString aPrefix;
+    SvSlotElement( SvMetaSlot * pS, const OString& rPrefix )
     : xSlot( pS )
     , aPrefix( rPrefix )
     {
@@ -43,15 +43,15 @@ SV_DECL_REF(SvMetaClass)
 class SvClassElement : public SvPersistBase
 {
     SvBOOL                      aAutomation;
-    rtl::OString                aPrefix;
+    OString                aPrefix;
     SvMetaClassRef              xClass;
 public:
             SV_DECL_PERSIST1( SvClassElement, SvPersistBase, 1 )
             SvClassElement();
 
-    void            SetPrefix( const rtl::OString& rPrefix )
+    void            SetPrefix( const OString& rPrefix )
                     { aPrefix = rPrefix; }
-    const rtl::OString&  GetPrefix() const
+    const OString&  GetPrefix() const
                     { return aPrefix; }
 
     void            SetAutomation( sal_Bool rAutomation )
@@ -81,21 +81,21 @@ class SvMetaClass : public SvMetaType
 
     sal_Bool                TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                                      SvMetaAttribute & rAttr ) const;
-    void                WriteSlotStubs( const rtl::OString& rShellName,
+    void                WriteSlotStubs( const OString& rShellName,
                                         SvSlotElementList & rSlotList,
                                         ByteStringList & rList,
                                         SvStream & rOutStm );
     sal_uInt16              WriteSlotParamArray( SvIdlDataBase & rBase,
                                             SvSlotElementList & rSlotList,
                                             SvStream & rOutStm );
-    sal_uInt16              WriteSlots( const rtl::OString& rShellName, sal_uInt16 nCount,
+    sal_uInt16              WriteSlots( const OString& rShellName, sal_uInt16 nCount,
                                     SvSlotElementList & rSlotList,
                                     SvIdlDataBase & rBase,
                                     SvStream & rOutStm );
 
     void                InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
                                     SvMetaClassList & rClassList,
-                                    const rtl::OString& rPrefix, SvIdlDataBase& rBase );
+                                    const OString& rPrefix, SvIdlDataBase& rBase );
 
 protected:
     virtual void    ReadAttributesSvIdl( SvIdlDataBase & rBase,
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 1427218580a2..456d51d64b87 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -68,11 +68,11 @@ class SvMetaSlot : public SvMetaAttribute
     SvMetaEnumValue* pEnumValue;
     SvString    aUnoName;
 
-    void            WriteSlot( const rtl::OString& rShellName,
-                            sal_uInt16 nCount, const rtl::OString& rSlotId,
+    void            WriteSlot( const OString& rShellName,
+                            sal_uInt16 nCount, const OString& rSlotId,
                             SvSlotElementList &rList,
                             size_t nStart,
-                            const rtl::OString& rPrefix,
+                            const OString& rPrefix,
                                SvIdlDataBase & rBase, SvStream & rOutStm );
     virtual void    Write( SvIdlDataBase & rBase,
                             SvStream & rOutStm, sal_uInt16 nTab,
@@ -177,17 +177,17 @@ public:
 
     virtual sal_Bool    IsVariable() const;
     virtual sal_Bool    IsMethod() const;
-    virtual rtl::OString GetMangleName( sal_Bool bVariable ) const;
+    virtual OString GetMangleName( sal_Bool bVariable ) const;
 
     SvMetaAttribute *   GetMethod() const;
     SvMetaType *        GetSlotType() const;
     sal_Bool                GetHasCoreId() const;
-    const rtl::OString&     GetGroupId() const;
-    const rtl::OString&     GetConfigId() const;
-    const rtl::OString&     GetExecMethod() const;
-    const rtl::OString&     GetStateMethod() const;
-    const rtl::OString&     GetDefault() const;
-    const rtl::OString&     GetDisableFlags() const;
+    const OString&     GetGroupId() const;
+    const OString&     GetConfigId() const;
+    const OString&     GetExecMethod() const;
+    const OString&     GetStateMethod() const;
+    const OString&     GetDefault() const;
+    const OString&     GetDisableFlags() const;
     sal_Bool                GetPseudoSlots() const;
     sal_Bool                GetCachable() const;
     sal_Bool                GetVolatile() const;
@@ -204,8 +204,8 @@ public:
     sal_Bool                GetRecordAbsolute() const;
 
     sal_Bool                GetHasDialog() const;
-    const rtl::OString&     GetPseudoPrefix() const;
-    const rtl::OString&     GetUnoName() const;
+    const OString&     GetPseudoPrefix() const;
+    const OString&     GetUnoName() const;
     sal_Bool                GetMenuConfig() const;
     sal_Bool                GetToolBoxConfig() const;
     sal_Bool                GetStatusBarConfig() const;
@@ -235,16 +235,16 @@ public:
     virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        WriteSvIdl( SvIdlDataBase & rBase,
                                     SvStream & rOutStm, sal_uInt16 nTab );
-    virtual void        Insert( SvSlotElementList&, const rtl::OString& rPrefix,
+    virtual void        Insert( SvSlotElementList&, const OString& rPrefix,
                                 SvIdlDataBase& );
-    void                WriteSlotStubs( const rtl::OString& rShellName,
+    void                WriteSlotStubs( const OString& rShellName,
                                     ByteStringList & rList,
                                     SvStream & rOutStm );
-    sal_uInt16          WriteSlotMap( const rtl::OString& rShellName,
+    sal_uInt16          WriteSlotMap( const OString& rShellName,
                                     sal_uInt16 nCount,
                                     SvSlotElementList&,
                                     size_t nStart,
-                                    const rtl::OString&,
+                                    const OString&,
                                     SvIdlDataBase & rBase,
                                     SvStream & rOutStm );
     sal_uInt16              WriteSlotParamArray( SvIdlDataBase & rBase,
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 7189ceb14cd0..0efc9082e135 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -98,7 +98,7 @@ public:
 
     virtual sal_Bool        IsMethod() const;
     virtual sal_Bool        IsVariable() const;
-    virtual rtl::OString    GetMangleName( sal_Bool bVariable ) const;
+    virtual OString    GetMangleName( sal_Bool bVariable ) const;
 
 
     virtual sal_Bool        Test( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -111,14 +111,14 @@ public:
                                           WriteType, WriteAttribute );
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
-    sal_uLong           MakeSfx( rtl::OStringBuffer& rAtrrArray );
-    virtual void        Insert( SvSlotElementList&, const rtl::OString& rPrefix,
+    sal_uLong           MakeSfx( OStringBuffer& rAtrrArray );
+    virtual void        Insert( SvSlotElementList&, const OString& rPrefix,
                                 SvIdlDataBase& );
     virtual void        WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
                                   HelpIdTable& rIdTable );
     virtual void        WriteCSV( SvIdlDataBase&, SvStream& );
     void                FillIDTable(HelpIdTable& rIDTable);
-    rtl::OString        Compare( SvMetaAttribute *pAttr );
+    OString        Compare( SvMetaAttribute *pAttr );
 };
 SV_IMPL_REF(SvMetaAttribute)
 
@@ -144,7 +144,7 @@ class SvMetaType : public SvMetaExtern
     sal_Bool                        bIsShell;
     char                        cParserChar;
 
-    void    WriteSfxItem( const rtl::OString& rItemName, SvIdlDataBase & rBase,
+    void    WriteSfxItem( const OString& rItemName, SvIdlDataBase & rBase,
                         SvStream & rOutStm );
 protected:
     sal_Bool        ReadNamesSvIdl( SvIdlDataBase & rBase,
@@ -166,12 +166,12 @@ protected:
 public:
             SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 )
             SvMetaType();
-            SvMetaType( const rtl::OString& rTypeName, char cParserChar,
-                                const rtl::OString& rCName );
-            SvMetaType( const rtl::OString& rTypeName, const rtl::OString& rSbxName,
-                        const rtl::OString& rOdlName, char cParserChar,
-                        const rtl::OString& rCName, const rtl::OString& rBasicName,
-                        const rtl::OString& rBasicPostfix );
+            SvMetaType( const OString& rTypeName, char cParserChar,
+                                const OString& rCName );
+            SvMetaType( const OString& rTypeName, const OString& rSbxName,
+                        const OString& rOdlName, char cParserChar,
+                        const OString& rCName, const OString& rBasicName,
+                        const OString& rBasicPostfix );
 
     SvMetaAttributeMemberList & GetAttrList() const;
     sal_uLong               GetAttrCount() const
@@ -202,18 +202,18 @@ public:
     void                SetCall1( int e);
     int                 GetCall1() const;
 
-    void                SetBasicName(const rtl::OString& rName)
+    void                SetBasicName(const OString& rName)
                         { aBasicName.setString(rName); }
 
-    const rtl::OString& GetBasicName() const;
-    rtl::OString GetBasicPostfix() const;
-    const rtl::OString& GetSvName() const;
-    const rtl::OString& GetSbxName() const;
-    const rtl::OString& GetOdlName() const;
-    const rtl::OString& GetCName() const;
+    const OString& GetBasicName() const;
+    OString GetBasicPostfix() const;
+    const OString& GetSvName() const;
+    const OString& GetSbxName() const;
+    const OString& GetOdlName() const;
+    const OString& GetCName() const;
     char                GetParserChar() const { return cParserChar; }
 
-    virtual sal_Bool    SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
+    virtual sal_Bool    SetName( const OString& rName, SvIdlDataBase * = NULL );
 
 
     virtual sal_Bool    ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -221,20 +221,20 @@ public:
                                     SvStream & rOutStm, sal_uInt16 nTab );
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
-    rtl::OString        GetCString() const;
+    OString        GetCString() const;
     void                WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
     void                WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 
-    sal_uLong           MakeSfx( rtl::OStringBuffer& rAtrrArray );
+    sal_uLong           MakeSfx( OStringBuffer& rAtrrArray );
     virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
     sal_Bool                ReadMethodArgs( SvIdlDataBase & rBase,
                                              SvTokenStream & rInStm );
     void                WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
     void                WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
     void                WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
-    rtl::OString GetParserString() const;
+    OString GetParserString() const;
     void                WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                        const rtl::OString& rChief );
+                                        const OString& rChief );
 };
 SV_IMPL_REF(SvMetaType)
 
@@ -252,7 +252,7 @@ class SvMetaTypeStringMemberList : public SvDeclPersistList<SvMetaTypeString *>
 
 class SvMetaEnumValue : public SvMetaName
 {
-    rtl::OString aEnumValue;
+    OString aEnumValue;
 public:
     SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 )
     SvMetaEnumValue();
@@ -269,7 +269,7 @@ class SvMetaEnumValueMemberList : public SvDeclPersistList<SvMetaEnumValue *> {}
 class SvMetaTypeEnum : public SvMetaType
 {
     SvMetaEnumValueMemberList   aEnumValueList;
-    rtl::OString aPrefix;
+    OString aPrefix;
 protected:
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
@@ -282,7 +282,7 @@ public:
 
     sal_uInt16              GetMaxValue() const;
     sal_uLong               Count() const { return aEnumValueList.size(); }
-    const rtl::OString&     GetPrefix() const { return aPrefix; }
+    const OString&     GetPrefix() const { return aPrefix; }
     SvMetaEnumValue *   GetObject( sal_uLong n ) const
                         { return aEnumValueList[n]; }