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

16 files changed, 95 insertions, 115 deletions

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index c94b8b41f498..718844dc6b25 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -28,12 +28,9 @@
 #include "rtl/byteseq.hxx"
 #include "jvmfwk/framework.h"
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
 
 static sal_Bool hasOption(char const * szOption, int argc, char** argv);
-static rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);
+static OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);
 static bool findAndSelect(JavaInfo**);
 
 #define HELP_TEXT    \
@@ -98,7 +95,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
     }
 
-    rtl::OUString aVendor( pInfo->sVendor );
+    OUString aVendor( pInfo->sVendor );
     // Only do something if the sunjavaplugin created this JavaInfo
     if ( aVendor != "Sun Microsystems Inc." &&
          aVendor != "Oracle Corporation" &&
@@ -114,24 +111,24 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         return 0;
     }
 
-    rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
+    OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
     fprintf(stdout, "%s\n", sPaths.getStr());
     jfw_freeJavaInfo(pInfo);
 
     return 0;
 }
 
-rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData)
+OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData)
 {
     const sal_Unicode* chars = (sal_Unicode*) vendorData.getConstArray();
     sal_Int32 len = vendorData.getLength();
-    rtl::OUString sData(chars, len / 2);
+    OUString sData(chars, len / 2);
     //the runtime lib is on the first line
     sal_Int32 index = 0;
-    rtl::OUString aToken = sData.getToken( 1, '\n', index);
+    OUString aToken = sData.getToken( 1, '\n', index);
 
-    rtl::OString paths =
-        rtl::OUStringToOString(aToken, osl_getThreadTextEncoding());
+    OString paths =
+        OUStringToOString(aToken, osl_getThreadTextEncoding());
     return paths;
 }
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index f58a66d3b4ea..25667848c54f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -25,7 +25,6 @@
 
 using namespace std;
 using namespace osl;
-using ::rtl::OUString;
 using ::rtl::Reference;
 
 namespace jfw_plugin
@@ -162,7 +161,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
         return false;
 
     if (m_sJavaHome.isEmpty())
-        m_sJavaHome = rtl::OUString("file:///usr/lib");
+        m_sJavaHome = OUString("file:///usr/lib");
 
     // init m_sRuntimeLibrary
     OSL_ASSERT(!m_sHome.isEmpty());
@@ -227,9 +226,9 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
 
 #ifdef X86_64
     //Make one last final legacy attempt on x86_64 in case the distro placed it in lib64 instead
-    if (!bRt && m_sJavaHome != rtl::OUString("file:///usr/lib"))
+    if (!bRt && m_sJavaHome != OUString("file:///usr/lib"))
     {
-        m_sHome = rtl::OUString("file:///usr/lib64");
+        m_sHome = OUString("file:///usr/lib64");
         for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
         {
             //Construct an absolute path to the possible runtime
@@ -283,7 +282,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     return true;
 }
 
-int GnuInfo::compareVersions(const rtl::OUString&) const
+int GnuInfo::compareVersions(const OUString&) const
 {
     return 0;
 }
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
index 950021ed7f96..0b1aa6bf2a03 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -29,7 +29,7 @@ namespace jfw_plugin
 class GnuInfo: public VendorBase
 {
 private:
-    rtl::OUString m_sJavaHome;
+    OUString m_sJavaHome;
 public:
     static char const* const* getJavaExePaths(int * size);
 
@@ -38,8 +38,8 @@ public:
     virtual char const* const* getRuntimePaths(int * size);
 
     virtual bool initialize(
-        std::vector<std::pair<rtl::OUString, rtl::OUString> > props);
-    virtual int compareVersions(const rtl::OUString& sSecond) const;
+        std::vector<std::pair<OUString, OUString> > props);
+    virtual int compareVersions(const OUString& sSecond) const;
 
 };
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index f3ee1e3c520a..07f9c0c05523 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -23,7 +23,6 @@
 
 using namespace std;
 
-using ::rtl::OUString;
 using ::rtl::Reference;
 namespace jfw_plugin
 {
@@ -101,7 +100,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size)
 #endif
 }
 
