Remove all occurences of RTL_* and ::rtl prefix from basic

This is a big commit, so thanks for your time reviewing this :)

Conflicts:
basic/source/sbx/sbxscan.cxx

Change-Id: Ib9bc710b87475b5695764557321e5dcef25e5933
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>

6 files changed, 84 insertions, 93 deletions

diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 14d782ac68be..b1caceb3af06 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -62,7 +62,7 @@ char * address(std::vector< char > & blob) {
     return blob.empty() ? 0 : &blob[0];
 }
 
-SbError convert(rtl::OUString const & source, rtl::OString * target) {
+SbError convert(OUString const & source, OString * target) {
     return
         source.convertToString(
             target, osl_getThreadTextEncoding(),
@@ -72,7 +72,7 @@ SbError convert(rtl::OUString const & source, rtl::OString * target) {
         //TODO: more specific errcode?
 }
 
-SbError convert(char const * source, sal_Int32 length, rtl::OUString * target) {
+SbError convert(char const * source, sal_Int32 length, OUString * target) {
     return
         rtl_convertStringToUString(
             &target->pData, source, length, osl_getThreadTextEncoding(),
@@ -184,7 +184,7 @@ SbError marshalString(
     SbxVariable * variable, bool special, MarshalData & data, void ** buffer)
 {
     OSL_ASSERT(variable != 0 && buffer != 0);
-    rtl::OString str;
+    OString str;
     SbError e = convert(variable->GetOUString(), &str);
     if (e != ERRCODE_NONE) {
         return e;
@@ -430,7 +430,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
 }
 
 SbError unmarshalString(StringData const & data, SbxVariable & result) {
-    rtl::OUString str;
+    OUString str;
     if (data.buffer != 0) {
         char const * p = static_cast< char const * >(data.buffer);
         sal_Int32 len;
@@ -453,12 +453,12 @@ SbError unmarshalString(StringData const & data, SbxVariable & result) {
 }
 
 struct ProcData {
-    rtl::OString name;
+    OString name;
     FARPROC proc;
 };
 
 SbError call(
-    rtl::OUString const & dll, ProcData const & proc, SbxArray * arguments,
+    OUString const & dll, ProcData const & proc, SbxArray * arguments,
     SbxVariable & result)
 {
     if (arguments->Count() > 20)
@@ -472,10 +472,8 @@ SbError call(
     // requires special handling in unmarshalString; other functions might
     // require similar treatment, too:
     bool special =
-        dll.equalsIgnoreAsciiCaseAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("KERNEL32.DLL")) &&
-        (proc.name ==
-         rtl::OString(RTL_CONSTASCII_STRINGPARAM("GetLogicalDriveStringsA")));
+        dll.equalsIgnoreAsciiCase("KERNEL32.DLL") &&
+        (proc.name == OString("GetLogicalDriveStringsA"));
     for (int i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
         SbError e = marshal(
             true, arguments->Get(i), special && i == 2, stack, stack.size(),
@@ -570,7 +568,7 @@ SbError call(
     case SbxSTRING:
         {
             char const * s1 = reinterpret_cast< char const * >(iRetVal);
-            rtl::OUString s2;
+            OUString s2;
             SbError e = convert(s1, rtl_str_getLength(s1), &s2);
             if (e != ERRCODE_NONE) {
                 return e;
@@ -611,7 +609,7 @@ SbError call(
     return ERRCODE_NONE;
 }
 
-SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
+SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc)
 {
     OSL_ASSERT(proc != 0);
     if (name.getLength() != 0 && name[0] == '@') { //TODO: "@" vs. "#"???
@@ -621,13 +619,12 @@ SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
         }
         FARPROC p = GetProcAddress(handle, reinterpret_cast< LPCSTR >(n));
         if (p != 0) {
-            proc->name = rtl::OString(RTL_CONSTASCII_STRINGPARAM("#")) +
-                rtl::OString::valueOf(n);
+            proc->name = OString("#") + OString::valueOf(n);
             proc->proc = p;
             return ERRCODE_NONE;
         }
     } else {
-        rtl::OString name8;
+        OString name8;
         SbError e = convert(name, &name8);
         if (e != ERRCODE_NONE) {
             return e;
@@ -648,15 +645,14 @@ SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
                 return ERRCODE_NONE;
             }
         }
-        rtl::OString real(
-            rtl::OString(RTL_CONSTASCII_STRINGPARAM("_")) + name8);
+        OString real(OString("_") + name8);
         p = GetProcAddress(handle, real.getStr());
         if (p != 0) {
             proc->name = real;
             proc->proc = p;
             return ERRCODE_NONE;
         }
-        real = name8 + rtl::OString(RTL_CONSTASCII_STRINGPARAM("A"));
+        real = name8 + OString("A");
         p = GetProcAddress(handle, real.getStr());
         if (p != 0) {
             proc->name = real;
@@ -669,14 +665,14 @@ SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
 
 struct Dll: public salhelper::SimpleReferenceObject {
 private:
-    typedef std::map< rtl::OUString, ProcData > Procs;
+    typedef std::map< OUString, ProcData > Procs;
 
     virtual ~Dll();
 
 public:
     Dll(): handle(0) {}
 
-    SbError getProc(rtl::OUString const & name, ProcData * proc);
+    SbError getProc(OUString const & name, ProcData * proc);
 
     HMODULE handle;
     Procs procs;
@@ -688,7 +684,7 @@ Dll::~Dll() {
     }
 }
 
-SbError Dll::getProc(rtl::OUString const & name, ProcData * proc) {
+SbError Dll::getProc(OUString const & name, ProcData * proc) {
     Procs::iterator i(procs.find(name));
     if (i != procs.end()) {
         *proc = i->second;
@@ -701,10 +697,10 @@ SbError Dll::getProc(rtl::OUString const & name, ProcData * proc) {
     return e;
 }
 
-rtl::OUString fullDllName(rtl::OUString const & name) {
-    rtl::OUString full(name);
+OUString fullDllName(OUString const & name) {
+    OUString full(name);
     if (full.indexOf('.') == -1) {
-        full += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".DLL"));
+        full += OUString(".DLL");
     }
     return full;
 }
@@ -713,15 +709,15 @@ rtl::OUString fullDllName(rtl::OUString const & name) {
 
 struct SbiDllMgr::Impl: private boost::noncopyable {
 private:
-    typedef std::map< rtl::OUString, rtl::Reference< Dll > > Dlls;
+    typedef std::map< OUString, Reference< Dll > > Dlls;
 
 public:
-    Dll * getDll(rtl::OUString const & name);
+    Dll * getDll(OUString const & name);
 
     Dlls dlls;
 };
 
-Dll * SbiDllMgr::Impl::getDll(rtl::OUString const & name) {
+Dll * SbiDllMgr::Impl::getDll(OUString const & name) {
     Dlls::iterator i(dlls.find(name));
     if (i == dlls.end()) {
         i = dlls.insert(Dlls::value_type(name, new Dll)).first;
@@ -736,13 +732,13 @@ Dll * SbiDllMgr::Impl::getDll(rtl::OUString const & name) {
 }
 
 SbError SbiDllMgr::Call(
-    rtl::OUString const & function, rtl::OUString const & library,
+    OUString const & function, OUString const & library,
     SbxArray * arguments, SbxVariable & result, bool cdeclConvention)
 {
     if (cdeclConvention) {
         return ERRCODE_BASIC_NOT_IMPLEMENTED;
     }
-    rtl::OUString dllName(fullDllName(library));
+    OUString dllName(fullDllName(library));
     Dll * dll = impl_->getDll(dllName);
     if (dll == 0) {
         return ERRCODE_BASIC_BAD_DLL_LOAD;
@@ -755,7 +751,7 @@ SbError SbiDllMgr::Call(
     return call(dllName, proc, arguments, result);
 }
 
-void SbiDllMgr::FreeDll(rtl::OUString const & library) {
+void SbiDllMgr::FreeDll(OUString const & library) {
     impl_->dlls.erase(library);
 }
 
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 1e6bec350237..777a18e99b7f 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -70,7 +70,7 @@ char * address(std::vector< char > & blob) {
     return blob.empty() ? 0 : &blob[0];
 }
 
-SbError convert(rtl::OUString const & source, rtl::OString * target) {
+SbError convert(OUString const & source, OString * target) {
     return
         source.convertToString(
             target, osl_getThreadTextEncoding(),
@@ -80,7 +80,7 @@ SbError convert(rtl::OUString const & source, rtl::OString * target) {
         //TODO: more specific errcode?
 }
 
-SbError convert(char const * source, sal_Int32 length, rtl::OUString * target) {
+SbError convert(char const * source, sal_Int32 length, OUString * target) {
     return
         rtl_convertStringToUString(
             &target->pData, source, length, osl_getThreadTextEncoding(),
@@ -192,7 +192,7 @@ SbError marshalString(
     SbxVariable * variable, bool special, MarshalData & data, void ** buffer)
 {
     OSL_ASSERT(variable != 0 && buffer != 0);
-    rtl::OString str;
+    OString str;
     SbError e = convert(variable->GetOUString(), &str);
     if (e != ERRCODE_NONE) {
         return e;
@@ -445,7 +445,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
 }
 
 SbError unmarshalString(StringData const & data, SbxVariable & result) {
-    rtl::OUString str;
+    OUString str;
     if (data.buffer != 0) {
         char const * p = static_cast< char const * >(data.buffer);
         sal_Int32 len;
@@ -468,12 +468,12 @@ SbError unmarshalString(StringData const & data, SbxVariable & result) {
 }
 
 struct ProcData {
-    rtl::OString name;
+    OString name;
     FARPROC proc;
 };
 
 SbError call(
-    rtl::OUString const & dll, ProcData const & proc, SbxArray * arguments,
+    OUString const & dll, ProcData const & proc, SbxArray * arguments,
     SbxVariable & result)
 {
     std::vector< char > stack;
@@ -482,11 +482,8 @@ SbError call(
     // from kernel32, upon return, filled lpBuffer length is result DWORD, which
     // requires special handling in unmarshalString; other functions might
     // require similar treatment, too:
-    bool special =
-        dll.equalsIgnoreAsciiCaseAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("KERNEL32.DLL")) &&
-        (proc.name ==
-         rtl::OString(RTL_CONSTASCII_STRINGPARAM("GetLogicalDriveStringsA")));
+    bool special = dll.equalsIgnoreAsciiCase("KERNEL32.DLL") &&
+                   (proc.name == OString("GetLogicalDriveStringsA"));
     for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
         SbError e = marshal(
             true, arguments->Get(i), special && i == 2, stack, stack.size(),
@@ -523,7 +520,7 @@ SbError call(
         {
             char const * s1 = reinterpret_cast< char const * >(
                 DllMgr_call32(proc.proc, address(stack), stack.size()));
-            rtl::OUString s2;
+            OUString s2;
             SbError e = convert(s1, rtl_str_getLength(s1), &s2);
             if (e != ERRCODE_NONE) {
                 return e;
@@ -569,7 +566,7 @@ SbError call(
     return ERRCODE_NONE;
 }
 
-SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
+SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc)
 {
     OSL_ASSERT(proc != 0);
     if (name.getLength() != 0 && name[0] == '@') { //TODO: "@" vs. "#"???
@@ -579,13 +576,12 @@ SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
         }
         FARPROC p = GetProcAddress(handle, reinterpret_cast< LPCSTR >(n));
         if (p != 0) {
-            proc->name = rtl::OString(RTL_CONSTASCII_STRINGPARAM("#")) +
-                rtl::OString::valueOf(n);
+            proc->name = OString("#") + OString::valueOf(n);
             proc->proc = p;
             return ERRCODE_NONE;
         }
     } else {
-        rtl::OString name8;
+        OString name8;
         SbError e = convert(name, &name8);
         if (e != ERRCODE_NONE) {
             return e;
@@ -606,15 +602,14 @@ SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
                 return ERRCODE_NONE;
             }
         }
-        rtl::OString real(
-            rtl::OString(RTL_CONSTASCII_STRINGPARAM("_")) + name8);
+        OString real(OString("_") + name8);
         p = GetProcAddress(handle, real.getStr());
         if (p != 0) {
             proc->name = real;
             proc->proc = p;
             return ERRCODE_NONE;
         }
-        real = name8 + rtl::OString(RTL_CONSTASCII_STRINGPARAM("A"));
+        real = name8 + OString("A");
         p = GetProcAddress(handle, real.getStr());
         if (p != 0) {
             proc->name = real;
@@ -627,14 +622,14 @@ SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
 
 struct Dll: public salhelper::SimpleReferenceObject {
 private:
-    typedef std::map< rtl::OUString, ProcData > Procs;
+    typedef std::map< OUString, ProcData > Procs;
 
     virtual ~Dll();
 
 public:
     Dll(): handle(0) {}
 
-    SbError getProc(rtl::OUString const & name, ProcData * proc);
+    SbError getProc(OUString const & name, ProcData * proc);
 
     HMODULE handle;
     Procs procs;
@@ -646,7 +641,7 @@ Dll::~Dll() {
     }
 }
 
-SbError Dll::getProc(rtl::OUString const & name, ProcData * proc) {
+SbError Dll::getProc(OUString const & name, ProcData * proc) {
     Procs::iterator i(procs.find(name));
     if (i != procs.end()) {
         *proc = i->second;
@@ -659,10 +654,10 @@ SbError Dll::getProc(rtl::OUString const & name, ProcData * proc) {
     return e;
 }
 
-rtl::OUString fullDllName(rtl::OUString const & name) {
-    rtl::OUString full(name);
+OUString fullDllName(OUString const & name) {
+    OUString full(name);
     if (full.indexOf('.') == -1) {
-        full += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".DLL"));
+        full += OUString(".DLL");
     }
     return full;
 }
@@ -671,15 +666,15 @@ rtl::OUString fullDllName(rtl::OUString const & name) {
 
 struct SbiDllMgr::Impl: private boost::noncopyable {
 private:
-    typedef std::map< rtl::OUString, rtl::Reference< Dll > > Dlls;
+    typedef std::map< OUString, Reference< Dll > > Dlls;
 
 public:
-    Dll * getDll(rtl::OUString const & name);
+    Dll * getDll(OUString const & name);
 
     Dlls dlls;
 };
 
-Dll * SbiDllMgr::Impl::getDll(rtl::OUString const & name) {
+Dll * SbiDllMgr::Impl::getDll(OUString const & name) {
     Dlls::iterator i(dlls.find(name));
     if (i == dlls.end()) {
         i = dlls.insert(Dlls::value_type(name, new Dll)).first;
@@ -694,13 +689,13 @@ Dll * SbiDllMgr::Impl::getDll(rtl::OUString const & name) {
 }
 
 SbError SbiDllMgr::Call(
-    rtl::OUString const & function, rtl::OUString const & library,
+    OUString const & function, OUString const & library,
     SbxArray * arguments, SbxVariable & result, bool cdeclConvention)
 {
     if (cdeclConvention) {
         return ERRCODE_BASIC_NOT_IMPLEMENTED;
     }
-    rtl::OUString dllName(fullDllName(library));
+    OUString dllName(fullDllName(library));
     Dll * dll = impl_->getDll(dllName);
     if (dll == 0) {
         return ERRCODE_BASIC_BAD_DLL_LOAD;
@@ -713,7 +708,7 @@ SbError SbiDllMgr::Call(
     return call(dllName, proc, arguments, result);
 }
 
-void SbiDllMgr::FreeDll(rtl::OUString const & library) {
+void SbiDllMgr::FreeDll(OUString const & library) {
     impl_->dlls.erase(library);
 }
 
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 60ed9145612e..bc4d78a08836 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -173,7 +173,7 @@ void SbiStream::MapError()
 
 // TODO: Code is copied from daemons2/source/uno/asciiEncoder.cxx
 
-OUString findUserInDescription( const ::rtl::OUString& aDescription )
+OUString findUserInDescription( const OUString& aDescription )
 {
     OUString user;
 
@@ -287,7 +287,7 @@ bool hasUno( void )
         {
             Reference< XUniversalContentBroker > xManager = UniversalContentBroker::create(xContext);
 
-            if ( !( xManager->queryContentProvider( ::rtl::OUString("file:///" ) ).is() ) )
+            if ( !( xManager->queryContentProvider( OUString("file:///" ) ).is() ) )
             {
                 // No UCB
                 bRetVal = false;
@@ -841,7 +841,7 @@ void SbiIoSystem::Shutdown()
     // anything left to PRINT?
     if( !aOut.isEmpty() )
     {
-        rtl::OUString aOutStr(rtl::OStringToOUString(aOut, osl_getThreadTextEncoding()));
+        OUString aOutStr(rtl::OStringToOUString(aOut, osl_getThreadTextEncoding()));
 #if defined __GNUC__
         Window* pParent = Application::GetDefDialogParent();
         MessBox( pParent, WinBits( WB_OK ), OUString(), aOutStr ).Execute();
@@ -951,7 +951,7 @@ void SbiIoSystem::ReadCon(rtl::OString& rIn)
     SbiInputDialog aDlg( NULL, aPromptStr );
     if( aDlg.Execute() )
     {
-        rIn = rtl::OUStringToOString(aDlg.GetInput(), osl_getThreadTextEncoding());
+        rIn = OUStringToOString(aDlg.GetInput(), osl_getThreadTextEncoding());
     }
     else
     {
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 20fee906bd03..45e59a6b4b81 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -120,7 +120,7 @@ static void FilterWhiteSpace( OUString& rStr )
     {
         return;
     }
-    rtl::OUStringBuffer aRet;
+    OUStringBuffer aRet;
 
     for (sal_Int32 i = 0; i < rStr.getLength(); ++i)
     {
@@ -372,7 +372,7 @@ void implChr( SbxArray& rPar, bool bChrW )
         if( !bChrW && SbiRuntime::isVBAEnabled() )
         {
             sal_Char c = static_cast<sal_Char>(pArg->GetByte());
-            aStr = rtl::OUString(&c, 1, osl_getThreadTextEncoding());
+            aStr = OUString(&c, 1, osl_getThreadTextEncoding());
         }
         else
         {
@@ -444,7 +444,7 @@ RTLFUNC(CurDir)
     char* pBuffer = new char[ _MAX_PATH ];
     if ( _getdcwd( nCurDir, pBuffer, _MAX_PATH ) != 0 )
     {
-        rPar.Get(0)->PutString( rtl::OUString::createFromAscii( pBuffer ) );
+        rPar.Get(0)->PutString( OUString::createFromAscii( pBuffer ) );
     }
     else
     {
@@ -466,7 +466,7 @@ RTLFUNC(CurDir)
           }
         if( getcwd( pMem, nSize-1 ) != NULL )
           {
-            rPar.Get(0)->PutString( rtl::OUString::createFromAscii(pMem) );
+            rPar.Get(0)->PutString( OUString::createFromAscii(pMem) );
             delete [] pMem;
             return;
           }
@@ -868,7 +868,7 @@ RTLFUNC(Hex)
         sal_uInt32 nVal = pArg->IsInteger() ?
             static_cast<sal_uInt16>(pArg->GetInteger()) :
             static_cast<sal_uInt32>(pArg->GetLong());
-        rtl::OUString aStr(rtl::OUString::valueOf( sal_Int64(nVal), 16 ));
+        OUString aStr(OUString::valueOf( sal_Int64(nVal), 16 ));
         aStr = aStr.toAsciiUpperCase();
         rPar.Get(0)->PutString( aStr );
     }
@@ -1315,7 +1315,7 @@ RTLFUNC(Oct)
         {
             snprintf( aBuffer, sizeof(aBuffer), "%lo", static_cast<long unsigned int>(pArg->GetLong()) );
         }
-        rPar.Get(0)->PutString( rtl::OUString::createFromAscii( aBuffer ) );
+        rPar.Get(0)->PutString( OUString::createFromAscii( aBuffer ) );
     }
 }
 
@@ -1777,7 +1777,7 @@ RTLFUNC(Val)
             }
             if ( nRadix != 10 )
             {
-                OString aByteStr(rtl::OUStringToOString(aStr, osl_getThreadTextEncoding()));
+                OString aByteStr(OUStringToOString(aStr, osl_getThreadTextEncoding()));
                 sal_Int16 nlResult = (sal_Int16)strtol( aByteStr.getStr()+2, &pEndPtr, nRadix);
                 nResult = (double)nlResult;
             }
@@ -1839,7 +1839,7 @@ RTLFUNC(CDateToIso)
             implGetDateYear( aDate ),
             implGetDateMonth( aDate ),
             implGetDateDay( aDate ) );
-        OUString aRetStr = rtl::OUString::createFromAscii( Buffer );
+        OUString aRetStr = OUString::createFromAscii( Buffer );
         rPar.Get(0)->PutString( aRetStr );
     }
     else
@@ -2219,7 +2219,7 @@ RTLFUNC(Time)
             char buf[ 20 ];
             snprintf( buf, sizeof(buf), "%02d:%02d:%02d",
                       aTime.GetHour(), aTime.GetMin(), aTime.GetSec() );
-            aRes = rtl::OUString::createFromAscii( buf );
+            aRes = OUString::createFromAscii( buf );
         }
         else
         {
@@ -2749,11 +2749,11 @@ RTLFUNC(Dir)
                         {
                             if( pRTLData->nCurDirPos == -2 )
                             {
-                                aPath = ::rtl::OUString("." );
+                                aPath = OUString("." );
                             }
                             else if( pRTLData->nCurDirPos == -1 )
                             {
-                                aPath = ::rtl::OUString(".." );
+                                aPath = OUString(".." );
                             }
                             pRTLData->nCurDirPos++;
                         }
@@ -2865,11 +2865,11 @@ RTLFUNC(Dir)
                     {
                         if( pRTLData->nCurDirPos == -2 )
                         {
-                            aPath = ::rtl::OUString("." );
+                            aPath = OUString("." );
                         }
                         else if( pRTLData->nCurDirPos == -1 )
                         {
-                            aPath = ::rtl::OUString(".." );
+                            aPath = OUString(".." );
                         }
                         pRTLData->nCurDirPos++;
                     }
@@ -2935,7 +2935,7 @@ RTLFUNC(GetAttr)
             aEntry.ToAbs();
 
             // #57064 extract the real-path for virtual URLs
-            OString aByteStrFullPath(rtl::OUStringToOString(aEntry.GetFull(),
+            OString aByteStrFullPath(OUStringToOString(aEntry.GetFull(),
                                                             osl_getThreadTextEncoding()));
             DWORD nRealFlags = GetFileAttributes (aByteStrFullPath.getStr());
             if (nRealFlags != 0xffffffff)
@@ -3620,7 +3620,7 @@ OUString getBasicTypeName( SbxDataType eType )
     {
         nPos = nTypeNameCount - 1;
     }
-    return rtl::OUString::createFromAscii(pTypeNames[nPos]);
+    return OUString::createFromAscii(pTypeNames[nPos]);
 }
 
 String getObjectTypeName( SbxVariable* pVar )
@@ -3655,7 +3655,7 @@ String getObjectTypeName( SbxVariable* pVar )
                 {
                     // is this a VBA object ?
                     uno::Reference< ooo::vba::XHelperInterface > xVBA( aObj, uno::UNO_QUERY );
-                    Sequence< rtl::OUString > sServices = xServInfo->getSupportedServiceNames();
+                    Sequence< OUString > sServices = xServInfo->getSupportedServiceNames();
                     if ( sServices.getLength() )
                     {
                         sRet = sServices[ 0 ];
@@ -3671,7 +3671,7 @@ String getObjectTypeName( SbxVariable* pVar )
                         {
                             try
                             {
-                                xInv->getValue( rtl::OUString( "$GetTypeName" ) ) >>= sRet;
+                                xInv->getValue( OUString( "$GetTypeName" ) ) >>= sRet;
                             }
                             catch(const Exception& )
                             {
@@ -4149,11 +4149,11 @@ RTLFUNC(StrConv)
             }
         }
         pChar[nSize] = '\0';
-        ::rtl::OString aOStr(pChar);
+        OString aOStr(pChar);
         delete[] pChar;
 
         // there is no concept about default codepage in unix. so it is incorrectly in unix
-        OUString aOUStr = ::rtl::OStringToOUString(aOStr, osl_getThreadTextEncoding());
+        OUString aOUStr = OStringToOUString(aOStr, osl_getThreadTextEncoding());
         rPar.Get(0)->PutString( aOUStr );
         return;
     }
@@ -4161,7 +4161,7 @@ RTLFUNC(StrConv)
     {
         OUString aOUStr(aNewStr);
         // there is no concept about default codepage in unix. so it is incorrectly in unix
-        ::rtl::OString aOStr = ::rtl::OUStringToOString(aNewStr,osl_getThreadTextEncoding());
+        OString aOStr = OUStringToOString(aNewStr,osl_getThreadTextEncoding());
         const sal_Char* pChar = aOStr.getStr();
         sal_Int32 nArraySize = aOStr.getLength();
         SbxDimArray* pArray = new SbxDimArray(SbxBYTE);
@@ -4619,8 +4619,8 @@ RTLFUNC(Partition)
     // will be handled properly during any subsequent sort operation.
 
     // calculate the  maximun number of characters before lowervalue and uppervalue
-    OUString aBeforeStart = ::rtl::OUString::valueOf( nStart - 1 );
-    OUString aAfterStop = ::rtl::OUString::valueOf( nStop + 1 );
+    OUString aBeforeStart = OUString::valueOf( nStart - 1 );
+    OUString aAfterStop = OUString::valueOf( nStop + 1 );
     sal_Int32 nLen1 = aBeforeStart.getLength();
     sal_Int32 nLen2 = aAfterStop.getLength();
     sal_Int32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
@@ -4645,8 +4645,8 @@ RTLFUNC(Partition)
             nLowerValue = ((( nNumber - nStart ) / nInterval ) * nInterval ) + nStart;
             nUpperValue = nLowerValue + nInterval - 1;
         }
-        aLowerValue = ::rtl::OUString::valueOf( nLowerValue );
-        aUpperValue = ::rtl::OUString::valueOf( nUpperValue );
+        aLowerValue = OUString::valueOf( nLowerValue );
+        aUpperValue = OUString::valueOf( nUpperValue );
     }
 
     nLen1 = aLowerValue.getLength();
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index feee72c0db8c..4f1397044673 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -148,7 +148,7 @@ void SbiRuntime::StepPAD( sal_uInt32 nOp1 )
     sal_Int32 nLen(nOp1);
     if( s.getLength() != nLen )
     {
-        rtl::OUStringBuffer aBuf(s);
+        OUStringBuffer aBuf(s);
         if (aBuf.getLength() > nLen)
         {
             comphelper::string::truncateToLength(aBuf, nLen);
@@ -435,7 +435,7 @@ bool SbiRuntime::implIsClass( SbxObject* pObj, const OUString& aClass )
     {
         bRet = pObj->IsClass( aClass );
         if( !bRet )
-            bRet = aClass.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("object") );
+            bRet = aClass.equalsIgnoreAsciiCase( "object" );
         if( !bRet )
         {
             OUString aObjClass = pObj->GetClassName();
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 0f6c07bd2b67..d7f2a8dd9308 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -616,7 +616,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
                             }
                             else if( xIndexAccess.is() )
                             {
-                                sDefaultMethod = OUString( RTL_CONSTASCII_USTRINGPARAM( "getByIndex" ) );
+                                sDefaultMethod = OUString( "getByIndex" );
                             }
                             if ( !sDefaultMethod.isEmpty() )
                             {
@@ -979,7 +979,7 @@ void SbiRuntime::StepOPEN( sal_uInt32 nOp1, sal_uInt32 nOp2 )
     SbxVariableRef pLen  = PopVar();
     short nBlkLen = pLen->GetInteger();
     short nChan   = pChan->GetInteger();
-    OString aName(rtl::OUStringToOString(pName->GetOUString(), osl_getThreadTextEncoding()));
+    OString aName(OUStringToOString(pName->GetOUString(), osl_getThreadTextEncoding()));
     pIosys->Open( nChan, aName, static_cast<short>( nOp1 ),
                   static_cast<short>( nOp2 ), nBlkLen );
     Error( pIosys->GetError() );