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

17 files changed, 55 insertions, 57 deletions

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)