-int OtherInfo::compareVersions(const rtl::OUString& /*sSecond*/) const
+int OtherInfo::compareVersions(const OUString& /*sSecond*/) const
 {
     //Need to provide an own algorithm for comparing version.
     //Because this function returns always 0, which means the version of
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
index 88ae1d935288..c2f33ee2dce7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -37,7 +37,7 @@ public:
     using VendorBase::getLibraryPaths;
     virtual char const* const* getRuntimePaths(int * size);
     virtual char const* const* getLibraryPaths(int* size);
-    virtual int compareVersions(const rtl::OUString& sSecond) const;
+    virtual int compareVersions(const OUString& sSecond) const;
 
 };
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 27b704d079df..e5c888a697c6 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -71,9 +71,6 @@ using namespace osl;
 using namespace std;
 using namespace jfw_plugin;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
 
 namespace {
 
@@ -132,7 +129,7 @@ OString getPluginJarPath(
         }
         OSL_ASSERT(!sPath.isEmpty());
     }
-    ret = rtl::OUStringToOString(sPath, osl_getThreadTextEncoding());
+    ret = OUStringToOString(sPath, osl_getThreadTextEncoding());
 
     return ret;
 }
@@ -144,18 +141,18 @@ JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
     JavaInfo* pInfo = (JavaInfo*) rtl_allocateMemory(sizeof(JavaInfo));
     if (pInfo == NULL)
         return NULL;
-    rtl::OUString sVendor = info->getVendor();
+    OUString sVendor = info->getVendor();
     pInfo->sVendor = sVendor.pData;
     rtl_uString_acquire(sVendor.pData);
-    rtl::OUString sHome = info->getHome();
+    OUString sHome = info->getHome();
     pInfo->sLocation = sHome.pData;
     rtl_uString_acquire(pInfo->sLocation);
-    rtl::OUString sVersion = info->getVersion();
+    OUString sVersion = info->getVersion();
     pInfo->sVersion = sVersion.pData;
     rtl_uString_acquire(pInfo->sVersion);
     pInfo->nFeatures = info->supportsAccessibility() ? 1 : 0;
     pInfo->nRequirements = info->needsRestart() ? JFW_REQUIRE_NEEDRESTART : 0;
-    rtl::OUStringBuffer buf(1024);
+    OUStringBuffer buf(1024);
     buf.append(info->getRuntimeLibrary());
     if (!info->getLibraryPaths().isEmpty())
     {
@@ -164,7 +161,7 @@ JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
         buf.appendAscii("\n");
     }
 
-    rtl::OUString sVendorData = buf.makeStringAndClear();
+    OUString sVendorData = buf.makeStringAndClear();
     rtl::ByteSequence byteSeq( (sal_Int8*) sVendorData.pData->buffer,
                                sVendorData.getLength() * sizeof(sal_Unicode));
     pInfo->arVendorData = byteSeq.get();
@@ -173,14 +170,14 @@ JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
     return pInfo;
 }
 
-rtl::OUString getRuntimeLib(const rtl::ByteSequence & data)
+OUString getRuntimeLib(const rtl::ByteSequence & data)
 {
     const sal_Unicode* chars = (sal_Unicode*) data.getConstArray();
     sal_Int32 len = data.getLength();
-    rtl::OUString sData(chars, len / 2);
+    OUString sData(chars, len / 2);
     //the runtime lib is on the first line
     sal_Int32 index = 0;
-    rtl::OUString aToken = sData.getToken( 0, '\n', index);
+    OUString aToken = sData.getToken( 0, '\n', index);
 
     return aToken;
 }
