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

49 files changed, 184 insertions, 186 deletions

diff --git a/idlc/inc/idlc/astarray.hxx b/idlc/inc/idlc/astarray.hxx
index e4e2bc5038b3..e75e0100b25a 100644
--- a/idlc/inc/idlc/astarray.hxx
+++ b/idlc/inc/idlc/astarray.hxx
@@ -25,7 +25,7 @@
 class AstArray : public AstType
 {
 public:
-    AstArray(const ::rtl::OString& name, AstType* pType, const ExprList& rDimExpr, AstScope* pScope);
+    AstArray(const OString& name, AstType* pType, const ExprList& rDimExpr, AstScope* pScope);
     AstArray(AstType* pType, const ExprList& rDimExpr, AstScope* pScope);
 
     virtual ~AstArray() {}
@@ -43,7 +43,7 @@ public:
         {   return m_dimension; }
 
 private:
-    ::rtl::OString makeName();
+    OString makeName();
 
     AstType*    m_pType;
     sal_uInt32  m_dimension;
diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index 4bf0e8f3b53c..7f88e49ffa03 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/idlc/astattribute.hxx
@@ -30,13 +30,13 @@ namespace typereg { class Writer; }
 class AstAttribute: public AstDeclaration, public AstScope {
 public:
     AstAttribute(
-        sal_uInt32 flags, AstType const * type, rtl::OString const & name,
+        sal_uInt32 flags, AstType const * type, OString const & name,
         AstScope * scope):
         AstDeclaration(NT_attribute, name, scope),
         AstScope(NT_attribute), m_flags(flags), m_pType(type)
     {}
 
-    AstAttribute(NodeType nodeType, sal_uInt32 flags, AstType const * pType, const ::rtl::OString& name, AstScope* pScope)
+    AstAttribute(NodeType nodeType, sal_uInt32 flags, AstType const * pType, const OString& name, AstScope* pScope)
         : AstDeclaration(nodeType, name, pScope), AstScope(nodeType)
         , m_flags(flags)
         , m_pType(pType)
@@ -44,8 +44,8 @@ public:
     virtual ~AstAttribute() {}
 
     void setExceptions(
-        rtl::OUString const * getDoc, DeclList const * getExc,
-        rtl::OUString const * setDoc, DeclList const * setExc)
+        OUString const * getDoc, DeclList const * getExc,
+        OUString const * setDoc, DeclList const * setExc)
     {
         if (getDoc != 0) {
             m_getDocumentation = *getDoc;
@@ -97,15 +97,15 @@ public:
 
 private:
     void dumpExceptions(
-        typereg::Writer & writer, rtl::OUString const & documentation,
+        typereg::Writer & writer, OUString const & documentation,
         DeclList const & exceptions, RTMethodMode flags,
         sal_uInt16 * methodIndex);
 
     const sal_uInt32    m_flags;
     AstType const * m_pType;
-    rtl::OUString m_getDocumentation;
+    OUString m_getDocumentation;
     DeclList m_getExceptions;
-    rtl::OUString m_setDocumentation;
+    OUString m_setDocumentation;
     DeclList m_setExceptions;
 };
 
diff --git a/idlc/inc/idlc/astbasetype.hxx b/idlc/inc/idlc/astbasetype.hxx
index 8b2afec94e7c..a788a16189b8 100644
--- a/idlc/inc/idlc/astbasetype.hxx
+++ b/idlc/inc/idlc/astbasetype.hxx
@@ -26,7 +26,7 @@
 class AstBaseType : public AstType
 {
 public:
-    AstBaseType(const ExprType type, const ::rtl::OString& name, AstScope* pScope)
+    AstBaseType(const ExprType type, const OString& name, AstScope* pScope)
         : AstType(NT_predefined, name, pScope)
         , m_exprType(type)
         {}
diff --git a/idlc/inc/idlc/astconstant.hxx b/idlc/inc/idlc/astconstant.hxx
index c5c184db6a83..e012ecd9db98 100644
--- a/idlc/inc/idlc/astconstant.hxx
+++ b/idlc/inc/idlc/astconstant.hxx
@@ -28,9 +28,9 @@ class AstConstant : public AstDeclaration
 {
 public:
     AstConstant(const ExprType type, const NodeType nodeType,
-                AstExpression* pExpr, const ::rtl::OString& name, AstScope* pScope);
+                AstExpression* pExpr, const OString& name, AstScope* pScope);
     AstConstant(const ExprType type, AstExpression* pExpr,
-                const ::rtl::OString& name, AstScope* pScope);
+                const OString& name, AstScope* pScope);
     virtual ~AstConstant();
 
     AstExpression* getConstValue()
diff --git a/idlc/inc/idlc/astconstants.hxx b/idlc/inc/idlc/astconstants.hxx
index 2f7ccf6e9129..e0f536da9d9c 100644
--- a/idlc/inc/idlc/astconstants.hxx
+++ b/idlc/inc/idlc/astconstants.hxx
@@ -24,7 +24,7 @@
 class AstConstants : public AstModule
 {
 public:
-    AstConstants(const ::rtl::OString& name, AstScope* pScope)
+    AstConstants(const OString& name, AstScope* pScope)
         : AstModule(NT_constants, name, pScope)
     {}
     virtual ~AstConstants() {}
diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx
index 25dd67f46076..6226a832de06 100644
--- a/idlc/inc/idlc/astdeclaration.hxx
+++ b/idlc/inc/idlc/astdeclaration.hxx
@@ -64,16 +64,16 @@ class AstDeclaration
 {
 public:
     // Constructors
-    AstDeclaration(NodeType type, const ::rtl::OString& name, AstScope* pScope);
+    AstDeclaration(NodeType type, const OString& name, AstScope* pScope);
     virtual ~AstDeclaration();
 
     // Data access
-    void setName(const ::rtl::OString& name);
-    const ::rtl::OString& getLocalName() const
+    void setName(const OString& name);
+    const OString& getLocalName() const
         { return m_localName; }
-    const ::rtl::OString&   getScopedName() const
+    const OString&   getScopedName() const
         { return m_scopedName; }
-    const ::rtl::OString&   getFullName()
+    const OString&   getFullName()
         { return m_fullName; }
     virtual const sal_Char* getRelativName() const
         { return m_fullName.getStr()+1; }
@@ -95,13 +95,13 @@ public:
         { return m_lineNumber; }
     void setLineNumber(sal_Int32 lineNumber)
         { m_lineNumber = lineNumber; }
-    const ::rtl::OString& getFileName() const
+    const OString& getFileName() const
         { return m_fileName; }
-    void setFileName(const ::rtl::OString& rFileName)
+    void setFileName(const OString& rFileName)
         { m_fileName = rFileName; }
-    const ::rtl::OUString& getDocumentation() const
+    const OUString& getDocumentation() const
         { return m_documentation; }
-    void setDocumentation(const ::rtl::OUString& rDocumentation)
+    void setDocumentation(const OUString& rDocumentation)
         { m_documentation = rDocumentation; }
     sal_Bool isAdded()
         { return m_bIsAdded; }
@@ -121,9 +121,9 @@ public:
     void setPredefined(bool bPredefined);
 
 protected:
-    ::rtl::OString      m_localName;
-    ::rtl::OString      m_scopedName;       // full qualified name
-    ::rtl::OString      m_fullName;         // full qualified name with '/' as seperator
+    OString      m_localName;
+    OString      m_scopedName;       // full qualified name
+    OString      m_fullName;         // full qualified name with '/' as seperator
     AstScope*           m_pScope;
     NodeType            m_nodeType;
     sal_Bool            m_bImported;        // imported ?
@@ -132,8 +132,8 @@ protected:
     bool                m_bPublished;
     bool                m_bPredefined;
     sal_Int32           m_lineNumber;       // line number defined in
-    ::rtl::OString      m_fileName;         // fileName defined in
-    ::rtl::OUString     m_documentation;    // fileName defined in
+    OString      m_fileName;         // fileName defined in
+    OUString     m_documentation;    // fileName defined in
 };
 
 #endif // _IDLC_ASTDECLARATION_HXX_
diff --git a/idlc/inc/idlc/astenum.hxx b/idlc/inc/idlc/astenum.hxx
index 38bee411f313..c332ba2a6cf3 100644
--- a/idlc/inc/idlc/astenum.hxx
+++ b/idlc/inc/idlc/astenum.hxx
@@ -27,7 +27,7 @@ class AstEnum : public AstType
               , public AstScope
 {
 public:
-    AstEnum(const ::rtl::OString& name, AstScope* pScope);
+    AstEnum(const OString& name, AstScope* pScope);
 
     virtual ~AstEnum();
 
diff --git a/idlc/inc/idlc/astexception.hxx b/idlc/inc/idlc/astexception.hxx
index eb5349bf8846..d51dca1a13d3 100644
--- a/idlc/inc/idlc/astexception.hxx
+++ b/idlc/inc/idlc/astexception.hxx
@@ -24,7 +24,7 @@
 class AstException : public AstStruct
 {
 public:
-    AstException(const ::rtl::OString& name, AstException* pBaseType, AstScope* pScope)
+    AstException(const OString& name, AstException* pBaseType, AstScope* pScope)
         : AstStruct(NT_exception, name, pBaseType, pScope)
         {}
 
diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx
index 80b4ea02786d..6caaf01d325f 100644
--- a/idlc/inc/idlc/astexpression.hxx
+++ b/idlc/inc/idlc/astexpression.hxx
@@ -102,7 +102,7 @@ public:
     AstExpression(sal_Int64         h);
     AstExpression(sal_uInt64        uh);
     AstExpression(double            d);
-    AstExpression(::rtl::OString* scopedName);
+    AstExpression(OString* scopedName);
 
     virtual ~AstExpression();
 
@@ -115,9 +115,9 @@ public:
         { return m_lineNo; }
     void setLine(sal_Int32 l)
         { m_lineNo = l; }
-    const ::rtl::OString& getFileName()
+    const OString& getFileName()
         { return m_fileName; }
-    void setFileName(const ::rtl::OString& fileName)
+    void setFileName(const OString& fileName)
         { m_fileName = fileName; }
     ExprComb getCombOperator()
         { return m_combOperator; }
@@ -135,9 +135,9 @@ public:
         { return m_subExpr2; }
     void setExpr2(AstExpression *pExpr)
         { m_subExpr2 = pExpr; }
-    ::rtl::OString* getSymbolicName()
+    OString* getSymbolicName()
         { return m_pSymbolicName; }
-    void setSymbolicName(::rtl::OString* pSymbolicName)
+    void setSymbolicName(OString* pSymbolicName)
         { m_pSymbolicName = pSymbolicName; }
 
     // Evaluation and value coercion
@@ -150,7 +150,7 @@ public:
     sal_Bool operator==(AstExpression *pExpr);
     sal_Bool compare(AstExpression *pExpr);
 
-    ::rtl::OString toString();
+    OString toString();
     void dump() {}
 private:
     // Fill out the lineno, filename and definition scope details
@@ -165,13 +165,13 @@ private:
 
     AstScope*       m_pScope;       // scope defined in
     sal_Int32       m_lineNo;       // line number defined in
-    ::rtl::OString  m_fileName;     // fileName defined in
+    OString  m_fileName;     // fileName defined in
 
     ExprComb        m_combOperator;
     AstExpression*  m_subExpr1;
     AstExpression*  m_subExpr2;
     AstExprValue*   m_exprValue;
-    ::rtl::OString* m_pSymbolicName;
+    OString* m_pSymbolicName;
 };
 
 #endif // _IDLC_ASTEXPRESSION_HXX_
diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/idlc/astinterface.hxx
index 1d4d231182e5..d4a05a0898a1 100644
--- a/idlc/inc/idlc/astinterface.hxx
+++ b/idlc/inc/idlc/astinterface.hxx
@@ -47,7 +47,7 @@ public:
     };
 
     AstInterface(
-        const ::rtl::OString& name, AstInterface const * pInherits,
+        const OString& name, AstInterface const * pInherits,
         AstScope* pScope);
     virtual ~AstInterface();
 
@@ -77,7 +77,7 @@ public:
 
     void addInheritedInterface(
         AstType const * ifc, bool optional,
-        rtl::OUString const & documentation);
+        OUString const & documentation);
 
     DoubleMemberDeclarations checkMemberClashes(
         AstDeclaration const * member) const;
@@ -97,18 +97,18 @@ private:
         explicit VisibleMember(AstDeclaration const * theMandatory = 0):
             mandatory(theMandatory) {}
 
-        typedef std::map< rtl::OString, AstDeclaration const * > Optionals;
+        typedef std::map< OString, AstDeclaration const * > Optionals;
 
         AstDeclaration const * mandatory;
         Optionals optionals;
     };
 
-    typedef std::map< rtl::OString, InterfaceKind > VisibleInterfaces;
-    typedef std::map< rtl::OString, VisibleMember > VisibleMembers;
+    typedef std::map< OString, InterfaceKind > VisibleInterfaces;
+    typedef std::map< OString, VisibleMember > VisibleMembers;
 
     void checkInheritedInterfaceClashes(
         DoubleDeclarations & doubleDeclarations,
-        std::set< rtl::OString > & seenInterfaces, AstInterface const * ifc,
+        std::set< OString > & seenInterfaces, AstInterface const * ifc,
         bool optional, bool direct, bool mainOptional) const;
 
     void checkMemberClashes(
diff --git a/idlc/inc/idlc/astinterfacemember.hxx b/idlc/inc/idlc/astinterfacemember.hxx
index 1cd89d2132cf..544bb18e3936 100644
--- a/idlc/inc/idlc/astinterfacemember.hxx
+++ b/idlc/inc/idlc/astinterfacemember.hxx
@@ -25,7 +25,7 @@ class AstInterfaceMember : public AstDeclaration
 {
 public:
     AstInterfaceMember(const sal_uInt32 flags, AstInterface* pRealInterface,
-                       const ::rtl::OString& name, AstScope* pScope)
+                       const OString& name, AstScope* pScope)
         : AstDeclaration(NT_interface_member, name, pScope)
         , m_flags(flags)
         , m_pRealInterface(pRealInterface)
diff --git a/idlc/inc/idlc/astmember.hxx b/idlc/inc/idlc/astmember.hxx
index fd98b299aa02..3fec89005fc8 100644
--- a/idlc/inc/idlc/astmember.hxx
+++ b/idlc/inc/idlc/astmember.hxx
@@ -29,7 +29,7 @@ class AstType;
 class AstMember: public AstDeclaration {
 public:
     AstMember(
-        AstType const * pType, rtl::OString const & name, AstScope * pScope):
+        AstType const * pType, OString const & name, AstScope * pScope):
         AstDeclaration(NT_member, name, pScope), m_pType(pType) {}
 
     virtual ~AstMember() {}
@@ -38,7 +38,7 @@ public:
 
 protected:
     AstMember(
-        NodeType type, AstType const * pType, rtl::OString const & name,
+        NodeType type, AstType const * pType, OString const & name,
         AstScope * pScope):
         AstDeclaration(type, name, pScope), m_pType(pType) {}
 
diff --git a/idlc/inc/idlc/astmodule.hxx b/idlc/inc/idlc/astmodule.hxx
index 249af84de270..93e12b1c4ba9 100644
--- a/idlc/inc/idlc/astmodule.hxx
+++ b/idlc/inc/idlc/astmodule.hxx
@@ -26,11 +26,11 @@ class AstModule : public AstDeclaration
                 , public AstScope
 {
 public:
-    AstModule(const ::rtl::OString& name, AstScope* pScope)
+    AstModule(const OString& name, AstScope* pScope)
         : AstDeclaration(NT_module, name, pScope)
         , AstScope(NT_module)
     {}
-    AstModule(NodeType type, const ::rtl::OString& name, AstScope* pScope)
+    AstModule(NodeType type, const OString& name, AstScope* pScope)
         : AstDeclaration(type, name, pScope)
         , AstScope(type)
     {}
diff --git a/idlc/inc/idlc/astneeds.hxx b/idlc/inc/idlc/astneeds.hxx
index 53c8bc2b488b..38e95bd217cb 100644
--- a/idlc/inc/idlc/astneeds.hxx
+++ b/idlc/inc/idlc/astneeds.hxx
@@ -24,7 +24,7 @@
 class AstNeeds : public AstDeclaration
 {
 public:
-    AstNeeds(AstService* pRealService, const ::rtl::OString& name, AstScope* pScope)
+    AstNeeds(AstService* pRealService, const OString& name, AstScope* pScope)
         : AstDeclaration(NT_needs, name, pScope)
         , m_pRealService(pRealService)
         {}
diff --git a/idlc/inc/idlc/astobserves.hxx b/idlc/inc/idlc/astobserves.hxx
index 06ec9884a64e..d939073a76de 100644
--- a/idlc/inc/idlc/astobserves.hxx
+++ b/idlc/inc/idlc/astobserves.hxx
@@ -24,7 +24,7 @@
 class AstObserves : public AstDeclaration
 {
 public:
-    AstObserves(AstInterface* pRealInterface, const ::rtl::OString& name, AstScope* pScope)
+    AstObserves(AstInterface* pRealInterface, const OString& name, AstScope* pScope)
         : AstDeclaration(NT_observes, name, pScope)
         , m_pRealInterface(pRealInterface)
         {}
diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/idlc/astoperation.hxx
index 90ea5c9c918a..4b6b8e7d14d5 100644
--- a/idlc/inc/idlc/astoperation.hxx
+++ b/idlc/inc/idlc/astoperation.hxx
@@ -30,7 +30,7 @@ class AstOperation : public AstDeclaration
                    , public AstScope
 {
 public:
-    AstOperation(AstType* pReturnType, const ::rtl::OString& name, AstScope* pScope)
+    AstOperation(AstType* pReturnType, const OString& name, AstScope* pScope)
         : AstDeclaration(NT_operation, name, pScope)
         , AstScope(NT_operation)
         , m_pReturnType(pReturnType)
diff --git a/idlc/inc/idlc/astparameter.hxx b/idlc/inc/idlc/astparameter.hxx
index fa80864efbe3..7bf8ce05b0c0 100644
--- a/idlc/inc/idlc/astparameter.hxx
+++ b/idlc/inc/idlc/astparameter.hxx
@@ -28,7 +28,7 @@ class AstParameter: public AstMember {
 public:
     AstParameter(
         Direction direction, bool rest, AstType const * type,
-        rtl::OString const & name, AstScope * scope):
+        OString const & name, AstScope * scope):
         AstMember(NT_parameter, type, name, scope), m_direction(direction),
         m_rest(rest) {}
 
diff --git a/idlc/inc/idlc/astscope.hxx b/idlc/inc/idlc/astscope.hxx
index ec66c7a44a21..c3efcadba5a8 100644
--- a/idlc/inc/idlc/astscope.hxx
+++ b/idlc/inc/idlc/astscope.hxx
@@ -45,12 +45,12 @@ public:
     sal_uInt16 getNodeCount(NodeType nType);
 
     // Name look up mechanism
-    AstDeclaration* lookupByName(const ::rtl::OString& scopedName);
+    AstDeclaration* lookupByName(const OString& scopedName);
     // Look up the identifier 'name' specified only in the local scope
-    AstDeclaration* lookupByNameLocal(const ::rtl::OString& name) const;
+    AstDeclaration* lookupByNameLocal(const OString& name) const;
 
-    AstDeclaration* lookupInForwarded(const ::rtl::OString& scopedName);
-    AstDeclaration* lookupInInherited(const ::rtl::OString& scopedName) const;
+    AstDeclaration* lookupInForwarded(const OString& scopedName);
+    AstDeclaration* lookupInInherited(const OString& scopedName) const;
 
     // Look up a predefined type by its ExprType
     AstDeclaration* lookupPrimitiveType(ExprType type);
diff --git a/idlc/inc/idlc/astsequence.hxx b/idlc/inc/idlc/astsequence.hxx
index 62c80bd276d3..622df5aaf4c6 100644
--- a/idlc/inc/idlc/astsequence.hxx
+++ b/idlc/inc/idlc/astsequence.hxx
@@ -25,7 +25,7 @@ class AstSequence : public AstType
 {
 public:
     AstSequence(AstType* pMemberType, AstScope* pScope)
-        : AstType(NT_sequence, ::rtl::OString("[]")+pMemberType->getScopedName(), pScope)
+        : AstType(NT_sequence, OString("[]")+pMemberType->getScopedName(), pScope)
         , m_pMemberType(pMemberType)
         , m_pRelativName(NULL)
     {}
@@ -44,7 +44,7 @@ public:
     virtual const sal_Char* getRelativName() const;
 private:
     AstType*        m_pMemberType;
-    mutable ::rtl::OString* m_pRelativName;
+    mutable OString* m_pRelativName;
 };
 
 #endif // _IDLC_ASTSEQUENCE_HXX_
diff --git a/idlc/inc/idlc/astservice.hxx b/idlc/inc/idlc/astservice.hxx
index d3e0b643b5d9..2cca3ca2b2d4 100644
--- a/idlc/inc/idlc/astservice.hxx
+++ b/idlc/inc/idlc/astservice.hxx
@@ -26,13 +26,13 @@ class AstService : public AstDeclaration
                  , public AstScope
 {
 public:
-    AstService(const ::rtl::OString& name, AstScope* pScope)
+    AstService(const OString& name, AstScope* pScope)
         : AstDeclaration(NT_service, name, pScope)
         , AstScope(NT_service)
         , m_singleInterfaceBasedService(false)
         , m_defaultConstructor(false)
         {}
-    AstService(const NodeType type, const ::rtl::OString& name, AstScope* pScope)
+    AstService(const NodeType type, const OString& name, AstScope* pScope)
         : AstDeclaration(type, name, pScope)
         , AstScope(type)
         , m_singleInterfaceBasedService(false)
diff --git a/idlc/inc/idlc/astservicemember.hxx b/idlc/inc/idlc/astservicemember.hxx
index 533aa680ae46..8bed1770040f 100644
--- a/idlc/inc/idlc/astservicemember.hxx
+++ b/idlc/inc/idlc/astservicemember.hxx
@@ -25,7 +25,7 @@ class AstServiceMember : public AstDeclaration
 {
 public:
     AstServiceMember(const sal_uInt32 flags, AstService* pRealService,
-                     const ::rtl::OString& name, AstScope* pScope)
+                     const OString& name, AstScope* pScope)
         : AstDeclaration(NT_service_member, name, pScope)
         , m_flags(flags)
         , m_pRealService(pRealService)
diff --git a/idlc/inc/idlc/aststruct.hxx b/idlc/inc/idlc/aststruct.hxx
index e3c26c577fd7..837bbafddd6d 100644
--- a/idlc/inc/idlc/aststruct.hxx
+++ b/idlc/inc/idlc/aststruct.hxx
@@ -31,12 +31,12 @@ class AstStruct : public AstType
 {
 public:
     AstStruct(
-        const ::rtl::OString& name,
-        std::vector< rtl::OString > const & typeParameters,
+        const OString& name,
+        std::vector< OString > const & typeParameters,
         AstStruct* pBaseType, AstScope* pScope);
 
     AstStruct(const NodeType type,
-              const ::rtl::OString& name,
+              const OString& name,
               AstStruct* pBaseType,
               AstScope* pScope);
     virtual ~AstStruct();
@@ -47,7 +47,7 @@ public:
     DeclList::size_type getTypeParameterCount() const
     { return m_typeParameters.size(); }
 
-    AstDeclaration const * findTypeParameter(rtl::OString const & name) const;
+    AstDeclaration const * findTypeParameter(OString const & name) const;
 
     virtual bool isType() const;
 
diff --git a/idlc/inc/idlc/asttype.hxx b/idlc/inc/idlc/asttype.hxx
index 782a9ad3c628..cea157a8d7f9 100644
--- a/idlc/inc/idlc/asttype.hxx
+++ b/idlc/inc/idlc/asttype.hxx
@@ -24,7 +24,7 @@
 class AstType : public AstDeclaration
 {
 public:
-    AstType(const NodeType type, const ::rtl::OString& name, AstScope* pScope)
+    AstType(const NodeType type, const OString& name, AstScope* pScope)
         : AstDeclaration(type, name, pScope)
         {}
 
diff --git a/idlc/inc/idlc/asttypedef.hxx b/idlc/inc/idlc/asttypedef.hxx
index 99ba094a459f..2e1f4cd0c257 100644
--- a/idlc/inc/idlc/asttypedef.hxx
+++ b/idlc/inc/idlc/asttypedef.hxx
@@ -25,7 +25,7 @@ class AstTypeDef : public AstType
 {
 public:
     AstTypeDef(
-        AstType const * baseType, rtl::OString const & name, AstScope * scope):
+        AstType const * baseType, OString const & name, AstScope * scope):
         AstType(NT_typedef, name, scope), m_pBaseType(baseType) {}
 
     virtual ~AstTypeDef() {}
diff --git a/idlc/inc/idlc/astunion.hxx b/idlc/inc/idlc/astunion.hxx
index e0859f97a1c6..d1b9b477c7b7 100644
--- a/idlc/inc/idlc/astunion.hxx
+++ b/idlc/inc/idlc/astunion.hxx
@@ -25,7 +25,7 @@
 class AstUnion : public AstStruct
 {
 public:
-    AstUnion(const ::rtl::OString& name, AstType* pDiscType, AstScope* pScope);
+    AstUnion(const OString& name, AstType* pDiscType, AstScope* pScope);
     virtual ~AstUnion();
 
     AstType* getDiscrimantType()
diff --git a/idlc/inc/idlc/astunionbranch.hxx b/idlc/inc/idlc/astunionbranch.hxx
index aaca29a3bba6..9c114da45152 100644
--- a/idlc/inc/idlc/astunionbranch.hxx
+++ b/idlc/inc/idlc/astunionbranch.hxx
@@ -25,7 +25,7 @@
 class AstUnionBranch : public AstMember
 {
 public:
-    AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, const ::rtl::OString& name, AstScope* pScope);
+    AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, const OString& name, AstScope* pScope);
     virtual ~AstUnionBranch();
 
     AstUnionLabel* getLabel()
diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/idlc/errorhandler.hxx
index 0853bb1545f9..8a7b1e4b07e2 100644
--- a/idlc/inc/idlc/errorhandler.hxx
+++ b/idlc/inc/idlc/errorhandler.hxx
@@ -112,21 +112,21 @@ public:
     void    coercionError(AstExpression *pExpr, ExprType et);
 
     // Report a failed name lookup attempt
-    void    lookupError(const ::rtl::OString& n);
+    void    lookupError(const OString& n);
     // Report a failed name lookup attempt
-    void    lookupError(ErrorCode e, const ::rtl::OString& n, AstDeclaration* pScope);
+    void    lookupError(ErrorCode e, const OString& n, AstDeclaration* pScope);
 
 
     // Report a type error
     void    noTypeError(AstDeclaration const * pDecl);
 
-    void    inheritanceError(NodeType nodeType, const ::rtl::OString* name, AstDeclaration* pDecl);
+    void    inheritanceError(NodeType nodeType, const OString* name, AstDeclaration* pDecl);
 
     void    flagError(ErrorCode e, sal_uInt32 flag);
 
-    void    forwardLookupError(AstDeclaration* pForward, const ::rtl::OString& name);
+    void    forwardLookupError(AstDeclaration* pForward, const OString& name);
 
-    void    constantExpected(AstDeclaration* pDecl, const ::rtl::OString& name);
+    void    constantExpected(AstDeclaration* pDecl, const OString& name);
 
     void    evalError(AstExpression* pExpr);
 
@@ -137,7 +137,7 @@ public:
     void    enumValExpected(AstUnion* pUnion);
 
     // Report a failed enumerator lookup in an enum
-    void    enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const ::rtl::OString& name);
+    void    enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const OString& name);
 
     bool checkPublished(AstDeclaration const * decl, bool bOptiional=false);
 };
diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/idlc/fehelper.hxx
index 9e01f54152c2..f93341a4bd62 100644
--- a/idlc/inc/idlc/fehelper.hxx
+++ b/idlc/inc/idlc/fehelper.hxx
@@ -34,12 +34,12 @@ public:
         FD_complex      // Complex declarator (complex_part field used)
     };
 
-    FeDeclarator(const ::rtl::OString& name, DeclaratorType declType, AstDeclaration* pComplPart);
+    FeDeclarator(const OString& name, DeclaratorType declType, AstDeclaration* pComplPart);
     virtual ~FeDeclarator();
 
     AstDeclaration* getComplexPart()
         { return m_pComplexPart; }
-    const ::rtl::OString& getName()
+    const OString& getName()
         { return m_name; }
     DeclaratorType  getDeclType()
         { return m_declType; }
@@ -48,7 +48,7 @@ public:
     AstType const * compose(AstDeclaration const * pDecl);
 private:
     AstDeclaration* m_pComplexPart;
-    ::rtl::OString  m_name;
+    OString  m_name;
     DeclaratorType  m_declType;
 };
 
@@ -58,8 +58,8 @@ class FeInheritanceHeader
 {
 public:
     FeInheritanceHeader(
-        NodeType nodeType, ::rtl::OString* pName, ::rtl::OString* pInherits,
-        std::vector< rtl::OString > * typeParameters);
+        NodeType nodeType, OString* pName, OString* pInherits,
+        std::vector< OString > * typeParameters);
 
     virtual ~FeInheritanceHeader()
     {
@@ -69,21 +69,21 @@ public:
 
     NodeType getNodeType()
         { return m_nodeType; }
-    ::rtl::OString* getName()
+    OString* getName()
         { return m_pName; }
     AstDeclaration* getInherits()
         { return m_pInherits; }
 
-    std::vector< rtl::OString > const & getTypeParameters() const
+    std::vector< OString > const & getTypeParameters() const
     { return m_typeParameters; }
 
 private:
-    void initializeInherits(::rtl::OString* pinherits);
+    void initializeInherits(OString* pinherits);
 
     NodeType        m_nodeType;
-    ::rtl::OString* m_pName;
+    OString* m_pName;
     AstDeclaration* m_pInherits;
-    std::vector< rtl::OString > m_typeParameters;
+    std::vector< OString > m_typeParameters;
 };
 
 #endif // _IDLC_FEHELPER_HXX_
diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc/idlc.hxx
index 30f54362b4bf..452cd913294e 100644
--- a/idlc/inc/idlc/idlc.hxx
+++ b/idlc/inc/idlc/idlc.hxx
@@ -45,8 +45,8 @@ public:
 
     void init();
 
-    bool dumpDeps(::rtl::OString const& rDepFile,
-                  ::rtl::OString const& rTarget);
+    bool dumpDeps(OString const& rDepFile,
+                  OString const& rTarget);
 
     Options* getOptions()
         { return m_pOptions; }
@@ -56,24 +56,24 @@ public:
         { return m_pRoot; }
     ErrorHandler* error()
         { return m_pErrorHandler; }
-    const ::rtl::OString& getFileName()
+    const OString& getFileName()
         { return m_fileName; }
-    void setFileName(const ::rtl::OString& fileName)
+    void setFileName(const OString& fileName)
         { m_fileName = fileName; addInclude(fileName); }
-    const ::rtl::OString& getMainFileName()
+    const OString& getMainFileName()
         { return m_mainFileName; }
-    void setMainFileName(const ::rtl::OString& mainFileName)
+    void setMainFileName(const OString& mainFileName)
         { m_mainFileName = mainFileName; }
-    const ::rtl::OString& getRealFileName()
+    const OString& getRealFileName()
         { return m_realFileName; }
-    void setRealFileName(const ::rtl::OString& realFileName)
+    void setRealFileName(const OString& realFileName)
         { m_realFileName = realFileName; }
-    const ::rtl::OString& getDocumentation()
+    const OString& getDocumentation()
         {
             m_bIsDocValid = sal_False;
             return m_documentation;
         }
-    void setDocumentation(const ::rtl::OString& documentation)
+    void setDocumentation(const OString& documentation)
         {
             m_documentation = documentation;
             m_bIsDocValid = sal_True;
@@ -112,7 +112,7 @@ public:
     void setParseState(ParseState parseState)
         { m_parseState = parseState; }
 
-    void addInclude(const ::rtl::OString& inc)
+    void addInclude(const OString& inc)
         { m_includes.insert(inc); }
     StringSet* getIncludes()
         { return &m_includes; }
@@ -126,10 +126,10 @@ private:
     AstStack*           m_pScopes;
     AstModule*          m_pRoot;
     ErrorHandler*       m_pErrorHandler;
-    ::rtl::OString      m_fileName;
-    ::rtl::OString      m_mainFileName;
-    ::rtl::OString      m_realFileName;
-    ::rtl::OString      m_documentation;
+    OString      m_fileName;
+    OString      m_mainFileName;
+    OString      m_realFileName;
+    OString      m_documentation;
     sal_Bool            m_bIsDocValid;
     sal_Bool            m_bGenerateDoc;
     sal_Bool            m_bIsInMainfile;
@@ -144,21 +144,21 @@ private:
 };
 
 
-typedef ::std::pair< ::rtl::OString, ::rtl::OString > sPair_t;
-sal_Int32 compileFile(const ::rtl::OString * pathname);
+typedef ::std::pair< OString, OString > sPair_t;
+sal_Int32 compileFile(const OString * pathname);
     // a null pathname means stdin
-sal_Int32 produceFile(const ::rtl::OString& filenameBase,
+sal_Int32 produceFile(const OString& filenameBase,
         sPair_t const*const pDepFile);
     // filenameBase is filename without ".idl"
-void removeIfExists(const ::rtl::OString& pathname);
+void removeIfExists(const OString& pathname);
 
-::rtl::OString makeTempName(const ::rtl::OString& prefix, const ::rtl::OString& postfix);
-sal_Bool copyFile(const ::rtl::OString* source, const ::rtl::OString& target);
+OString makeTempName(const OString& prefix, const OString& postfix);
+sal_Bool copyFile(const OString* source, const OString& target);
     // a null source means stdin
 
-sal_Bool isFileUrl(const ::rtl::OString& fileName);
-::rtl::OString convertToAbsoluteSystemPath(const ::rtl::OString& fileName);
-::rtl::OString convertToFileUrl(const ::rtl::OString& fileName);
+sal_Bool isFileUrl(const OString& fileName);
+OString convertToAbsoluteSystemPath(const OString& fileName);
+OString convertToFileUrl(const OString& fileName);
 
 Idlc* SAL_CALL idlc();
 Idlc* SAL_CALL setIdlc(Options* pOptions);
diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx
index 5f657f3a3926..32214d6b77d3 100644
--- a/idlc/inc/idlc/idlctypes.hxx
+++ b/idlc/inc/idlc/idlctypes.hxx
@@ -32,7 +32,7 @@
 
 struct EqualString
 {
-    sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const
+    sal_Bool operator()(const OString& str1, const OString& str2) const
     {
         return (str1 == str2);
     }
@@ -40,7 +40,7 @@ struct EqualString
 
 struct HashString
 {
-    sal_Int32 operator()(const ::rtl::OString& str) const
+    sal_Int32 operator()(const OString& str) const
     {
         return str.hashCode();
     }
@@ -48,15 +48,15 @@ struct HashString
 
 struct LessString
 {
-    sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const
+    sal_Bool operator()(const OString& str1, const OString& str2) const
     {
         return (str1 < str2);
     }
 };
 
-typedef ::std::list< ::rtl::OString >               StringList;
-typedef ::std::vector< ::rtl::OString >             StringVector;
-typedef ::std::set< ::rtl::OString, LessString >    StringSet;
+typedef ::std::list< OString >               StringList;
+typedef ::std::vector< OString >             StringVector;
+typedef ::std::set< OString, LessString >    StringSet;
 
 class AstExpression;
 typedef ::std::list< AstExpression* >   ExprList;
@@ -66,7 +66,7 @@ typedef ::std::list< AstUnionLabel* >   LabelList;
 
 class AstDeclaration;
 
-typedef ::boost::unordered_map< ::rtl::OString, AstDeclaration*, HashString, EqualString > DeclMap;
+typedef ::boost::unordered_map< OString, AstDeclaration*, HashString, EqualString > DeclMap;
 typedef ::std::list< AstDeclaration* > DeclList;
 
 class AstScope;
diff --git a/idlc/inc/idlc/inheritedinterface.hxx b/idlc/inc/idlc/inheritedinterface.hxx
index 21cadf734671..41134e57caef 100644
--- a/idlc/inc/idlc/inheritedinterface.hxx
+++ b/idlc/inc/idlc/inheritedinterface.hxx
@@ -31,7 +31,7 @@ class InheritedInterface {
 public:
     InheritedInterface(
         AstType const * theInterface, bool theOptional,
-        rtl::OUString const & theDocumentation):
+        OUString const & theDocumentation):
         interface(theInterface), optional(theOptional),
         documentation(theDocumentation) {}
 
@@ -42,12 +42,12 @@ public:
 
     bool isOptional() const { return optional; }
 
-    rtl::OUString getDocumentation() const { return documentation; }
+    OUString getDocumentation() const { return documentation; }
 
 private:
     AstType const * interface;
     bool optional;
-    rtl::OUString documentation;
+    OUString documentation;
 };
 
 #endif
diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx
index 474b2be2dcc7..5e9ca97110f1 100644
--- a/idlc/inc/idlc/options.hxx
+++ b/idlc/inc/idlc/options.hxx
@@ -22,18 +22,18 @@
 
 #include <idlc/idlctypes.hxx>
 
-typedef ::boost::unordered_map< ::rtl::OString,
-                         ::rtl::OString,
+typedef ::boost::unordered_map< OString,
+                         OString,
                          HashString,
                          EqualString > OptionMap;
 
 class IllegalArgument
 {
 public:
-    IllegalArgument(const ::rtl::OString& msg)
+    IllegalArgument(const OString& msg)
         : m_message(msg) {}
 
-    ::rtl::OString  m_message;
+    OString  m_message;
 };
 
 
@@ -57,12 +57,12 @@ public:
         throw( IllegalArgument );
 #endif /* @@@ */
 
-    ::rtl::OString prepareHelp();
-    ::rtl::OString prepareVersion();
+    OString prepareHelp();
+    OString prepareVersion();
 
-    const ::rtl::OString&   getProgramName() const;
-    bool                isValid(const ::rtl::OString& option);
-    const ::rtl::OString&   getOption(const ::rtl::OString& option)
+    const OString&   getProgramName() const;
+    bool                isValid(const OString& option);
+    const OString&   getOption(const OString& option)
         throw( IllegalArgument );
 
     const StringVector& getInputFiles() const { return m_inputFiles; }
@@ -71,7 +71,7 @@ public:
     bool quiet() const { return m_quiet; }
 
 protected:
-    ::rtl::OString  m_program;
+    OString  m_program;
     StringVector    m_inputFiles;
     bool            m_stdin;
     bool            m_verbose;
diff --git a/idlc/source/astconstant.cxx b/idlc/source/astconstant.cxx
index 727a757bf90c..dae0e2d414c3 100644
--- a/idlc/source/astconstant.cxx
+++ b/idlc/source/astconstant.cxx
@@ -27,7 +27,7 @@ using namespace ::rtl;
 AstConstant::AstConstant(const ExprType type,
                          const NodeType nodeType,
                          AstExpression* pExpr,
-                         const ::rtl::OString& name,
+                         const OString& name,
                          AstScope* pScope)
     : AstDeclaration(nodeType, name, pScope)
     , m_pConstValue(pExpr)
@@ -37,7 +37,7 @@ AstConstant::AstConstant(const ExprType type,
 
 AstConstant::AstConstant(const ExprType type,
                          AstExpression* pExpr,
-                         const ::rtl::OString& name,
+                         const OString& name,
                          AstScope* pScope)
     : AstDeclaration(NT_const, name, pScope)
     , m_pConstValue(pExpr)
diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx
index ef0996323153..c5733f9ccb4c 100644
--- a/idlc/source/astdeclaration.cxx
+++ b/idlc/source/astdeclaration.cxx
@@ -97,7 +97,7 @@ void AstDeclaration::setPredefined(bool bPredefined)
     }
 }
 
-void AstDeclaration::setName(const ::rtl::OString& name)
+void AstDeclaration::setName(const OString& name)
 {
     m_scopedName = name;
     sal_Int32 nIndex = name.lastIndexOf( ':' );
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 684555ce75b3..fd5e2db43c01 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -219,13 +219,13 @@ sal_Bool AstService::dump(RegistryKey& rKey)
     }
     RegistryKey localKey;
     if (rKey.createKey(
-            rtl::OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8),
+            OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8),
             localKey)) {
         fprintf(
             stderr, "%s: warning, could not create key '%s' in '%s'\n",
             idlc()->getOptions()->getProgramName().getStr(),
             getFullName().getStr(),
-            rtl::OUStringToOString(
+            OUStringToOString(
                 rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return false;
     }
@@ -233,12 +233,12 @@ sal_Bool AstService::dump(RegistryKey& rKey)
         version, getDocumentation(), emptyStr,
         getNodeType() == NT_singleton ? RT_TYPE_SINGLETON : RT_TYPE_SERVICE,
         m_bPublished,
-        rtl::OStringToOUString(getRelativName(), RTL_TEXTENCODING_UTF8),
+        OStringToOUString(getRelativName(), RTL_TEXTENCODING_UTF8),
         superName.isEmpty() ? 0 : 1, properties, constructors,
         references);
     if (!superName.isEmpty()) {
         writer.setSuperTypeName(
-            0, rtl::OStringToOUString(superName, RTL_TEXTENCODING_UTF8));
+            0, OStringToOUString(superName, RTL_TEXTENCODING_UTF8));
     }
     sal_uInt16 constructorIndex = 0;
     sal_uInt16 propertyIndex = 0;
@@ -260,7 +260,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
             writer.setReferenceData(
                 referenceIndex++, decl->getDocumentation(), RT_REF_SUPPORTS,
                 (decl->isOptional() ? RT_ACCESS_OPTIONAL : RT_ACCESS_INVALID),
-                rtl::OStringToOUString( decl->getRealInterface()->getRelativName(),
+                OStringToOUString( decl->getRealInterface()->getRelativName(),
                                         RTL_TEXTENCODING_UTF8));
             break;
         }
@@ -271,7 +271,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
                 AstServiceMember * decl = (AstServiceMember *)(*i);
                 writer.setReferenceData(referenceIndex++, decl->getDocumentation(), RT_REF_EXPORTS,
                     (decl->isOptional() ? RT_ACCESS_OPTIONAL : RT_ACCESS_INVALID),
-                    rtl::OStringToOUString(decl->getRealService()->getRelativName(),
+                    OStringToOUString(decl->getRealService()->getRelativName(),
                                            RTL_TEXTENCODING_UTF8));
             }
             break;
@@ -281,7 +281,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
                 AstObserves * decl = (AstObserves *)(*i);
                 writer.setReferenceData(referenceIndex++, decl->getDocumentation(), RT_REF_OBSERVES,
                     RT_ACCESS_INVALID,
-                    rtl::OStringToOUString( decl->getRealInterface()->getRelativName(),
+                    OStringToOUString( decl->getRealInterface()->getRelativName(),
                                             RTL_TEXTENCODING_UTF8));
                 break;
             }
@@ -291,7 +291,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
                 AstNeeds * decl = (AstNeeds *)(*i);
                 writer.setReferenceData( referenceIndex++, decl->getDocumentation(), RT_REF_NEEDS,
                     RT_ACCESS_INVALID,
-                    rtl::OStringToOUString( decl->getRealService()->getRelativName(),
+                    OStringToOUString( decl->getRealService()->getRelativName(),
                                             RTL_TEXTENCODING_UTF8));
                 break;
             }
@@ -304,7 +304,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
     if (m_defaultConstructor) {
         writer.setMethodData(
             constructorIndex++, emptyStr, RT_MODE_TWOWAY,
-            emptyStr, rtl::OUString("void"),
+            emptyStr, OUString("void"),
             0, 0);
     }
     sal_uInt32 size;
@@ -317,7 +317,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
             stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
             idlc()->getOptions()->getProgramName().getStr(),
             getFullName().getStr(),
-            rtl::OUStringToOString(
+            OUStringToOString(
                 localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return false;
     }
@@ -385,7 +385,7 @@ sal_Bool AstAttribute::dumpBlob(
 }
 
 void AstAttribute::dumpExceptions(
-    typereg::Writer & writer, rtl::OUString const & documentation,
+    typereg::Writer & writer, OUString const & documentation,
     DeclList const & exceptions, RTMethodMode flags, sal_uInt16 * methodIndex)
 {
     if (!exceptions.empty()) {
@@ -396,7 +396,7 @@ void AstAttribute::dumpExceptions(
         writer.setMethodData(
             idx, documentation, flags,
             OStringToOUString(getLocalName(), RTL_TEXTENCODING_UTF8),
-            rtl::OUString("void"), 0,
+            OUString("void"), 0,
             static_cast< sal_uInt16 >(exceptions.size()));
         sal_uInt16 exceptionIndex = 0;
         for (DeclList::const_iterator i(exceptions.begin());
@@ -404,7 +404,7 @@ void AstAttribute::dumpExceptions(
         {
             writer.setMethodExceptionTypeName(
                 idx, exceptionIndex++,
-                rtl::OStringToOUString(
+                OStringToOUString(
                     (*i)->getRelativName(), RTL_TEXTENCODING_UTF8));
         }
     }
diff --git a/idlc/source/astenum.cxx b/idlc/source/astenum.cxx
index 2e6cbcb4e722..2edfb7cb9c49 100644
--- a/idlc/source/astenum.cxx
+++ b/idlc/source/astenum.cxx
@@ -24,7 +24,7 @@
 
 using namespace ::rtl;
 
-AstEnum::AstEnum(const ::rtl::OString& name, AstScope* pScope)
+AstEnum::AstEnum(const OString& name, AstScope* pScope)
     : AstType(NT_enum, name, pScope)
     , AstScope(NT_enum)
     , m_enumValueCount(0)
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index df13e960b772..f35d4d019f71 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -110,7 +110,7 @@ AstExpression::AstExpression(double d)
     m_exprValue->u.dval = d;
 }
 
-AstExpression::AstExpression(::rtl::OString* scopedName)
+AstExpression::AstExpression(OString* scopedName)
     : m_combOperator(EC_symbol)
     , m_subExpr1(NULL)
     , m_subExpr2(NULL)
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx
index 3b8336485855..7d9f0dc1d515 100644
--- a/idlc/source/astinterface.cxx
+++ b/idlc/source/astinterface.cxx
@@ -27,7 +27,7 @@
 
 using namespace ::rtl;
 
-AstInterface::AstInterface(const ::rtl::OString& name,
+AstInterface::AstInterface(const OString& name,
                            AstInterface const * pInherits,
                            AstScope* pScope)
     : AstType(NT_interface, name, pScope)
@@ -39,7 +39,7 @@ AstInterface::AstInterface(const ::rtl::OString& name,
     , m_bSingleInheritance(pInherits != 0)
 {
     if (pInherits != 0) {
-        addInheritedInterface(pInherits, false, rtl::OUString());
+        addInheritedInterface(pInherits, false, OUString());
     }
 }
 
@@ -51,14 +51,14 @@ AstInterface::DoubleDeclarations AstInterface::checkInheritedInterfaceClashes(
     AstInterface const * ifc, bool optional) const
 {
     DoubleDeclarations doubleDecls;
-    std::set< rtl::OString > seen;
+    std::set< OString > seen;
     checkInheritedInterfaceClashes(
         doubleDecls, seen, ifc, true, optional, optional);
     return doubleDecls;
 }
 
 void AstInterface::addInheritedInterface(
-    AstType const * ifc, bool optional, rtl::OUString const & documentation)
+    AstType const * ifc, bool optional, OUString const & documentation)
 {
     m_inheritedInterfaces.push_back(
         InheritedInterface(ifc, optional, documentation));
@@ -258,7 +258,7 @@ sal_Bool AstInterface::dump(RegistryKey& rKey)
 
 void AstInterface::checkInheritedInterfaceClashes(
     DoubleDeclarations & doubleDeclarations,
-    std::set< rtl::OString > & seenInterfaces, AstInterface const * ifc,
+    std::set< OString > & seenInterfaces, AstInterface const * ifc,
     bool direct, bool optional, bool mainOptional) const
 {
     if (direct || optional
diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx
index b4aa3f74354e..f90966575a92 100644
--- a/idlc/source/astoperation.cxx
+++ b/idlc/source/astoperation.cxx
@@ -46,11 +46,11 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
     sal_uInt16      nExcep = nExceptions();
     RTMethodMode    methodMode = RT_MODE_TWOWAY;
 
-    rtl::OUString returnTypeName;
+    OUString returnTypeName;
     if (m_pReturnType == 0) {
-        returnTypeName = rtl::OUString("void");
+        returnTypeName = OUString("void");
     } else {
-        returnTypeName = rtl::OStringToOUString(
+        returnTypeName = OStringToOUString(
             m_pReturnType->getRelativName(), RTL_TEXTENCODING_UTF8);
     }
     rBlob.setMethodData(
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index 99440873aa32..7f645564208b 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -26,13 +26,13 @@
 using namespace ::rtl;
 
 AstStruct::AstStruct(
-    const OString& name, std::vector< rtl::OString > const & typeParameters,
+    const OString& name, std::vector< OString > const & typeParameters,
     AstStruct* pBaseType, AstScope* pScope)
     : AstType(NT_struct, name, pScope)
     , AstScope(NT_struct)
     , m_pBaseType(pBaseType)
 {
-    for (std::vector< rtl::OString >::const_iterator i(typeParameters.begin());
+    for (std::vector< OString >::const_iterator i(typeParameters.begin());
          i != typeParameters.end(); ++i)
     {
         m_typeParameters.push_back(
@@ -59,7 +59,7 @@ AstStruct::~AstStruct()
     }
 }
 
-AstDeclaration const * AstStruct::findTypeParameter(rtl::OString const & name)
+AstDeclaration const * AstStruct::findTypeParameter(OString const & name)
     const
 {
     for (DeclList::const_iterator i(m_typeParameters.begin());
@@ -133,7 +133,7 @@ sal_Bool AstStruct::dump(RegistryKey& rKey)
             {
                 pMember = (AstMember*)pDecl;
                 RTFieldAccess flags = RT_ACCESS_READWRITE;
-                rtl::OString typeName;
+                OString typeName;
                 if (pMember->getType()->getNodeType() == NT_type_parameter) {
                     flags |= RT_ACCESS_PARAMETERIZED_TYPE;
                     typeName = pMember->getType()->getLocalName();
diff --git a/idlc/source/aststructinstance.cxx b/idlc/source/aststructinstance.cxx
index 5a2981e018cf..20b6ac3360f6 100644
--- a/idlc/source/aststructinstance.cxx
+++ b/idlc/source/aststructinstance.cxx
@@ -28,10 +28,10 @@
 
 namespace {
 
-rtl::OString createName(
+OString createName(
     AstType const * typeTemplate, DeclList const * typeArguments)
 {
-    rtl::OStringBuffer buf(typeTemplate->getScopedName());
+    OStringBuffer buf(typeTemplate->getScopedName());
     if (typeArguments != 0) {
         buf.append('<');
         for (DeclList::const_iterator i(typeArguments->begin());
diff --git a/idlc/source/astunion.cxx b/idlc/source/astunion.cxx
index 8a03ae5d9d4a..45e2f3128345 100644
--- a/idlc/source/astunion.cxx
+++ b/idlc/source/astunion.cxx
@@ -26,7 +26,7 @@
 
 using namespace ::rtl;
 
-AstUnion::AstUnion(const ::rtl::OString& name, AstType* pDiscType, AstScope* pScope)
+AstUnion::AstUnion(const OString& name, AstType* pDiscType, AstScope* pScope)
     : AstStruct(NT_union, name, NULL, pScope)
     , m_pDiscriminantType(pDiscType)
     , m_discExprType(ET_long)
@@ -354,7 +354,7 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
     return sal_True;
 }
 
-AstUnionBranch::AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, const ::rtl::OString& name, AstScope* pScope)
+AstUnionBranch::AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, const OString& name, AstScope* pScope)
     : AstMember(NT_union_branch, pType, name, pScope)
     , m_pLabel(pLabel)
 {
diff --git a/idlc/source/attributeexceptions.hxx b/idlc/source/attributeexceptions.hxx
index 09a7c8b4d9cd..7c47f74ad685 100644
--- a/idlc/source/attributeexceptions.hxx
+++ b/idlc/source/attributeexceptions.hxx
@@ -24,7 +24,7 @@
 
 struct AttributeExceptions {
     struct Part {
-        rtl::OUString const * documentation;
+        OUString const * documentation;
         DeclList const * exceptions;
     };
     Part get;
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index c0abf9e62fbc..390d76e8e57d 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -567,14 +567,14 @@ void ErrorHandler::coercionError(AstExpression *pExpr, ExprType et)
     idlc()->incErrorCount();
 }
 
-void ErrorHandler::lookupError(const ::rtl::OString& n)
+void ErrorHandler::lookupError(const OString& n)
 {
     errorHeader(EIDL_LOOKUP_ERROR);
     fprintf(stderr, "'%s'\n", n.getStr());
     idlc()->incErrorCount();
 }
 
-void ErrorHandler::lookupError(ErrorCode e, const ::rtl::OString& n, AstDeclaration* pScope)
+void ErrorHandler::lookupError(ErrorCode e, const OString& n, AstDeclaration* pScope)
 {
     errorHeader(e);
     fprintf(stderr, "'%s' in '%s'\n", n.getStr(), pScope->getFullName().getStr());
@@ -635,7 +635,7 @@ void ErrorHandler::inheritanceError(NodeType nodeType, const OString* name, AstD
 }
 
 void ErrorHandler::forwardLookupError(AstDeclaration* pForward,
-                                      const ::rtl::OString& name)
+                                      const OString& name)
 {
     errorHeader(EIDL_FWD_DECL_LOOKUP);
     fprintf(stderr, "trying to look up '%s' in undefined forward declared interface '%s'\n",
@@ -644,7 +644,7 @@ void ErrorHandler::forwardLookupError(AstDeclaration* pForward,
 }
 
 void ErrorHandler::constantExpected(AstDeclaration* pDecl,
-                                    const ::rtl::OString& name)
+                                    const OString& name)
 {
     errorHeader(EIDL_CONSTANT_EXPECTED);
     fprintf(stderr, "'%s' is bound to '%s'\n", name.getStr(), pDecl->getScopedName().getStr());
@@ -665,7 +665,7 @@ void ErrorHandler::enumValExpected(AstUnion* pUnion)
     idlc()->incErrorCount();
 }
 
-void ErrorHandler::enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const ::rtl::OString& name)
+void ErrorHandler::enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const OString& name)
 {
     errorHeader(EIDL_ENUM_VAL_NOT_FOUND);
     fprintf(stderr, " union %s, enum %s, enumerator %s\n",
diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index a3ab3fd0d1fe..fdfd8388d657 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -89,8 +89,8 @@ AstType const * FeDeclarator::compose(AstDeclaration const * pDecl)
 }
 
 FeInheritanceHeader::FeInheritanceHeader(
-    NodeType nodeType, ::rtl::OString* pName, ::rtl::OString* pInherits,
-    std::vector< rtl::OString > * typeParameters)
+    NodeType nodeType, OString* pName, OString* pInherits,
+    std::vector< OString > * typeParameters)
     : m_nodeType(nodeType)
     , m_pName(pName)
     , m_pInherits(NULL)
@@ -101,7 +101,7 @@ FeInheritanceHeader::FeInheritanceHeader(
     initializeInherits(pInherits);
 }
 
-void FeInheritanceHeader::initializeInherits(::rtl::OString* pInherits)
+void FeInheritanceHeader::initializeInherits(OString* pInherits)
 {
     if ( pInherits )
     {
diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx
index 4002b1395afd..7e880261a8ae 100644
--- a/idlc/source/idlc.cxx
+++ b/idlc/source/idlc.cxx
@@ -289,7 +289,7 @@ OUString Idlc::processDocumentation()
 }
 
 static void lcl_writeString(::osl::File & rFile, ::osl::FileBase::RC & o_rRC,
-        ::rtl::OString const& rString)
+        OString const& rString)
 {
     sal_uInt64 nWritten(0);
     if (::osl::FileBase::E_None == o_rRC) {
@@ -306,7 +306,7 @@ struct WriteDep
     ::osl::FileBase::RC & m_rRC;
     explicit WriteDep(::osl::File & rFile, ::osl::FileBase::RC & rRC)
         : m_rFile(rFile), m_rRC(rRC) { }
-    void operator() (::rtl::OString const& rEntry)
+    void operator() (OString const& rEntry)
     {
         lcl_writeString(m_rFile, m_rRC, " \\\n ");
         lcl_writeString(m_rFile, m_rRC, rEntry);
@@ -321,7 +321,7 @@ struct WriteDummy
     ::osl::FileBase::RC & m_rRC;
     explicit WriteDummy(::osl::File & rFile, ::osl::FileBase::RC & rRC)
         : m_rFile(rFile), m_rRC(rRC) { }
-    void operator() (::rtl::OString const& rEntry)
+    void operator() (OString const& rEntry)
     {
         lcl_writeString(m_rFile, m_rRC, rEntry);
         lcl_writeString(m_rFile, m_rRC, ":\n\n");
@@ -329,10 +329,10 @@ struct WriteDummy
 };
 
 bool
-Idlc::dumpDeps(::rtl::OString const& rDepFile, ::rtl::OString const& rTarget)
+Idlc::dumpDeps(OString const& rDepFile, OString const& rTarget)
 {
     ::osl::File depFile(
-            ::rtl::OStringToOUString(rDepFile, osl_getThreadTextEncoding()));
+            OStringToOUString(rDepFile, osl_getThreadTextEncoding()));
     ::osl::FileBase::RC rc =
         depFile.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
     if (::osl::FileBase::E_None != rc) {
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 2c8beb5e4c00..894e5d8f1150 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -240,7 +240,7 @@ sal_Int32 compileFile(const OString * pathname)
     idlc()->setMainFileName(fileName);
     idlc()->setRealFileName(tmpFile);
 
-    ::std::vector< ::rtl::OUString> lCppArgs;
+    ::std::vector< OUString> lCppArgs;
     lCppArgs.push_back("-DIDL");
     lCppArgs.push_back("-C");
     lCppArgs.push_back("-zI");
@@ -259,7 +259,7 @@ sal_Int32 compileFile(const OString * pathname)
         {
             cppArgs.append("-I");
             cppArgs.append(filePath);
-            lCppArgs.push_back(rtl::OStringToOUString(
+            lCppArgs.push_back(OStringToOUString(
                 cppArgs.makeStringAndClear().replace('\\', '/'),
                 RTL_TEXTENCODING_UTF8));
         }
@@ -273,7 +273,7 @@ sal_Int32 compileFile(const OString * pathname)
         {
             token = dOpt.getToken( 0, ' ', nIndex );
             if (token.getLength())
-                lCppArgs.push_back(rtl::OStringToOUString("-D" + token, RTL_TEXTENCODING_UTF8));
+                lCppArgs.push_back(OStringToOUString("-D" + token, RTL_TEXTENCODING_UTF8));
         } while( nIndex != -1 );
     }
 
@@ -285,7 +285,7 @@ sal_Int32 compileFile(const OString * pathname)
         {
             token = incOpt.getToken( 0, ' ', nIndex );
             if (token.getLength())
-                lCppArgs.push_back(rtl::OStringToOUString("-I" + token, RTL_TEXTENCODING_UTF8));
+                lCppArgs.push_back(OStringToOUString("-I" + token, RTL_TEXTENCODING_UTF8));
         } while( nIndex != -1 );
     }
 
@@ -322,8 +322,8 @@ sal_Int32 compileFile(const OString * pathname)
     rtl_uString** pCmdArgs = 0;
     pCmdArgs = (rtl_uString**)rtl_allocateZeroMemory(nCmdArgs * sizeof(rtl_uString*));
 
-    ::std::vector< ::rtl::OUString >::iterator iter = lCppArgs.begin();
-    ::std::vector< ::rtl::OUString >::iterator end = lCppArgs.end();
+    ::std::vector< OUString >::iterator iter = lCppArgs.begin();
+    ::std::vector< OUString >::iterator end = lCppArgs.end();
     int i = 0;
 	while ( iter != end ) {
         pCmdArgs[i++] = (*iter).pData;
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index 838a8fbf1039..37017b9bcfd8 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -123,7 +123,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
         OString const outputFileUrl = convertToFileUrl(outputFile);
 
-        ::rtl::OString depFileUrl;
+        OString depFileUrl;
         if (options.isValid("-M")) {
             depFileUrl = convertToFileUrl(options.getOption("-M"));
             if ('/' != depFileUrl.getStr()[depFileUrl.getLength()-1]) {
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 6051e54fbe46..375e1454f850 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-using ::rtl::OString;
-using ::rtl::OStringBuffer;
 
 Options::Options(char const * progname)
   : m_program(progname), m_stdin(false), m_verbose(false), m_quiet(false)