@@ -287,7 +284,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
         bool bExclude = false;
         for (int j = 0; j < nLenList; j++)
         {
-            rtl::OUString sExVer(arExcludeList[j]);
+            OUString sExVer(arExcludeList[j]);
             try
             {
                 if (cur->compareVersions(sExVer) == 0)
@@ -414,7 +411,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
 
     for (int i = 0; i < nLenList; i++)
     {
-        rtl::OUString sExVer(arExcludeList[i]);
+        OUString sExVer(arExcludeList[i]);
         int nRes = 0;
         try
         {
@@ -569,7 +566,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     //Check if the Vendor (pInfo->sVendor) is supported by this plugin
     if ( ! isVendorSupported(pInfo->sVendor))
         return JFW_PLUGIN_E_WRONG_VENDOR;
-    rtl::OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
+    OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
     JFW_TRACE2("[Java framework] Using Java runtime library: "
               + sRuntimeLib + ".\n");
 
@@ -599,26 +596,26 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
 
 #ifdef UNX
     //Setting the JAVA_HOME is needed for awt
-    rtl::OUString javaHome("JAVA_HOME=");
-    rtl::OUString sPathLocation;
+    OUString javaHome("JAVA_HOME=");
+    OUString sPathLocation;
     osl_getSystemPathFromFileURL(pInfo->sLocation, & sPathLocation.pData);
     javaHome += sPathLocation;
-    rtl::OString osJavaHome = rtl::OUStringToOString(
+    OString osJavaHome = OUStringToOString(
         javaHome, osl_getThreadTextEncoding());
     putenv(strdup(osJavaHome.getStr()));
 #endif
 
     typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *);
-    rtl::OUString sSymbolCreateJava("JNI_CreateJavaVM");
+    OUString sSymbolCreateJava("JNI_CreateJavaVM");
 
     JNI_CreateVM_Type * pCreateJavaVM = (JNI_CreateVM_Type *) osl_getFunctionSymbol(
         moduleRt, sSymbolCreateJava.pData);
     if (!pCreateJavaVM)
     {
         OSL_ASSERT(0);
-        rtl::OString sLib = rtl::OUStringToOString(
+        OString sLib = OUStringToOString(
             sRuntimeLib, osl_getThreadTextEncoding());
-        rtl::OString sSymbol = rtl::OUStringToOString(
+        OString sSymbol = OUStringToOString(
             sSymbolCreateJava, osl_getThreadTextEncoding());
         fprintf(stderr,"[Java framework]sunjavaplugin" SAL_DLLEXTENSION
                 "Java runtime library: %s does not export symbol %s !\n",
@@ -647,20 +644,20 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     options[n].optionString= (char *) "abort";
     options[n].extraInfo= (void* )(sal_IntPtr)abort_handler;
     ++n;
-    rtl::OString sClassPathProp("-Djava.class.path=");
-    rtl::OString sClassPathOption;
+    OString sClassPathProp("-Djava.class.path=");
+    OString sClassPathOption;
     for (int i = 0; i < cOptions; i++)
     {
 #ifdef UNX
     // Until java 1.5 we need to put a plugin.jar or javaplugin.jar (<1.4.2)
     // in the class path in order to have applet support.
-        rtl::OString sClassPath = arOptions[i].optionString;
+        OString sClassPath = arOptions[i].optionString;
         if (sClassPath.match(sClassPathProp, 0) == sal_True)
         {
             char sep[] =  {SAL_PATHSEPARATOR, 0};
             OString sAddPath = getPluginJarPath(pInfo->sVendor, pInfo->sLocation,pInfo->sVersion);
             if (!sAddPath.isEmpty())
-                sClassPathOption = sClassPath + rtl::OString(sep) + sAddPath;
+                sClassPathOption = sClassPath + OString(sep) + sAddPath;
             else
                 sClassPathOption = sClassPath;
             options[n].optionString = (char *) sClassPathOption.getStr();
@@ -756,7 +753,7 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
     javaPluginError ret = JFW_PLUGIN_E_NONE;
     if (!pInfo || !exist)
         return JFW_PLUGIN_E_INVALID_ARG;
-    ::rtl::OUString sLocation(pInfo->sLocation);
+    OUString sLocation(pInfo->sLocation);
 
     if (sLocation.isEmpty())
         return JFW_PLUGIN_E_INVALID_ARG;
@@ -780,7 +777,7 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
     //true although the runtime library may not be loadable.
     if (ret == JFW_PLUGIN_E_NONE && *exist == sal_True)
     {
-        rtl::OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
+        OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
         JFW_TRACE2("[Java framework] Checking existence of Java runtime library.\n");
 
         ::osl::DirectoryItem itemRt;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index d45555d7c92b..fb77e2a6703d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -86,9 +86,9 @@ char const* const* SunInfo::getLibraryPaths(int* size)
 #endif
 }
 
-int SunInfo::compareVersions(const rtl::OUString& sSecond) const
+int SunInfo::compareVersions(const OUString& sSecond) const
 {
-    rtl::OUString sFirst = getVersion();
+    OUString sFirst = getVersion();
 
     SunVersion version1(sFirst);
     JFW_ENSURE(version1, "[Java framework] sunjavaplugin" SAL_DLLEXTENSION
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
index 21ce38946972..9fd310e23542 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -37,7 +37,7 @@ public:
     virtual char const* const* getRuntimePaths(int * size);
     virtual char const* const* getLibraryPaths(int* size);
 
-    virtual int compareVersions(const rtl::OUString& sSecond) const;
+    virtual int compareVersions(const OUString& sSecond) const;
 };
 
 }
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 4eaff7ba6fff..aced75f63bec 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -27,9 +27,6 @@
 #include "diagnostics.h"
 using namespace osl;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
 namespace jfw_plugin  { //stoc_javadetect
 
 
@@ -41,12 +38,12 @@ public:
 } test;
 #endif
 
-SunVersion::SunVersion(const rtl::OUString &usVer):
+SunVersion::SunVersion(const OUString &usVer):
     m_nUpdateSpecial(0), m_preRelease(Rel_NONE),
     usVersion(usVer)
 {
     memset(m_arVersionParts, 0, sizeof(m_arVersionParts));
-    rtl::OString sVersion= rtl::OUStringToOString(usVer, osl_getThreadTextEncoding());
+    OString sVersion= OUStringToOString(usVer, osl_getThreadTextEncoding());
     m_bValid = init(sVersion.getStr());
 }
 SunVersion::SunVersion(const char * szVer):
@@ -54,7 +51,7 @@ SunVersion::SunVersion(const char * szVer):
 {
     memset(m_arVersionParts, 0, sizeof(m_arVersionParts));
     m_bValid = init(szVer);
-    usVersion= rtl::OUString(szVer,strlen(szVer),osl_getThreadTextEncoding());
+    usVersion= OUString(szVer,strlen(szVer),osl_getThreadTextEncoding());
 }
 
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index e67d8e5f39cd..b60959c67105 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -82,7 +82,7 @@ protected:
     PreRelease m_preRelease;
 public:
     SunVersion(const char * szVer);
-    SunVersion(const rtl::OUString& usVer);
+    SunVersion(const OUString& usVer);
     ~SunVersion();
 
     /**
@@ -100,7 +100,7 @@ public:
     /** Will always contain a value if the object has been constructed with
         a version string.
      */
-    rtl::OUString usVersion;
+    OUString usVersion;
 
 protected:
     bool init(const char * szVer);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index e4e5b0945ddd..fea25b05e078 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -53,11 +53,7 @@
 using namespace osl;
 using namespace std;
 
-using ::rtl::OUString;
 using ::rtl::Reference;
-using ::rtl::OString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OUStringToOString;
 
 #ifdef WNT
 #define HKEY_SUN_JRE L"Software\\JavaSoft\\Java Runtime Environment"
@@ -125,15 +121,15 @@ extern VendorSupportMapEntry gVendorMap[];
 
 bool getSDKInfoFromRegistry(vector<OUString> & vecHome);
 bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome);
-bool decodeOutput(const rtl::OString& s, rtl::OUString* out);
+bool decodeOutput(const OString& s, OUString* out);
 
 
 
 namespace
 {
-    rtl::OUString getLibraryLocation()
+    OUString getLibraryLocation()
     {
-        rtl::OUString libraryFileUrl;
+        OUString libraryFileUrl;
         OSL_VERIFY(osl::Module::getUrlFromAddress((void *)(sal_IntPtr)getLibraryLocation, libraryFileUrl));
         return getDirFromFile(libraryFileUrl);
     }
@@ -153,7 +149,7 @@ namespace
        OUString const & operator()()
        {
            static OUString sIni;
-            rtl::OUStringBuffer buf( 255);
+            OUStringBuffer buf( 255);
             buf.append( getLibraryLocation());
             buf.appendAscii( SAL_CONFIGFILE("/sunjavaplugin") );
             sIni = buf.makeStringAndClear();
@@ -217,7 +213,7 @@ public:
     inline FileHandleReader(oslFileHandle & rHandle) SAL_THROW(()):
         m_aGuard(rHandle), m_nSize(0), m_nIndex(0), m_bLf(false) {}
 
-    Result readLine(rtl::OString * pLine) SAL_THROW(());
+    Result readLine(OString * pLine) SAL_THROW(());
 
 private:
     enum { BUFFER_SIZE = 1024 };
@@ -230,7 +226,7 @@ private:
 };
 
 FileHandleReader::Result
-FileHandleReader::readLine(rtl::OString * pLine)
+FileHandleReader::readLine(OString * pLine)
     SAL_THROW(())
 {
     OSL_ENSURE(pLine, "specification violation");
@@ -273,13 +269,13 @@ FileHandleReader::readLine(rtl::OString * pLine)
             case 0x0D:
                 m_bLf = true;
             case 0x0A:
-                *pLine += rtl::OString(m_aBuffer + nStart,
+                *pLine += OString(m_aBuffer + nStart,
                                        m_nIndex - 1 - nStart);
                     //TODO! check for overflow, and not very efficient
                 return RESULT_OK;
             }
 
-        *pLine += rtl::OString(m_aBuffer + nStart, m_nIndex - nStart);
+        *pLine += OString(m_aBuffer + nStart, m_nIndex - nStart);
             //TODO! check for overflow, and not very efficient
     }
 }
@@ -365,7 +361,7 @@ bool getJavaProps(const OUString & exePath,
 #ifdef JVM_ONE_PATH_CHECK
                   const OUString & homePath,
 #endif
-                  std::vector<std::pair<rtl::OUString, rtl::OUString> >& props,
+                  std::vector<std::pair<OUString, OUString> >& props,
                   bool * bProcessRun)
 {
     bool ret = false;
@@ -375,7 +371,7 @@ bool getJavaProps(const OUString & exePath,
     //We need to set the CLASSPATH in case the office is started from
     //a different directory. The JREProperties.class is expected to reside
     //next to the plugin.
-    rtl::OUString sThisLib;
+    OUString sThisLib;
     if (osl_getModuleURLFromAddress((void *) (sal_IntPtr)& getJavaProps,
                                     & sThisLib.pData) == sal_False)
         return false;
@@ -496,7 +492,7 @@ bool getJavaProps(const OUString & exePath,
     readable strings. The strings are encoded as integer values separated
     by spaces.
  */
-bool decodeOutput(const rtl::OString& s, rtl::OUString* out)
+bool decodeOutput(const OString& s, OUString* out)
 {
     OSL_ASSERT(out != 0);
     OUStringBuffer buff(512);
@@ -687,7 +683,7 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
 
 
 bool getJREInfoFromBinPath(
-    const rtl::OUString& path, vector<rtl::Reference<VendorBase> > & vecInfos)
+    const OUString& path, vector<rtl::Reference<VendorBase> > & vecInfos)
 {
     // file:///c:/jre/bin
     //map:       jre/bin/java.exe
@@ -781,7 +777,7 @@ vector<OUString> getVectorFromCharArray(char const * const * ar, int size)
     }
     return vec;
 }
-bool getJREInfoByPath(const rtl::OUString& path,
+bool getJREInfoByPath(const OUString& path,
                       std::vector<rtl::Reference<VendorBase> > & vecInfos)
 {
     bool ret = false;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index cab102757f64..33ff7e35b530 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -28,7 +28,7 @@ namespace jfw_plugin
 {
 
 class VendorBase;
-std::vector<rtl::OUString> getVectorFromCharArray(char const * const * ar, int size);
+std::vector<OUString> getVectorFromCharArray(char const * const * ar, int size);
 
 /*   The function uses the relative paths, such as "bin/java.exe" and the provided
      path to derive the home directory. The home directory is then used as
@@ -36,8 +36,8 @@ std::vector<rtl::OUString> getVectorFromCharArray(char const * const * ar, int s
      file:///c:/j2sdk/jre/bin then file:///c:/j2sdk/jre would be derived.
  */
 bool getJREInfoFromBinPath(
-    const rtl::OUString& path, std::vector<rtl::Reference<VendorBase> > & vecInfos);
-inline rtl::OUString getDirFromFile(const rtl::OUString& usFilePath);
+    const OUString& path, std::vector<rtl::Reference<VendorBase> > & vecInfos);
+inline OUString getDirFromFile(const OUString& usFilePath);
 void createJavaInfoFromPath(std::vector<rtl::Reference<VendorBase> >& vecInfos);
 void createJavaInfoFromJavaHome(std::vector<rtl::Reference<VendorBase> > &vecInfos);
 void createJavaInfoDirScan(std::vector<rtl::Reference<VendorBase> >& vecInfos);
@@ -45,7 +45,7 @@ void createJavaInfoDirScan(std::vector<rtl::Reference<VendorBase> >& vecInfos);
 void createJavaInfoFromWinReg(std::vector<rtl::Reference<VendorBase> >& vecInfos);
 #endif
 
-bool makeDriveLetterSame(rtl::OUString * fileURL);
+bool makeDriveLetterSame(OUString * fileURL);
 
 
 /* for std::find_if
@@ -54,8 +54,8 @@ bool makeDriveLetterSame(rtl::OUString * fileURL);
 */
 struct InfoFindSame
 {
-    rtl::OUString sJava;
-    InfoFindSame(const rtl::OUString& sJavaHome):sJava(sJavaHome){}
+    OUString sJava;
+    InfoFindSame(const OUString& sJavaHome):sJava(sJavaHome){}
 
     bool operator () (const rtl::Reference<VendorBase> & aVendorInfo)
     {
@@ -65,16 +65,16 @@ struct InfoFindSame
 
 struct SameOrSubDirJREMap
 {
-    rtl::OUString s1;
-    SameOrSubDirJREMap(const rtl::OUString& s):s1(s){
+    OUString s1;
+    SameOrSubDirJREMap(const OUString& s):s1(s){
     }
 
-    bool operator () (const std::pair<const rtl::OUString, rtl::Reference<VendorBase> > & s2)
+    bool operator () (const std::pair<const OUString, rtl::Reference<VendorBase> > & s2)
     {
         if (s1 == s2.first)
             return true;
-        rtl::OUString sSub;
-        sSub = s2.first + rtl::OUString("/");
+        OUString sSub;
+        sSub = s2.first + OUString("/");
         if (s1.match(sSub) == sal_True)
             return true;
         return false;
@@ -87,7 +87,7 @@ struct SameOrSubDirJREMap
    This depends if there is a JRE at all and if it is from a vendor that
    is supported by this plugin.
  */
-rtl::Reference<VendorBase> getJREInfoByPath(const rtl::OUString& path);
+rtl::Reference<VendorBase> getJREInfoByPath(const OUString& path);
 
 /* Creates a VendorBase object if a JRE could be found at the specified path.
 
@@ -102,17 +102,17 @@ rtl::Reference<VendorBase> getJREInfoByPath(const rtl::OUString& path);
    false - no VendorBase has been created. Either the path did not represent a
    supported JRE installation or there was already a VendorBase in vecInfos.
  */
-bool getJREInfoByPath(const rtl::OUString& path,
+bool getJREInfoByPath(const OUString& path,
                       std::vector<rtl::Reference<VendorBase> > & vecInfos);
 
 std::vector<rtl::Reference<VendorBase> > getAllJREInfos();
 
 bool getJavaProps(
-    const rtl::OUString & exePath,
+    const OUString & exePath,
 #ifdef JVM_ONE_PATH_CHECK
-    const rtl::OUString & homePath,
+    const OUString & homePath,
 #endif
-    std::vector<std::pair<rtl::OUString, rtl::OUString> >& props,
+    std::vector<std::pair<OUString, OUString> >& props,
     bool * bProcessRun);
 
 void  createJavaInfoFromWinReg(std::vector<rtl::Reference<VendorBase> > & vecInfos);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 67957ef6fbd2..6fa931d44eb7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -27,7 +27,6 @@
 using namespace std;
 using namespace osl;
 
-using ::rtl::OUString;
 
 namespace jfw_plugin
 {
@@ -238,7 +237,7 @@ bool VendorBase::needsRestart() const
     return false;
 }
 
-int VendorBase::compareVersions(const rtl::OUString& /*sSecond*/) const
+int VendorBase::compareVersions(const OUString& /*sSecond*/) const
 {
     OSL_FAIL("[Java framework] VendorBase::compareVersions must be "
                "overridden in derived class.");
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index f9f4a968cf3b..0d73dd67763d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -121,7 +121,7 @@ public:
        it will be discarded by the caller.
     */
     virtual bool initialize(
-        std::vector<std::pair<rtl::OUString, rtl::OUString> > props);
+        std::vector<std::pair<OUString, OUString> > props);
 
     /* returns relative file URLs to the runtime library.
        For example         "/bin/client/jvm.dll"
@@ -130,11 +130,11 @@ public:
 
     virtual char const* const* getLibraryPaths(int* size);
 
-    virtual const rtl::OUString & getVendor() const;
-    virtual const rtl::OUString & getVersion() const;
-    virtual const rtl::OUString & getHome() const;
-    virtual const rtl::OUString & getRuntimeLibrary() const;
-    virtual const rtl::OUString & getLibraryPaths() const;
+    virtual const OUString & getVendor() const;
+    virtual const OUString & getVersion() const;
+    virtual const OUString & getHome() const;
+    virtual const OUString & getRuntimeLibrary() const;
+    virtual const OUString & getLibraryPaths() const;
     virtual bool supportsAccessibility() const;
     /* determines if prior to running java something has to be done,
        like setting the LD_LIBRARY_PATH. This implementation checks
@@ -156,22 +156,22 @@ public:
       @throw
       MalformedVersionException if the version string was not recognized.
      */
-    virtual int compareVersions(const rtl::OUString& sSecond) const;
+    virtual int compareVersions(const OUString& sSecond) const;
 
 protected:
 
-    rtl::OUString m_sVendor;
-    rtl::OUString m_sVersion;
-    rtl::OUString m_sHome;
-    rtl::OUString m_sRuntimeLibrary;
-    rtl::OUString m_sLD_LIBRARY_PATH;
+    OUString m_sVendor;
+    OUString m_sVersion;
+    OUString m_sHome;
+    OUString m_sRuntimeLibrary;
+    OUString m_sLD_LIBRARY_PATH;
     bool m_bAccessibility;
 
 
     typedef rtl::Reference<VendorBase> (* createInstance_func) ();
     friend rtl::Reference<VendorBase> createInstance(
         createInstance_func pFunc,
-        std::vector<std::pair<rtl::OUString, rtl::OUString> > properties);
+        std::vector<std::pair<OUString, OUString> > properties);
 };
 
 }
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 02d82ce514d4..11ed82e7a668 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -27,10 +27,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OStringToOUString;
-using ::rtl::OString;
 
 namespace jfw_plugin
 {
@@ -64,7 +60,7 @@ Sequence<OUString> getVendorNames()
     return Sequence<OUString>(arNames, count);
 }
 
-bool isVendorSupported(const rtl::OUString& sVendor)
+bool isVendorSupported(const OUString& sVendor)
 {
     Sequence<OUString> seqNames = getVendorNames();
     const OUString * arNames = seqNames.getConstArray();
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index d91a9a1ec5cf..98b7b8a1bff8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -46,13 +46,13 @@ VendorSupportMapEntry gVendorMap[] ={
     {NULL, NULL, NULL} };
 
 
-com::sun::star::uno::Sequence<rtl::OUString> getVendorNames();
+com::sun::star::uno::Sequence<OUString> getVendorNames();
 
 /* Examines if the vendor supplied in parameter sVendor is part of the
    list of supported vendors. That is the arry of VendorSupportMapEntry
    is search for an respective entry.
 */
-bool isVendorSupported(const rtl::OUString & sVendor);
+bool isVendorSupported(const OUString & sVendor);
 }
 
 #endif