remove more rtl::OUString and OString prefixes

which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
author: Noel Grandin <noel.grandin@collabora.co.uk> 2018-10-23 12:06:00 +0200
committer: Noel Grandin <noel.grandin@collabora.co.uk> 2018-10-24 14:43:34 +0200
commit: 6f50961e69406a17d6ec998956a6b33208b1001b (patch)
tree: 413c83df969e73c5cba1e11ef3740afc748ee1f5 /sal
parent: 4e729de73f2947155248f8df5897380611b87917 (diff)
61 files changed, 1764 insertions, 1787 deletions
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 3ff102f18410..3e2cdd512e68 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -72,14 +72,14 @@ void usageFailure() {
     std::exit(EXIT_FAILURE);
 }
 
-rtl::OUString getArgument(sal_Int32 index) {
-    rtl::OUString arg;
+OUString getArgument(sal_Int32 index) {
+    OUString arg;
     osl_getCommandArg(index, &arg.pData);
     return arg;
 }
 
-std::string convertLazy(rtl::OUString const & s16) {
-    rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding()));
+std::string convertLazy(OUString const & s16) {
+    OString s8(OUStringToOString(s16, osl_getThreadTextEncoding()));
     static_assert(sizeof (sal_Int32) <= sizeof (std::string::size_type), "must be at least the same size");
         // ensure following cast is legitimate
     return std::string(
@@ -398,7 +398,7 @@ SAL_IMPLEMENT_MAIN()
         sal_uInt32 index = 0;
         while (index < osl_getCommandArgCount())
         {
-            rtl::OUString arg = getArgument(index);
+            OUString arg = getArgument(index);
             if (arg.startsWith("-env:CPPUNITTESTTARGET=", &path))
             {
                 ++index;
@@ -413,13 +413,13 @@ SAL_IMPLEMENT_MAIN()
             {
                 if (testlib.empty())
                 {
-                    testlib = rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
+                    testlib = OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
                     args += testlib;
                 }
                 else
                 {
                     args += ' ';
-                    args += rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
+                    args += OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
                 }
                 ++index;
                 continue;
@@ -427,8 +427,8 @@ SAL_IMPLEMENT_MAIN()
             if (osl_getCommandArgCount() - index < 3) {
                 usageFailure();
             }
-            rtl::OUString lib(getArgument(index + 1));
-            rtl::OUString sym(getArgument(index + 2));
+            OUString lib(getArgument(index + 1));
+            OUString sym(getArgument(index + 2));
 #ifndef DISABLE_DYNLOADING
             osl::Module mod(lib, SAL_LOADMODULE_GLOBAL);
             oslGenericFunction fn = mod.getFunctionSymbol(sym);
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index fe5affc9d069..209dc55e1e32 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -34,14 +34,14 @@ struct StaticDebugBaseAddressFilter
     std::vector<OString> operator()() const {
         std::vector<OString> vec;
         rtl_uString * pStr = nullptr;
-        rtl::OUString const name(
+        OUString const name(
             "OSL_DEBUGBASE_STORE_ADDRESSES" );
         if (osl_getEnvironment( name.pData, &pStr ) == osl_Process_E_None) {
-            rtl::OUString const str(pStr);
+            OUString const str(pStr);
             rtl_uString_release(pStr);
             sal_Int32 nIndex = 0;
             do {
-                vec.push_back( rtl::OUStringToOString(
+                vec.push_back( OUStringToOString(
                                    str.getToken( 0, ';', nIndex ),
                                    RTL_TEXTENCODING_ASCII_US ) );
             }
@@ -51,7 +51,7 @@ struct StaticDebugBaseAddressFilter
     }
 };
 
-bool isSubStr( char const* pStr, rtl::OString const& subStr )
+bool isSubStr( char const* pStr, OString const& subStr )
 {
     return rtl_str_indexOfStr( pStr, subStr.getStr() ) >= 0;
 }
@@ -85,7 +85,7 @@ bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char const* pName )
     if (rVec.empty())
         return false;
     // check for "all":
-    rtl::OString const& rFirst = rVec[0];
+    OString const& rFirst = rVec[0];
     if ( rFirst == "all" )
         return true;
     auto const iEnd( rVec.cend() );
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index 30c7d600674d..242bb6210a76 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -38,12 +38,12 @@ oslModule SAL_CALL osl_loadModuleRelative(
     oslGenericFunction const baseModule, rtl_uString * const relativePath,
     sal_Int32 const mode)
 {
-    rtl::OUString base;
+    OUString base;
     if (!osl::Module::getUrlFromAddress(baseModule, base)) {
         SAL_INFO("sal.osl","osl::Module::getUrlFromAddress failed");
         return nullptr;
     }
-    rtl::OUString abs;
+    OUString abs;
     try {
         abs = rtl::Uri::convertRelToAbs(base, relativePath);
     } catch (const rtl::MalformedUriException & e) {
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 05e72997070b..fb12e4155e14 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -519,7 +519,7 @@ static int create_dir_with_callback(
     {
         if (aDirectoryCreationCallbackFunc)
         {
-            rtl::OUString url;
+            OUString url;
             osl::FileBase::getFileURLFromSystemPath(directory_path, url);
             aDirectoryCreationCallbackFunc(pData, url.pData);
         }
@@ -570,7 +570,7 @@ oslFileError SAL_CALL osl_createDirectoryPath(
     if (aDirectoryUrl == nullptr)
         return osl_File_E_INVAL;
 
-    rtl::OUString sys_path;
+    OUString sys_path;
     oslFileError osl_error = osl_getSystemPathFromFileURL_Ex(aDirectoryUrl, &sys_path.pData);
 
     if (osl_error != osl_File_E_None)
@@ -811,12 +811,12 @@ static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char*
 {
     int      nRet=0;
 
-    rtl::OString tmpDestFile;
+    OString tmpDestFile;
     if ( DestFileExists )
     {
         //TODO: better pick a temp file name instead of adding .osl-tmp:
         // use the destination file to avoid EXDEV /* Cross-device link */
-        tmpDestFile = rtl::OString(pszDestFileName) + ".osl-tmp";
+        tmpDestFile = OString(pszDestFileName) + ".osl-tmp";
         if (rename(pszDestFileName, tmpDestFile.getStr()) != 0)
         {
             int e = errno;
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 923b588a20c9..7fc2effb5f03 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -28,14 +28,14 @@ const sal_Unicode FPH_CHAR_PATH_SEPARATOR = '/';
 const sal_Unicode FPH_CHAR_DOT            = '.';
 const sal_Unicode FPH_CHAR_COLON          = ':';
 
-static const rtl::OUString FPH_PATH_SEPARATOR()
-{ return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
+static const OUString FPH_PATH_SEPARATOR()
+{ return OUString(FPH_CHAR_PATH_SEPARATOR); }
 
-static const rtl::OUString FPH_LOCAL_DIR_ENTRY()
-{ return rtl::OUString(FPH_CHAR_DOT); }
+static const OUString FPH_LOCAL_DIR_ENTRY()
+{ return OUString(FPH_CHAR_DOT); }
 
-static const rtl::OUString FPH_PARENT_DIR_ENTRY()
-{ return rtl::OUString(".."); }
+static const OUString FPH_PARENT_DIR_ENTRY()
+{ return OUString(".."); }
 
 void osl_systemPathRemoveSeparator(rtl_uString* pustrPath)
 {
@@ -62,7 +62,7 @@ void osl_systemPathEnsureSeparator(rtl_uString** ppustrPath)
     OSL_PRECOND((nullptr != ppustrPath) && (nullptr != *ppustrPath), "osl_systemPathEnsureSeparator: Invalid parameter");
     if ((ppustrPath != nullptr) && (*ppustrPath != nullptr))
     {
-        rtl::OUString path(*ppustrPath);
+        OUString path(*ppustrPath);
         sal_Int32    lp = path.getLength();
         sal_Int32    i  = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);
 
@@ -89,8 +89,8 @@ void osl_systemPathMakeAbsolutePath(
     const rtl_uString* pustrRelPath,
     rtl_uString**      ppustrAbsolutePath)
 {
-    rtl::OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
-    rtl::OUString rel(const_cast<rtl_uString*>(pustrRelPath));
+    OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
+    OUString rel(const_cast<rtl_uString*>(pustrRelPath));
 
     if (!base.isEmpty())
         osl_systemPathEnsureSeparator(&base.pData);
@@ -108,11 +108,11 @@ void osl_systemPathGetFileNameOrLastDirectoryPart(
     OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart,
                 "osl_systemPathGetFileNameOrLastDirectoryPart: Invalid parameter");
 
-    rtl::OUString path(const_cast<rtl_uString*>(pustrPath));
+    OUString path(const_cast<rtl_uString*>(pustrPath));
 
     osl_systemPathRemoveSeparator(path.pData);
 
-    rtl::OUString last_part;
+    OUString last_part;
 
     if (path.getLength() > 1 || (path.getLength() == 1 && path[0] != FPH_CHAR_PATH_SEPARATOR))
     {
@@ -130,7 +130,7 @@ bool osl_systemPathIsHiddenFileOrDirectoryEntry(
     if ((pustrPath == nullptr) || (pustrPath->length == 0))
         return false;
 
-    rtl::OUString fdp;
+    OUString fdp;
     osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &fdp.pData);
 
     return ((fdp.pData->length > 0) &&
@@ -143,7 +143,7 @@ bool osl_systemPathIsLocalOrParentDirectoryEntry(
 {
     OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter");
 
-    rtl::OUString dirent;
+    OUString dirent;
 
     osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &dirent.pData);
 
@@ -161,7 +161,7 @@ public:
        returns the first path in list, no need
        to call reset first
      */
-    path_list_iterator(const rtl::OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) :
+    path_list_iterator(const OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) :
         m_path_list(path_list),
         m_end(m_path_list.getStr() + m_path_list.getLength() + 1),
         m_separator(list_separator)
@@ -191,9 +191,9 @@ public:
         return (m_path_segment_end >= m_end);
     }
 
-    rtl::OUString get_current_item() const
+    OUString get_current_item() const
     {
-        return rtl::OUString(
+        return OUString(
             m_path_segment_begin,
             (m_path_segment_end - m_path_segment_begin));
     }
@@ -211,7 +211,7 @@ private:
     }
 
 private:
-    rtl::OUString const m_path_list;
+    OUString const m_path_list;
     const sal_Unicode*  m_end;
     const sal_Unicode   m_separator;
     const sal_Unicode*  m_path_segment_begin;
@@ -226,13 +226,13 @@ bool osl_searchPath(
     OSL_PRECOND(pustrFilePath && pustrSearchPathList && ppustrPathFound, "osl_searchPath: Invalid parameter");
 
     bool               bfound = false;
-    rtl::OUString      fp(const_cast<rtl_uString*>(pustrFilePath));
-    rtl::OUString      pl = rtl::OUString(const_cast<rtl_uString*>(pustrSearchPathList));
+    OUString      fp(const_cast<rtl_uString*>(pustrFilePath));
+    OUString      pl = OUString(const_cast<rtl_uString*>(pustrSearchPathList));
     path_list_iterator pli(pl);
 
     while (!pli.done())
     {
-        rtl::OUString p = pli.get_current_item();
+        OUString p = pli.get_current_item();
         osl::systemPathEnsureSeparator(p);
         p += fp;
 
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 2b2fd8891256..18af761cb310 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -184,7 +184,7 @@ namespace osl
 
   ******************************************/
 
- inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
+ inline void systemPathRemoveSeparator(/*inout*/ OUString& Path)
  {
      osl_systemPathRemoveSeparator(Path.pData);
  }
@@ -206,7 +206,7 @@ namespace osl
 
   ******************************************/
 
- inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
+ inline void systemPathEnsureSeparator(/*inout*/ OUString& Path)
  {
      osl_systemPathEnsureSeparator(&Path.pData);
  }
@@ -225,7 +225,7 @@ namespace osl
 
   ******************************************/
 
- inline bool systemPathIsRelativePath(const rtl::OUString& Path)
+ inline bool systemPathIsRelativePath(const OUString& Path)
  {
     return osl_systemPathIsRelativePath(Path.pData);
  }
@@ -265,9 +265,9 @@ namespace osl
   *****************************************/
 
  inline void systemPathMakeAbsolutePath(
-     const rtl::OUString& BasePath,
-    const rtl::OUString& RelPath,
-    rtl::OUString&       AbsolutePath)
+     const OUString& BasePath,
+    const OUString& RelPath,
+    OUString&       AbsolutePath)
  {
     osl_systemPathMakeAbsolutePath(
         BasePath.pData, RelPath.pData, &AbsolutePath.pData);
@@ -291,7 +291,7 @@ namespace osl
  *********************************************/
 
  inline bool systemPathIsHiddenFileOrDirectoryEntry(
-     const rtl::OUString& Path)
+     const OUString& Path)
  {
     return osl_systemPathIsHiddenFileOrDirectoryEntry(Path.pData);
  }
@@ -301,9 +301,9 @@ namespace osl
   ***********************************************/
 
  inline bool searchPath(
-     const rtl::OUString& ustrFilePath,
-    const rtl::OUString& ustrSearchPathList,
-    rtl::OUString& ustrPathFound)
+     const OUString& ustrFilePath,
+    const OUString& ustrSearchPathList,
+    OUString& ustrPathFound)
  {
      return osl_searchPath(
         ustrFilePath.pData,
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 7ba3d90a7037..b25bc3f1ed14 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -99,7 +99,7 @@ namespace
        required on network file systems not using unix semantics (AFS, see
        fdo#43095).
     */
-    void set_file_access_rights(const rtl::OUString& file_path, oslFileStatus* pStat)
+    void set_file_access_rights(const OUString& file_path, oslFileStatus* pStat)
     {
         pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
 
@@ -110,7 +110,7 @@ namespace
             pStat->uAttributes |= osl_File_Attribute_Executable;
     }
 
-    void set_file_hidden_status(const rtl::OUString& file_path, oslFileStatus* pStat)
+    void set_file_hidden_status(const OUString& file_path, oslFileStatus* pStat)
     {
         pStat->uAttributes   = osl::systemPathIsHiddenFileOrDirectoryEntry(file_path) ? osl_File_Attribute_Hidden : 0;
         pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
@@ -119,7 +119,7 @@ namespace
     /* the set_file_access_rights must be called after set_file_hidden_status(...) and
        set_file_access_mask(...) because of the hack in set_file_access_rights(...) */
     void set_file_attributes(
-        const rtl::OUString& file_path, const struct stat& file_stat, const sal_uInt32 uFieldMask, oslFileStatus* pStat)
+        const OUString& file_path, const struct stat& file_stat, const sal_uInt32 uFieldMask, oslFileStatus* pStat)
     {
         set_file_hidden_status(file_path, pStat);
         set_file_access_mask(file_stat, pStat);
@@ -168,9 +168,9 @@ namespace
                 (field_mask & osl_FileStatus_Mask_Validate));
     }
 
-    oslFileError set_link_target_url(const rtl::OUString& file_path, oslFileStatus* pStat)
+    oslFileError set_link_target_url(const OUString& file_path, oslFileStatus* pStat)
     {
-        rtl::OUString link_target;
+        OUString link_target;
         if (!osl::realpath(file_path, link_target))
             return oslTranslateFileError(errno);
 
@@ -183,12 +183,12 @@ namespace
     }
 
     oslFileError setup_osl_getFileStatus(
-        DirectoryItem_Impl * pImpl, oslFileStatus* pStat, rtl::OUString& file_path)
+        DirectoryItem_Impl * pImpl, oslFileStatus* pStat, OUString& file_path)
     {
         if ((pImpl == nullptr) || (pStat == nullptr))
             return osl_File_E_INVAL;
 
-        file_path = rtl::OUString(pImpl->m_ustrFilePath);
+        file_path = OUString(pImpl->m_ustrFilePath);
         OSL_ASSERT(!file_path.isEmpty());
         if (file_path.isEmpty())
             return osl_File_E_INVAL;
@@ -203,7 +203,7 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS
 {
     DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(Item);
 
-    rtl::OUString file_path;
+    OUString file_path;
     oslFileError  osl_error = setup_osl_getFileStatus(pImpl, pStat, file_path);
     if (osl_error != osl_File_E_None)
         return osl_error;
@@ -432,8 +432,8 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b)
 
     struct stat a_stat, b_stat;
 
-    if (osl::lstat(rtl::OUString(pA->m_ustrFilePath), a_stat) != 0 ||
-        osl::lstat(rtl::OUString(pB->m_ustrFilePath), b_stat) != 0)
+    if (osl::lstat(OUString(pA->m_ustrFilePath), a_stat) != 0 ||
+        osl::lstat(OUString(pB->m_ustrFilePath), b_stat) != 0)
         return false;
 
     return (a_stat.st_ino == b_stat.st_ino);
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 8e6f30f839d1..24fa04c7bfa6 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -454,7 +454,7 @@ namespace
        PATH_MAX else osl_File_E_NAMETOOLONG is the result
     */
 
-    oslFileError osl_getAbsoluteFileURL_impl_(const rtl::OUString& unresolved_path, rtl::OUString& resolved_path)
+    oslFileError osl_getAbsoluteFileURL_impl_(const OUString& unresolved_path, OUString& resolved_path)
     {
         /* the given unresolved path must not exceed PATH_MAX */
         if (unresolved_path.getLength() >= (PATH_MAX - 2))
@@ -569,7 +569,7 @@ namespace
 
         OSL_ASSERT(len < PATH_MAX);
 
-        resolved_path = rtl::OUString(path_resolved_so_far, len);
+        resolved_path = OUString(path_resolved_so_far, len);
 
         return osl_File_E_None;
     }
@@ -584,13 +584,13 @@ oslFileError osl_getAbsoluteFileURL(
     /* Work around the below call to getSystemPathFromFileURL rejecting input
        that starts with "/" (for whatever reason it behaves that way; but
        changing that would start to break lots of tests at least) */
-    rtl::OUString relUrl(ustrRelativeURL);
+    OUString relUrl(ustrRelativeURL);
     if (relUrl.startsWith("//"))
         relUrl = "file:" + relUrl;
     else if (relUrl.startsWith("/"))
         relUrl = "file://" + relUrl;
 
-    rtl::OUString unresolved_path;
+    OUString unresolved_path;
 
     FileBase::RC frc = FileBase::getSystemPathFromFileURL(relUrl, unresolved_path);
     if (frc != FileBase::E_None)
@@ -598,18 +598,18 @@ oslFileError osl_getAbsoluteFileURL(
 
     if (systemPathIsRelativePath(unresolved_path))
     {
-        rtl::OUString base_path;
+        OUString base_path;
         oslFileError rc = osl_getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData);
         if (rc != osl_File_E_None)
             return rc;
 
-        rtl::OUString abs_path;
+        OUString abs_path;
         systemPathMakeAbsolutePath(base_path, unresolved_path, abs_path);
 
         unresolved_path = abs_path;
     }
 
-    rtl::OUString resolved_path;
+    OUString resolved_path;
     oslFileError rc = osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
     if (rc == osl_File_E_None)
     {
@@ -627,11 +627,11 @@ namespace detail {
      No separate error code if unicode to text conversion or getenv fails because for the
      caller there is no difference why a file could not be found in $PATH
     */
-    bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result)
+    bool find_in_PATH(const OUString& file_path, OUString& result)
     {
         bool bfound = false;
-        rtl::OUString path("PATH");
-        rtl::OUString env_path;
+        OUString path("PATH");
+        OUString env_path;
 
         if (osl_getEnvironment(path.pData, &env_path.pData) == osl_Process_E_None)
             bfound = osl::searchPath(file_path, env_path, result);
@@ -647,23 +647,23 @@ namespace
      No separate error code if unicode to text conversion or getcwd fails because for the
      caller there is no difference why a file could not be found in CDW
     */
-    bool find_in_CWD(const rtl::OUString& file_path, rtl::OUString& result)
+    bool find_in_CWD(const OUString& file_path, OUString& result)
     {
         bool bfound = false;
-        rtl::OUString cwd_url;
+        OUString cwd_url;
 
         if (osl_getProcessWorkingDir(&cwd_url.pData) == osl_Process_E_None)
         {
-            rtl::OUString cwd;
+            OUString cwd;
             FileBase::getSystemPathFromFileURL(cwd_url, cwd);
             bfound = osl::searchPath(file_path, cwd, result);
         }
         return bfound;
     }
 
-    bool find_in_searchPath(const rtl::OUString& file_path, rtl_uString* search_path, rtl::OUString& result)
+    bool find_in_searchPath(const OUString& file_path, rtl_uString* search_path, OUString& result)
     {
-        return (search_path && osl::searchPath(file_path, rtl::OUString(search_path), result));
+        return (search_path && osl::searchPath(file_path, OUString(search_path), result));
     }
 
 }
@@ -673,7 +673,7 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc
     OSL_PRECOND(ustrFilePath && pustrURL, "osl_searchFileURL: invalid parameter");
 
     FileBase::RC  rc;
-    rtl::OUString file_path;
+    OUString file_path;
 
     // try to interpret search path as file url else assume it's a system path list
     rc = FileBase::getSystemPathFromFileURL(ustrFilePath, file_path);
@@ -683,13 +683,13 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc
         return oslFileError(rc);
 
     bool          bfound = false;
-    rtl::OUString result;
+    OUString result;
 
     if (find_in_searchPath(file_path, ustrSearchPath, result) ||
         osl::detail::find_in_PATH(file_path, result) ||
         find_in_CWD(file_path, result))
     {
-        rtl::OUString resolved;
+        OUString resolved;
 
         if (osl::realpath(result, resolved))
         {
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index c9377040894a..01225e631d82 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -807,8 +807,8 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
 
 void imp_getProcessLocale( rtl_Locale ** ppLocale )
 {
-    rtl::OUString loc16(macosx_getLocale());
-    rtl::OString locale;
+    OUString loc16(macosx_getLocale());
+    OString locale;
     if (!loc16.convertToString(
             &locale, RTL_TEXTENCODING_UTF8,
             (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
diff --git a/sal/osl/unx/nlsupport.hxx b/sal/osl/unx/nlsupport.hxx
index 53a132487c82..dce5d65c3df8 100644
--- a/sal/osl/unx/nlsupport.hxx
+++ b/sal/osl/unx/nlsupport.hxx
@@ -29,7 +29,7 @@ namespace rtl { class OUString; }
 void imp_getProcessLocale( rtl_Locale ** );
 
 #if defined IOS || defined MACOSX
-rtl::OUString macosx_getLocale();
+OUString macosx_getLocale();
 #endif
 
 #endif
diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index b1bf89827212..7bd611d85c17 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -62,7 +62,7 @@ namespace
         return CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, sref);
     }
 
-    void append(rtl::OUStringBuffer & buffer, CFStringRef string) {
+    void append(OUStringBuffer & buffer, CFStringRef string) {
         CFIndex n = CFStringGetLength(string);
         CFStringGetCharacters(
             string, CFRangeMake(0, n),
@@ -72,7 +72,7 @@ namespace
 
 /** Grab current locale from system.
 */
-rtl::OUString macosx_getLocale()
+OUString macosx_getLocale()
 {
     CFStringRef sref = getProcessLocale();
     CFStringGuard sGuard(sref);
@@ -84,7 +84,7 @@ rtl::OUString macosx_getLocale()
     CFArrayRef subs = CFStringCreateArrayBySeparatingStrings(nullptr, sref, CFSTR("-"));
     CFArrayGuard arrGuard(subs);
 
-    rtl::OUStringBuffer buf;
+    OUStringBuffer buf;
     append(buf, static_cast<CFStringRef>(CFArrayGetValueAtIndex(subs, 0)));
 
     // country also available? Assumption: if the array contains more than one
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 480bb264a267..fcb074d9b7c0 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -177,7 +177,7 @@ static void ChildStatusProc(void *pData)
             if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
                 SAL_WARN("sal.osl", "Failed to change uid and guid: " << UnixErrnoString(errno));
 
-            const rtl::OUString envVar("HOME");
+            const OUString envVar("HOME");
             osl_clearEnvironment(envVar.pData);
         }
 
@@ -393,25 +393,25 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
                                             oslFileHandle   *pErrorRead
                                             )
 {
-    rtl::OUString image;
+    OUString image;
     if (ustrImageName == nullptr)
     {
         if (nArguments == 0)
         {
             return osl_Process_E_InvalidError;
         }
-        image = rtl::OUString::unacquired(ustrArguments);
+        image = OUString::unacquired(ustrArguments);
     }
     else
     {
         osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
-            rtl::OUString::unacquired(&ustrImageName), image);
+            OUString::unacquired(&ustrImageName), image);
         if (e != osl::FileBase::E_None)
         {
             SAL_INFO(
                 "sal.osl",
                 "getSystemPathFromFileURL("
-                    << rtl::OUString::unacquired(&ustrImageName)
+                    << OUString::unacquired(&ustrImageName)
                     << ") failed with " << e);
             return osl_Process_E_Unknown;
         }
@@ -419,7 +419,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
 
     if ((Options & osl_Process_SEARCHPATH) != 0)
     {
-        rtl::OUString path;
+        OUString path;
         if (osl::detail::find_in_PATH(image, path))
         {
             image = path;
@@ -452,7 +452,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
         {
             SAL_INFO(
                 "sal.osl",
-                "FileURLToPath(" << rtl::OUString::unacquired(&ustrWorkDir)
+                "FileURLToPath(" << OUString::unacquired(&ustrWorkDir)
                     << ") failed with " << e);
             return osl_Process_E_Unknown;
         }
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index b232695cd57f..2b59e9f3147c 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -224,7 +224,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
                 /* see @ osl_getExecutableFile(). */
                 if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), '/') == -1)
                 {
-                    const rtl::OUString PATH ("PATH");
+                    const OUString PATH ("PATH");
 
                     rtl_uString * pSearchPath = nullptr;
                     osl_getEnvironment (PATH.pData, &pSearchPath);
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index a9aaa1f29564..ea48309c3b94 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -31,9 +31,9 @@
 #include <osl/detail/android-bootstrap.h>
 #endif
 
-static rtl::OString OUStringToOString(const rtl_uString* s)
+static OString OUStringToOString(const rtl_uString* s)
 {
-    return rtl::OUStringToOString(rtl::OUString(const_cast<rtl_uString*>(s)),
+    return OUStringToOString(OUString(const_cast<rtl_uString*>(s)),
                                   osl_getThreadTextEncoding());
 }
 
@@ -142,16 +142,16 @@ typedef void accessFilePathState;
 #ifdef MACOSX
 /*
  * Helper function for resolving Mac native alias files (not the same as unix alias files)
- * and to return the resolved alias as rtl::OString
+ * and to return the resolved alias as OString
  */
-static rtl::OString macxp_resolveAliasAndConvert(rtl::OString const & p)
+static OString macxp_resolveAliasAndConvert(OString const & p)
 {
     sal_Char path[PATH_MAX];
     if (p.getLength() < PATH_MAX)
     {
         strcpy(path, p.getStr());
         macxp_resolveAlias(path, PATH_MAX);
-        return rtl::OString(path);
+        return OString(path);
     }
     return p;
 }
@@ -159,7 +159,7 @@ static rtl::OString macxp_resolveAliasAndConvert(rtl::OString const & p)
 
 int access_u(const rtl_uString* pustrPath, int mode)
 {
-    rtl::OString fn = OUStringToOString(pustrPath);
+    OString fn = OUStringToOString(pustrPath);
 #ifdef ANDROID
     if (fn == "/assets" || fn.startsWith("/assets/"))
     {
@@ -197,7 +197,7 @@ int access_u(const rtl_uString* pustrPath, int mode)
 
 bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedName)
 {
-    rtl::OString fn = OUStringToOString(pustrFileName);
+    OString fn = OUStringToOString(pustrFileName);
 #ifdef ANDROID
     if (fn == "/assets" || fn.startsWith("/assets/"))
     {
@@ -229,7 +229,7 @@ bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedNa
 
     if (bRet)
     {
-        rtl::OUString resolved = rtl::OStringToOUString(rtl::OString(static_cast<sal_Char*>(rp)),
+        OUString resolved = OStringToOUString(OString(static_cast<sal_Char*>(rp)),
                                                         osl_getThreadTextEncoding());
 
         rtl_uString_assign(ppustrResolvedName, resolved.pData);
@@ -292,7 +292,7 @@ int lstat_c(const char* cpPath, struct stat* buf)
 
 int lstat_u(const rtl_uString* pustrPath, struct stat* buf)
 {
-    rtl::OString fn = OUStringToOString(pustrPath);
+    OString fn = OUStringToOString(pustrPath);
 
 #ifdef MACOSX
     fn = macxp_resolveAliasAndConvert(fn);
@@ -303,7 +303,7 @@ int lstat_u(const rtl_uString* pustrPath, struct stat* buf)
 
 int mkdir_u(const rtl_uString* path, mode_t mode)
 {
-    rtl::OString fn = OUStringToOString(path);
+    OString fn = OUStringToOString(path);
 
     accessFilePathState *state = prepare_to_access_file_path(fn.getStr());
 
@@ -388,7 +388,7 @@ int ftruncate_with_name(int fd, sal_uInt64 uSize, rtl_String* path)
      * abstraction layer that keeps the pathname around.
      */
 
-    rtl::OString fn = rtl::OString(path);
+    OString fn = OString(path);
 
 #ifdef MACOSX
     fn = macxp_resolveAliasAndConvert(fn);
diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx
index 4be4fbb28748..5030b75ca214 100644
--- a/sal/osl/unx/uunxapi.hxx
+++ b/sal/osl/unx/uunxapi.hxx
@@ -60,7 +60,7 @@ int ftruncate_with_name(int fd, sal_uInt64 uSize, rtl_String* path);
 
 namespace osl
 {
-    inline int access(const rtl::OUString& ustrPath, int mode)
+    inline int access(const OUString& ustrPath, int mode)
     {
         return access_u(ustrPath.pData, mode);
     }
@@ -79,18 +79,18 @@ namespace osl
      **********************************/
 
     inline bool realpath(
-        const rtl::OUString& ustrFileName,
-        rtl::OUString& ustrResolvedName)
+        const OUString& ustrFileName,
+        OUString& ustrResolvedName)
     {
         return realpath_u(ustrFileName.pData, &ustrResolvedName.pData);
     }
 
-    inline int lstat(const rtl::OUString& ustrPath, struct stat& buf)
+    inline int lstat(const OUString& ustrPath, struct stat& buf)
     {
         return lstat_u(ustrPath.pData, &buf);
     }
 
-    inline int mkdir(const rtl::OUString& aPath, mode_t aMode)
+    inline int mkdir(const OUString& aPath, mode_t aMode)
     {
         return mkdir_u(aPath.pData, aMode);
     }
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 5e630c95a5ee..b8f8ad4e261f 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -179,7 +179,7 @@ namespace
         return has_parent;
     }
 
-    inline bool has_path_parent(const rtl::OUString& path)
+    inline bool has_path_parent(const OUString& path)
     { return has_path_parent(path.getStr()); }
 
 }
@@ -589,7 +589,7 @@ static DWORD create_dir_with_callback(
     {
         if (aDirectoryCreationCallbackFunc)
         {
-            rtl::OUString url;
+            OUString url;
             osl_getFileURLFromSystemPath(dir_path, &(url.pData));
             aDirectoryCreationCallbackFunc(pData, url.pData);
         }
@@ -654,7 +654,7 @@ oslFileError SAL_CALL osl_createDirectoryPath(
     if (aDirectoryUrl == nullptr)
         return osl_File_E_INVAL;
 
-    rtl::OUString sys_path;
+    OUString sys_path;
     oslFileError osl_error =
         osl_getSystemPathFromFileURL_(aDirectoryUrl, &sys_path.pData, false);
 
@@ -1149,14 +1149,14 @@ static inline bool is_floppy_A_present()
 static inline bool is_floppy_B_present()
 { return (GetLogicalDrives() & 2); }
 
-static bool is_floppy_volume_mount_point(const rtl::OUString& path)
+static bool is_floppy_volume_mount_point(const OUString& path)
 {
     // determines if a volume mount point shows to a floppy
     // disk by comparing the unique volume names
     static const LPCWSTR FLOPPY_A = L"A:\\";
     static const LPCWSTR FLOPPY_B = L"B:\\";
 
-    rtl::OUString p(path);
+    OUString p(path);
     osl::systemPathEnsureSeparator(p);
 
     WCHAR vn[51];
@@ -1176,7 +1176,7 @@ static bool is_floppy_volume_mount_point(const rtl::OUString& path)
     return false;
 }
 
-static bool is_floppy_drive(const rtl::OUString& path)
+static bool is_floppy_drive(const OUString& path)
 {
     static const LPCWSTR FLOPPY_DRV_LETTERS = L"AaBb";
 
@@ -1190,9 +1190,9 @@ static bool is_floppy_drive(const rtl::OUString& path)
     return ((wcschr(FLOPPY_DRV_LETTERS, pszPath[0]) && (L':' == pszPath[1])) || is_floppy_volume_mount_point(path));
 }
 
-static bool is_volume_mount_point(const rtl::OUString& path)
+static bool is_volume_mount_point(const OUString& path)
 {
-    rtl::OUString p(path);
+    OUString p(path);
     osl::systemPathRemoveSeparator(p);
 
     bool  is_volume_root = false;
@@ -1220,12 +1220,12 @@ static bool is_volume_mount_point(const rtl::OUString& path)
     return is_volume_root;
 }
 
-static UINT get_volume_mount_point_drive_type(const rtl::OUString& path)
+static UINT get_volume_mount_point_drive_type(const OUString& path)
 {
     if (0 == path.getLength())
         return GetDriveTypeW(nullptr);
 
-    rtl::OUString p(path);
+    OUString p(path);
     osl::systemPathEnsureSeparator(p);
 
     WCHAR vn[51];
@@ -1241,7 +1241,7 @@ static inline bool is_drivetype_request(sal_uInt32 field_mask)
 }
 
 static oslFileError osl_get_drive_type(
-    const rtl::OUString& path, oslVolumeInfo* pInfo)
+    const OUString& path, oslVolumeInfo* pInfo)
 {
     // GetDriveType fails on empty volume mount points
     // see Knowledge Base Q244089
@@ -1295,7 +1295,7 @@ static inline bool is_volume_space_info_request(sal_uInt32 field_mask)
 }
 
 static void get_volume_space_information(
-    const rtl::OUString& path, oslVolumeInfo *pInfo)
+    const OUString& path, oslVolumeInfo *pInfo)
 {
     BOOL ret = GetDiskFreeSpaceExW(
         o3tl::toW(path.getStr()),
@@ -1322,7 +1322,7 @@ static inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
 }
 
 static oslFileError get_filesystem_attributes(
-    const rtl::OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
+    const OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
 {
     pInfo->uAttributes = 0;
 
@@ -1374,7 +1374,7 @@ static oslFileError get_filesystem_attributes(
     return osl_File_E_None;
 }
 
-static bool path_get_parent(rtl::OUString& path)
+static bool path_get_parent(OUString& path)
 {
     OSL_PRECOND(path.lastIndexOf(SLASH) == -1, "Path must not have slashes");
 
@@ -1383,16 +1383,16 @@ static bool path_get_parent(rtl::OUString& path)
         sal_Int32 i = path.lastIndexOf(BACKSLASH);
         if (-1 < i)
         {
-            path = rtl::OUString(path.getStr(), i);
+            path = OUString(path.getStr(), i);
             return true;
         }
     }
     return false;
 }
 
-static void path_travel_to_volume_root(const rtl::OUString& system_path, rtl::OUString& volume_root)
+static void path_travel_to_volume_root(const OUString& system_path, OUString& volume_root)
 {
-    rtl::OUString sys_path(system_path);
+    OUString sys_path(system_path);
 
     while(!is_volume_mount_point(sys_path) && path_get_parent(sys_path))
         /**/;
@@ -1407,13 +1407,13 @@ oslFileError SAL_CALL osl_getVolumeInformation(
     if (!pInfo)
         return osl_File_E_INVAL;
 
-    rtl::OUString system_path;
+    OUString system_path;
     oslFileError error = osl_getSystemPathFromFileURL_(ustrURL, &system_path.pData, false);
 
     if (osl_File_E_None != error)
         return error;
 
-    rtl::OUString volume_root;
+    OUString volume_root;
     path_travel_to_volume_root(system_path, volume_root);
 
     pInfo->uValidFields = 0;
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 82260c85ef07..f34b437fefd2 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -637,7 +637,7 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p
         strUTF8->length != strURL->length &&
         0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 )
         , "sal.osl"
-        ,"osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not encoded !!!");
+        ,"osl_getSystemPathFromFileURL: \"" << OUString(strURL) << "\" is not encoded !!!");
 
     bValidEncoded = osl_decodeURL_( strUTF8, &strDecodedURL );
 
@@ -734,7 +734,7 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p
         }
         else
           SAL_INFO_IF(nError, "sal.osl",
-              "osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not an absolute FileURL");
+              "osl_getSystemPathFromFileURL: \"" << OUString(strURL) << "\" is not an absolute FileURL");
 
     }
 
@@ -748,7 +748,7 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p
         rtl_uString_release( strTempPath );
 
     SAL_INFO_IF(nError, "sal.osl",
-        "osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not a FileURL");
+        "osl_getSystemPathFromFileURL: \"" << OUString(strURL) << "\" is not a FileURL");
 
     return nError;
 }
@@ -854,7 +854,7 @@ oslFileError osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** p
         rtl_uString_release( strTempURL );
 
     SAL_INFO_IF(nError, "sal.osl",
-        "osl_getFileURLFromSystemPath: \"" << rtl::OUString(strPath) << "\" is not a systemPath");
+        "osl_getFileURLFromSystemPath: \"" << OUString(strPath) << "\" is not a systemPath");
     return nError;
 }
 
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index 900888bd1544..abbc46f165d8 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -25,15 +25,15 @@
 #include <algorithm>
 #include <wchar.h>
 
-const rtl::OUString BACKSLASH ("\\");
-const rtl::OUString SLASH     ("/");
+const OUString BACKSLASH ("\\");
+const OUString SLASH     ("/");
 
 void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
 {
     OSL_PRECOND(ppustrPath && (nullptr != *ppustrPath),
                 "osl_systemPathEnsureSeparator: Invalid parameter");
 
-     rtl::OUString path(*ppustrPath);
+     OUString path(*ppustrPath);
     sal_Int32     i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
 
     if (i < (path.getLength()-1))
@@ -49,7 +49,7 @@ void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
 
 void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
 {
-    rtl::OUString path(*ppustrPath);
+    OUString path(*ppustrPath);
 
     if (!osl::systemPathIsLogicalDrivePattern(path))
     {
@@ -57,7 +57,7 @@ void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
 
         if (i > -1 && (i == (path.getLength() - 1)))
         {
-            path = rtl::OUString(path.getStr(), path.getLength() - 1);
+            path = OUString(path.getStr(), path.getLength() - 1);
             rtl_uString_assign(ppustrPath, path.pData);
         }
     }
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index 237c130f7fd8..bcb4f83af701 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -61,7 +61,7 @@ namespace osl
  drive alone
 */
 
-inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
+inline void systemPathEnsureSeparator(/*inout*/ OUString& Path)
 {
     osl_systemPathEnsureSeparator(&Path.pData);
 }
@@ -71,12 +71,12 @@ inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
  if the path is not the root path '\'
 */
 
-inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
+inline void systemPathRemoveSeparator(/*inout*/ OUString& Path)
 {
     osl_systemPathRemoveSeparator(&Path.pData);
 }
 
-inline bool systemPathIsLogicalDrivePattern(/*in*/ const rtl::OUString& path)
+inline bool systemPathIsLogicalDrivePattern(/*in*/ const OUString& path)
 {
     return osl_systemPathIsLogicalDrivePattern(path.pData);
 }
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index a2e4021f0f1f..d9cbaaa19617 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -45,7 +45,7 @@ namespace /* private */
        second one. */
     struct less_environment_variable
     {
-        bool operator() (const rtl::OUString& lhs, const rtl::OUString& rhs) const
+        bool operator() (const OUString& lhs, const OUString& rhs) const
         {
             OSL_ENSURE((lhs.indexOf(L'=') > -1) &&
                         (rhs.indexOf(L'=') > -1),
@@ -70,7 +70,7 @@ namespace /* private */
 
         sum_of_string_lengths() : sum_(0) {}
 
-        void operator() (const rtl::OUString& string)
+        void operator() (const OUString& string)
         {
             OSL_ASSERT(string.getLength());
 
@@ -128,7 +128,7 @@ namespace /* private */
 
         for (sal_uInt32 i = 0; i < env_vars_count; i++)
         {
-            rtl::OUString env_var = rtl::OUString(env_vars[i]);
+            OUString env_var = OUString(env_vars[i]);
 
             if (env_var.getLength() == 0)
                 return false;
@@ -236,9 +236,9 @@ namespace /* private */
 
     // Add a quote sign to the start and the end of a string
     // if not already present
-    rtl::OUString quote_string(const rtl::OUString& string)
+    OUString quote_string(const OUString& string)
     {
-        rtl::OUStringBuffer quoted;
+        OUStringBuffer quoted;
         if (string.indexOf(L'"') != 0)
             quoted.append('"');
 
@@ -256,9 +256,9 @@ namespace /* private */
     // may not have the file extension ".exe". However, if the file on disk has the
     // ".exe" extension, then the function will fail. In this case a second attempt
     // is started by adding the parameter "extension" to "path".
-    rtl::OUString getShortPath(rtl::OUString const & path, rtl::OUString const & extension)
+    OUString getShortPath(OUString const & path, OUString const & extension)
     {
-        rtl::OUString ret(path);
+        OUString ret(path);
         if (path.getLength() > 260)
         {
             std::vector<sal_Unicode> vec(path.getLength() + 1);
@@ -269,16 +269,16 @@ namespace /* private */
             if (!len && GetLastError() == ERROR_FILE_NOT_FOUND
                 && extension.getLength())
             {
-                const rtl::OUString extPath(path + extension);
+                const OUString extPath(path + extension);
                 std::vector<sal_Unicode> vec2(
                     extPath.getLength() + 1);
                 const DWORD len2 = GetShortPathNameW(
                     o3tl::toW(extPath.getStr()), o3tl::toW(&vec2[0]), extPath.getLength() + 1);
-                ret = rtl::OUString(&vec2[0], len2);
+                ret = OUString(&vec2[0], len2);
             }
             else
             {
-                ret = rtl::OUString(&vec[0], len);
+                ret = OUString(&vec[0], len);
             }
         }
         return ret;
@@ -288,26 +288,26 @@ namespace /* private */
     // be provided via the strImageName parameter or as first
     // element of the strArguments list.
     // The returned path will be quoted if it contains spaces.
-    rtl::OUString get_executable_path(
+    OUString get_executable_path(
         rtl_uString* image_name,
         rtl_uString* cmdline_args[],
         sal_uInt32 n_cmdline_args,
         bool search_path)
     {
-        rtl::OUString exe_name;
+        OUString exe_name;
 
         if (image_name)
             exe_name = image_name;
         else if (n_cmdline_args)
-            exe_name = rtl::OUString(cmdline_args[0]);
+            exe_name = OUString(cmdline_args[0]);
 
-        rtl::OUString exe_url = exe_name;
+        OUString exe_url = exe_name;
         if (search_path)
             osl_searchFileURL(exe_name.pData, nullptr, &exe_url.pData);
 
-        rtl::OUString exe_path;
+        OUString exe_path;
         if (osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL(exe_url, exe_path))
-            return rtl::OUString();
+            return OUString();
 
         exe_path = getShortPath(exe_path, ".exe");
 
@@ -317,27 +317,27 @@ namespace /* private */
         return exe_path;
     }
 
-    rtl::OUString get_file_extension(const rtl::OUString& file_name)
+    OUString get_file_extension(const OUString& file_name)
     {
         sal_Int32 index = file_name.lastIndexOf('.');
         if ((index != -1) && ((index + 1) < file_name.getLength()))
             return file_name.copy(index + 1);
 
-        return rtl::OUString();
+        return OUString();
     }
 
-    bool is_batch_file(const rtl::OUString& file_name)
+    bool is_batch_file(const OUString& file_name)
     {
-        rtl::OUString ext = get_file_extension(file_name);
+        OUString ext = get_file_extension(file_name);
         return (ext.equalsIgnoreAsciiCase("bat") ||
                 ext.equalsIgnoreAsciiCase("cmd") ||
                 ext.equalsIgnoreAsciiCase("btm"));
     }
 
-    const rtl::OUString ENV_COMSPEC ("COMSPEC");
-    rtl::OUString get_batch_processor()
+    const OUString ENV_COMSPEC ("COMSPEC");
+    OUString get_batch_processor()
     {
-        rtl::OUString comspec;
+        OUString comspec;
         osl_getEnvironment(ENV_COMSPEC.pData, &comspec.pData);
 
         OSL_ASSERT(comspec.getLength());
@@ -390,7 +390,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
     oslFileHandle *pProcessOutputRead,
     oslFileHandle *pProcessErrorRead)
 {
-    rtl::OUString exe_path = get_executable_path(
+    OUString exe_path = get_executable_path(
         ustrImageName, ustrArguments, nArguments, (Options & osl_Process_SEARCHPATH) != 0);
 
     if (0 == exe_path.getLength())
@@ -400,11 +400,11 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
         return osl_Process_E_InvalidError;
 
     DWORD flags = NORMAL_PRIORITY_CLASS;
-    rtl::OUStringBuffer command_line;
+    OUStringBuffer command_line;
 
     if (is_batch_file(exe_path))
     {
-        rtl::OUString batch_processor = get_batch_processor();
+        OUString batch_processor = get_batch_processor();
 
         if (batch_processor.getLength())
         {
@@ -430,7 +430,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
         command_line.append(" ");
 
         /* Quote arguments containing blanks */
-        if (rtl::OUString(ustrArguments[n]).indexOf(' ') != -1)
+        if (OUString(ustrArguments[n]).indexOf(' ') != -1)
             command_line.append(quote_string(ustrArguments[n]));
         else
             command_line.append(ustrArguments[n]);
@@ -449,7 +449,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
         p_environment = &environment[0];
     }
 
-    rtl::OUString cwd;
+    OUString cwd;
     if (ustrDirectory && ustrDirectory->length && (osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL(ustrDirectory, cwd)))
            return osl_Process_E_InvalidError;
 
@@ -510,7 +510,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
             startup_info.wShowWindow = SW_NORMAL;
     }
 
-    rtl::OUString cmdline = command_line.makeStringAndClear();
+    OUString cmdline = command_line.makeStringAndClear();
     PROCESS_INFORMATION process_info;
     BOOL bRet = FALSE;
 
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index b22854fcd6c4..a2111854850a 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -28,8 +28,6 @@
 #include <cppunit/plugin/TestPlugIn.h>
 #include <string.h>
 
-using ::rtl::OStringBuffer;
-using ::rtl::OString;
 // This file contains cppunit tests for the
 // OString and OStringBuffer classes
 
@@ -42,7 +40,7 @@ namespace rtl_OStringBuffer
 
         void ctor_001()
         {
-            ::rtl::OStringBuffer aStrBuf;
+            OStringBuffer aStrBuf;
             const sal_Char* pStr = aStrBuf.getStr();
 
             CPPUNIT_ASSERT_MESSAGE
@@ -64,14 +62,14 @@ namespace rtl_OStringBuffer
 
         void ctor_002()
         {
-            ::rtl::OString       aStrtmp( kTestStr1 );
-            ::rtl::OStringBuffer aStrBuftmp( aStrtmp );
-            ::rtl::OStringBuffer aStrBuf( aStrBuftmp );
+            OString       aStrtmp( kTestStr1 );
+            OStringBuffer aStrBuftmp( aStrtmp );
+            OStringBuffer aStrBuf( aStrBuftmp );
             // sal_Bool res = cmpstr(aStrBuftmp.getStr(),aStrBuf.getStr());
 
             sal_Int32 nLenStrBuftmp = aStrBuftmp.getLength();
 
-            rtl::OString sStr(aStrBuftmp.getStr());
+            OString sStr(aStrBuftmp.getStr());
             bool res = aStrtmp == sStr;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -94,8 +92,8 @@ namespace rtl_OStringBuffer
 
         void ctor_003()
         {
-            ::rtl::OStringBuffer aStrBuf1(kTestStr2Len);
-            ::rtl::OStringBuffer aStrBuf2(0);
+            OStringBuffer aStrBuf1(kTestStr2Len);
+            OStringBuffer aStrBuf2(0);
 
             const sal_Char* pStr1 = aStrBuf1.getStr();
             const sal_Char* pStr2 = aStrBuf2.getStr();
@@ -135,8 +133,8 @@ namespace rtl_OStringBuffer
 
         void ctor_004()
         {
-            ::rtl::OString aStrtmp( kTestStr1 );
-            ::rtl::OStringBuffer aStrBuf( aStrtmp );
+            OString aStrtmp( kTestStr1 );
+            OStringBuffer aStrBuf( aStrtmp );
             sal_Int32 leg = aStrBuf.getLength();
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -158,10 +156,10 @@ namespace rtl_OStringBuffer
         }
 
         void ctor_005() {
-            rtl::OStringBuffer b1;
+            OStringBuffer b1;
             auto dummy = b1.makeStringAndClear();
             (void)dummy;
-            rtl::OStringBuffer b2(b1);
+            OStringBuffer b2(b1);
             (void)b2;
         }
 
@@ -169,7 +167,7 @@ namespace rtl_OStringBuffer
         {
             //pass in a const char*, get a temp
             //OString
-            ::rtl::OStringBuffer aStrBuf(kTestStr1);
+            OStringBuffer aStrBuf(kTestStr1);
             sal_Int32 leg = aStrBuf.getLength();
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -212,8 +210,8 @@ namespace rtl_OStringBuffer
 
         void makeStringAndClear_001()
         {
-            ::rtl::OStringBuffer   aStrBuf1;
-            ::rtl::OString         aStr1;
+            OStringBuffer   aStrBuf1;
+            OString         aStr1;
 
             bool lastRes = (aStrBuf1.makeStringAndClear() ==  aStr1 );
 
@@ -237,8 +235,8 @@ namespace rtl_OStringBuffer
 
         void makeStringAndClear_002()
         {
-            ::rtl::OStringBuffer   aStrBuf2(26);
-            ::rtl::OString         aStr2;
+            OStringBuffer   aStrBuf2(26);
+            OString         aStr2;
 
             bool lastRes = (aStrBuf2.makeStringAndClear() == aStr2 );
 
@@ -253,8 +251,8 @@ namespace rtl_OStringBuffer
 
         void makeStringAndClear_003()
         {
-            ::rtl::OStringBuffer   aStrBuf3(arrOUS[0]);
-            ::rtl::OString        aStr3(arrOUS[0]);
+            OStringBuffer   aStrBuf3(arrOUS[0]);
+            OString        aStr3(arrOUS[0]);
 
             bool lastRes = (aStrBuf3.makeStringAndClear() == aStr3 );
 
@@ -269,8 +267,8 @@ namespace rtl_OStringBuffer
 
         void makeStringAndClear_004()
         {
-            ::rtl::OStringBuffer   aStrBuf4(arrOUS[1]);
-            ::rtl::OString         aStr4(arrOUS[1]);
+            OStringBuffer   aStrBuf4(arrOUS[1]);
+            OString         aStr4(arrOUS[1]);
 
             bool lastRes = (aStrBuf4.makeStringAndClear() ==  aStr4 );
 
@@ -284,8 +282,8 @@ namespace rtl_OStringBuffer
 
         void makeStringAndClear_005()
         {
-            ::rtl::OStringBuffer   aStrBuf5(arrOUS[2]);
-            ::rtl::OString         aStr5(arrOUS[2]);
+            OStringBuffer   aStrBuf5(arrOUS[2]);
+            OString         aStr5(arrOUS[2]);
 
             bool lastRes = (aStrBuf5.makeStringAndClear() ==  aStr5 );
 
@@ -299,8 +297,8 @@ namespace rtl_OStringBuffer
 
         void makeStringAndClear_006()
         {
-            ::rtl::OStringBuffer   aStrBuf6(arrOUS[3]);
-            ::rtl::OString         aStr6(arrOUS[3]);
+            OStringBuffer   aStrBuf6(arrOUS[3]);
+            OString         aStr6(arrOUS[3]);
 
             bool lastRes = (aStrBuf6.makeStringAndClear() == aStr6 );
 
@@ -314,8 +312,8 @@ namespace rtl_OStringBuffer
 
         void makeStringAndClear_007()
         {
-            ::rtl::OStringBuffer   aStrBuf7(arrOUS[4]);
-            ::rtl::OString         aStr7(arrOUS[4]);
+            OStringBuffer   aStrBuf7(arrOUS[4]);
+            OString         aStr7(arrOUS[4]);
 
             bool lastRes = (aStrBuf7.makeStringAndClear() == aStr7 );
 
@@ -329,8 +327,8 @@ namespace rtl_OStringBuffer
 
         void makeStringAndClear_008()
         {
-            ::rtl::OStringBuffer   aStrBuf8(arrOUS[5]);
-            ::rtl::OString         aStr8(arrOUS[5]);
+            OStringBuffer   aStrBuf8(arrOUS[5]);
+            OString         aStr8(arrOUS[5]);
 
             bool lastRes = (aStrBuf8.makeStringAndClear() == aStr8 );
 
@@ -359,7 +357,7 @@ namespace rtl_OStringBuffer
     public:
         void remove_001()
         {
-            ::rtl::OStringBuffer sb(
+            OStringBuffer sb(
                 RTL_CONSTASCII_STRINGPARAM("Red Hat, Inc."));
 
             sb.remove(0, 4);
@@ -409,7 +407,7 @@ namespace rtl_OStringBuffer
 
         void getLength_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             sal_Int32              expVal = kTestStr1Len;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -422,7 +420,7 @@ namespace rtl_OStringBuffer
 
         void getLength_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             sal_Int32              expVal = 1;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -434,7 +432,7 @@ namespace rtl_OStringBuffer
 
         void getLength_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             sal_Int32              expVal = 0;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -446,7 +444,7 @@ namespace rtl_OStringBuffer
 
         void getLength_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             sal_Int32              expVal = 0;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -458,7 +456,7 @@ namespace rtl_OStringBuffer
 
         void getLength_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             sal_Int32              expVal = 1;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -470,7 +468,7 @@ namespace rtl_OStringBuffer
 
         void getLength_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[5] );
+            OStringBuffer   aStrBuf( arrOUS[5] );
             sal_Int32              expVal = kTestStr2Len;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -482,7 +480,7 @@ namespace rtl_OStringBuffer
 
         void getLength_007()
         {
-            ::rtl::OStringBuffer   aStrBuf;
+            OStringBuffer   aStrBuf;
             sal_Int32              expVal = 0;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -494,7 +492,7 @@ namespace rtl_OStringBuffer
 
         void getLength_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( 26 );
+            OStringBuffer   aStrBuf( 26 );
             sal_Int32               expVal   = 0;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -534,7 +532,7 @@ namespace rtl_OStringBuffer
 
         void getCapacity_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             sal_Int32              expVal = kTestStr1Len+16;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -547,7 +545,7 @@ namespace rtl_OStringBuffer
 
         void getCapacity_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             sal_Int32              expVal = 1+16;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -559,7 +557,7 @@ namespace rtl_OStringBuffer
 
         void getCapacity_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             sal_Int32              expVal = 0+16;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -571,7 +569,7 @@ namespace rtl_OStringBuffer
 
         void getCapacity_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             sal_Int32              expVal = 0+16;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -583,7 +581,7 @@ namespace rtl_OStringBuffer
 
         void getCapacity_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             sal_Int32              expVal = 1+16;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -595,7 +593,7 @@ namespace rtl_OStringBuffer
 
         void getCapacity_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[5] );
+            OStringBuffer   aStrBuf( arrOUS[5] );
             sal_Int32              expVal = kTestStr2Len+16;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -607,7 +605,7 @@ namespace rtl_OStringBuffer
 
         void getCapacity_007()
         {
-            ::rtl::OStringBuffer   aStrBuf;
+            OStringBuffer   aStrBuf;
             sal_Int32              expVal = 16;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -619,7 +617,7 @@ namespace rtl_OStringBuffer
 
         void getCapacity_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( 16 );
+            OStringBuffer   aStrBuf( 16 );
             sal_Int32              expVal = 16;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -631,7 +629,7 @@ namespace rtl_OStringBuffer
 
         void getCapacity_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( 6 );
+            OStringBuffer   aStrBuf( 6 );
             sal_Int32              expVal = 6;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -643,7 +641,7 @@ namespace rtl_OStringBuffer
 
         void getCapacity_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( 0 );
+            OStringBuffer   aStrBuf( 0 );
             sal_Int32              expVal = 0;
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -672,7 +670,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_001()
         {
             sal_Int32          expVal = 16;
-            ::rtl::OStringBuffer   aStrBuf;
+            OStringBuffer   aStrBuf;
             sal_Int32              input = 5;
 
             aStrBuf.ensureCapacity( input );
@@ -688,7 +686,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_002()
         {
             sal_Int32          expVal = 16;
-            ::rtl::OStringBuffer   aStrBuf;
+            OStringBuffer   aStrBuf;
             sal_Int32              input = -5;
 
             aStrBuf.ensureCapacity( input );
@@ -704,7 +702,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_003()
         {
             sal_Int32          expVal = 16;
-            ::rtl::OStringBuffer   aStrBuf;
+            OStringBuffer   aStrBuf;
             sal_Int32              input = 0;
 
             aStrBuf.ensureCapacity( input );
@@ -720,7 +718,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_004()           //the testcase is based on comments
         {
             sal_Int32          expVal = 20;
-            ::rtl::OStringBuffer   aStrBuf;
+            OStringBuffer   aStrBuf;
             sal_Int32              input = 20;
 
             aStrBuf.ensureCapacity( input );
@@ -736,7 +734,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_005()
         {
             sal_Int32          expVal = 50;
-            ::rtl::OStringBuffer   aStrBuf;
+            OStringBuffer   aStrBuf;
             sal_Int32              input = 50;
 
             aStrBuf.ensureCapacity( input );
@@ -752,7 +750,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_006()
         {
             sal_Int32          expVal = 20;
-            ::rtl::OStringBuffer   aStrBuf( 6 );
+            OStringBuffer   aStrBuf( 6 );
             sal_Int32              input = 20;
 
             aStrBuf.ensureCapacity( input );
@@ -768,7 +766,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_007()
         {
             sal_Int32          expVal = 6;
-            ::rtl::OStringBuffer   aStrBuf( 6 );
+            OStringBuffer   aStrBuf( 6 );
             sal_Int32              input = 2;
 
             aStrBuf.ensureCapacity( input );
@@ -784,7 +782,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_008()
         {
             sal_Int32          expVal = 6;
-            ::rtl::OStringBuffer   aStrBuf( 6 );
+            OStringBuffer   aStrBuf( 6 );
             sal_Int32              input = -6;
 
             aStrBuf.ensureCapacity( input );
@@ -800,7 +798,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_009()      //the testcase is based on comments
         {
             sal_Int32          expVal = 10;
-            ::rtl::OStringBuffer   aStrBuf( 6 );
+            OStringBuffer   aStrBuf( 6 );
             sal_Int32              input = 10;
 
             aStrBuf.ensureCapacity( input );
@@ -816,7 +814,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_010()
         {
             sal_Int32          expVal = 6;
-            ::rtl::OStringBuffer   aStrBuf( 0 );
+            OStringBuffer   aStrBuf( 0 );
             sal_Int32              input = 6;
 
             aStrBuf.ensureCapacity( input );
@@ -832,7 +830,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_011()       //the testcase is based on comments
         {
             sal_Int32          expVal = 2;  // capacity is x = (str->length + 1) * 2; minimum < x ? x : minimum
-            ::rtl::OStringBuffer   aStrBuf( 0 );
+            OStringBuffer   aStrBuf( 0 );
             sal_Int32              input = 1;
 
             aStrBuf.ensureCapacity( input );
@@ -848,7 +846,7 @@ namespace rtl_OStringBuffer
         void ensureCapacity_012()
         {
             sal_Int32          expVal = 0;
-            ::rtl::OStringBuffer   aStrBuf( 0 );
+            OStringBuffer   aStrBuf( 0 );
             sal_Int32              input = -1;
 
             aStrBuf.ensureCapacity( input );
@@ -895,9 +893,9 @@ namespace rtl_OStringBuffer
 
         void setLength_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             sal_Int32              expVal1 = 50;
-            ::rtl::OString         expVal2( kTestStr1 );
+            OString         expVal2( kTestStr1 );
             sal_Int32              expVal3 = 50;
             sal_Int32              input   = 50;
 
@@ -915,9 +913,9 @@ namespace rtl_OStringBuffer
 
         void setLength_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             sal_Int32              expVal1 = kTestStr13Len;
-            ::rtl::OString         expVal2( kTestStr1 );
+            OString         expVal2( kTestStr1 );
             sal_Int32              expVal3 = 32;
             sal_Int32              input   = kTestStr13Len;
 
@@ -935,9 +933,9 @@ namespace rtl_OStringBuffer
 
         void setLength_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             sal_Int32              expVal1 = kTestStr1Len;
-            ::rtl::OString         expVal2( kTestStr1 );
+            OString         expVal2( kTestStr1 );
             sal_Int32              expVal3 = 32;
             sal_Int32              input   = kTestStr1Len;
 
@@ -955,9 +953,9 @@ namespace rtl_OStringBuffer
 
         void setLength_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             sal_Int32              expVal1 = kTestStr7Len;
-            ::rtl::OString         expVal2( kTestStr7 );
+            OString         expVal2( kTestStr7 );
             sal_Int32              expVal3 = 32;
             sal_Int32              input   = kTestStr7Len;
 
@@ -975,9 +973,9 @@ namespace rtl_OStringBuffer
 
         void setLength_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             sal_Int32              expVal1 = 0;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 32;
             sal_Int32              input   = 0;
 
@@ -995,9 +993,9 @@ namespace rtl_OStringBuffer
 
         void setLength_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             sal_Int32              expVal1 = 25;
-            ::rtl::OString         expVal2( arrOUS[1] );
+            OString         expVal2( arrOUS[1] );
             sal_Int32              expVal3 = 25;
             sal_Int32              input   = 25;
 
@@ -1015,9 +1013,9 @@ namespace rtl_OStringBuffer
 
         void setLength_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             sal_Int32              expVal1 = kTestStr27Len;
-            ::rtl::OString         expVal2( arrOUS[1] );
+            OString         expVal2( arrOUS[1] );
             sal_Int32              expVal3 = 17;
             sal_Int32              input   = kTestStr27Len;
 
@@ -1035,9 +1033,9 @@ namespace rtl_OStringBuffer
 
         void setLength_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             sal_Int32              expVal1 = 0;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 17;
             sal_Int32              input   = 0;
 
@@ -1055,9 +1053,9 @@ namespace rtl_OStringBuffer
 
         void setLength_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             sal_Int32              expVal1 = 20;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 20;
             sal_Int32              input   = 20;
 
@@ -1075,9 +1073,9 @@ namespace rtl_OStringBuffer
 
         void setLength_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             sal_Int32              expVal1 = 3;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 16;
             sal_Int32              input   = 3;
 
@@ -1095,9 +1093,9 @@ namespace rtl_OStringBuffer
 
         void setLength_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             sal_Int32              expVal1 = 0;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 16;
             sal_Int32              input   = 0;
 
@@ -1115,9 +1113,9 @@ namespace rtl_OStringBuffer
 
         void setLength_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             sal_Int32              expVal1 = 20;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 20;
             sal_Int32              input   = 20;
 
@@ -1135,9 +1133,9 @@ namespace rtl_OStringBuffer
 
         void setLength_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             sal_Int32              expVal1 = 5;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 16;
             sal_Int32              input   = 5;
 
@@ -1155,9 +1153,9 @@ namespace rtl_OStringBuffer
 
         void setLength_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             sal_Int32              expVal1 = 0;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 16;
             sal_Int32              input   = 0;
 
@@ -1175,9 +1173,9 @@ namespace rtl_OStringBuffer
 
         void setLength_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             sal_Int32              expVal1 = 20;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 20;
             sal_Int32              input   = 20;
 
@@ -1195,9 +1193,9 @@ namespace rtl_OStringBuffer
 
         void setLength_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             sal_Int32              expVal1 = 5;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 17;
             sal_Int32              input   = 5;
 
@@ -1215,9 +1213,9 @@ namespace rtl_OStringBuffer
 
         void setLength_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             sal_Int32              expVal1 = 0;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 17;
             sal_Int32              input   = 0;
 
@@ -1235,9 +1233,9 @@ namespace rtl_OStringBuffer
 
         void setLength_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[5] );
+            OStringBuffer   aStrBuf( arrOUS[5] );
             sal_Int32              expVal1 = 50;
-            ::rtl::OString         expVal2( kTestStr2 );
+            OString         expVal2( kTestStr2 );
             sal_Int32              expVal3 = 66;
             sal_Int32              input   = 50;
 
@@ -1255,9 +1253,9 @@ namespace rtl_OStringBuffer
 
         void setLength_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[5] );
+            OStringBuffer   aStrBuf( arrOUS[5] );
             sal_Int32              expVal1 = 40;
-            ::rtl::OString         expVal2(kTestStr2);
+            OString         expVal2(kTestStr2);
             sal_Int32              expVal3 = 48;
             sal_Int32              input   = 40;
 
@@ -1275,9 +1273,9 @@ namespace rtl_OStringBuffer
 
         void setLength_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[5] );
+            OStringBuffer   aStrBuf( arrOUS[5] );
             sal_Int32              expVal1 = kTestStr2Len;
-            ::rtl::OString         expVal2(kTestStr2);
+            OString         expVal2(kTestStr2);
             sal_Int32              expVal3 = 48;
             sal_Int32              input   = kTestStr2Len;
 
@@ -1295,9 +1293,9 @@ namespace rtl_OStringBuffer
 
         void setLength_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[5] );
+            OStringBuffer   aStrBuf( arrOUS[5] );
             sal_Int32              expVal1 = kTestStr7Len;
-            ::rtl::OString         expVal2(kTestStr7);
+            OString         expVal2(kTestStr7);
             sal_Int32              expVal3 = 48;
             sal_Int32              input   = kTestStr7Len;
 
@@ -1315,9 +1313,9 @@ namespace rtl_OStringBuffer
 
         void setLength_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[5] );
+            OStringBuffer   aStrBuf( arrOUS[5] );
             sal_Int32              expVal1 = 0;
-            ::rtl::OString         expVal2;
+            OString         expVal2;
             sal_Int32              expVal3 = 48;
             sal_Int32              input   = 0;
 
@@ -1364,7 +1362,7 @@ namespace rtl_OStringBuffer
         void csuc_001()
         {
             const sal_Char*        expVal = kTestStr1;
-            ::rtl::OStringBuffer   aStrBuf( kTestStr1 );
+            OStringBuffer   aStrBuf( kTestStr1 );
             sal_Int32              cmpLen = kTestStr1Len;
 
             // LLA: wrong access! const sal_Char* pstr = *&aStrBuf;
@@ -1382,7 +1380,7 @@ namespace rtl_OStringBuffer
 
         void csuc_002()
         {
-            ::rtl::OStringBuffer   aStrBuf;
+            OStringBuffer   aStrBuf;
 
             // LLA: wrong access! const sal_Char* pstr = *&aStrBuf;
             const sal_Char* pstr = aStrBuf.getStr();
@@ -1408,7 +1406,7 @@ namespace rtl_OStringBuffer
         void getStr_001()
         {
             const sal_Char*        expVal = kTestStr1;
-            ::rtl::OStringBuffer   aStrBuf( kTestStr1 );
+            OStringBuffer   aStrBuf( kTestStr1 );
             sal_Int32              cmpLen = kTestStr1Len;
 
             const sal_Char* pstr = aStrBuf.getStr();
@@ -1424,7 +1422,7 @@ namespace rtl_OStringBuffer
 
         void getStr_002()
         {
-            ::rtl::OStringBuffer   aStrBuf;
+            OStringBuffer   aStrBuf;
             const sal_Char* pstr = aStrBuf.getStr();
             CPPUNIT_ASSERT_MESSAGE
             (
@@ -1459,7 +1457,7 @@ namespace rtl_OStringBuffer
         void append_001_001()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                input2( kTestStr8 );
 
             aStrBuf.append( input2 );
@@ -1475,7 +1473,7 @@ namespace rtl_OStringBuffer
         void append_001_002()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                input2( kTestStr36 );
 
             aStrBuf.append( input2 );
@@ -1492,7 +1490,7 @@ namespace rtl_OStringBuffer
         void append_001_003()
         {
             OString                expVal( kTestStr37 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                input2( kTestStr23 );
 
             aStrBuf.append( input2 );
@@ -1509,7 +1507,7 @@ namespace rtl_OStringBuffer
         void append_001_004()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                input2;
 
             aStrBuf.append( input2 );
@@ -1526,7 +1524,7 @@ namespace rtl_OStringBuffer
         void append_001_005()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                input2( kTestStr7 );
 
             aStrBuf.append( input2 );
@@ -1543,7 +1541,7 @@ namespace rtl_OStringBuffer
         void append_001_006()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                input2( kTestStr2 );
 
             aStrBuf.append( input2 );
@@ -1560,7 +1558,7 @@ namespace rtl_OStringBuffer
         void append_001_007()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                input2( kTestStr1 );
 
             aStrBuf.append( input2 );
@@ -1577,7 +1575,7 @@ namespace rtl_OStringBuffer
         void append_001_008()
         {
             OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                input2;
 
             aStrBuf.append( input2 );
@@ -1594,7 +1592,7 @@ namespace rtl_OStringBuffer
         void append_001_009()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                input2( kTestStr7 );
 
             aStrBuf.append( input2 );
@@ -1611,7 +1609,7 @@ namespace rtl_OStringBuffer
         void append_001_010()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                input2( kTestStr2 );
 
             aStrBuf.append( input2 );
@@ -1628,7 +1626,7 @@ namespace rtl_OStringBuffer
         void append_001_011()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                input2( kTestStr1 );
 
             aStrBuf.append( input2 );
@@ -1645,7 +1643,7 @@ namespace rtl_OStringBuffer
         void append_001_012()
         {
             OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                input2;
 
             aStrBuf.append( input2 );
@@ -1662,7 +1660,7 @@ namespace rtl_OStringBuffer
         void append_001_013()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                input2( kTestStr7 );
 
             aStrBuf.append( input2 );
@@ -1679,7 +1677,7 @@ namespace rtl_OStringBuffer
         void append_001_014()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                input2( kTestStr2 );
 
             aStrBuf.append( input2 );
@@ -1696,7 +1694,7 @@ namespace rtl_OStringBuffer
         void append_001_015()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                input2( kTestStr1 );
 
             aStrBuf.append( input2 );
@@ -1713,7 +1711,7 @@ namespace rtl_OStringBuffer
         void append_001_016()
         {
             OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                input2;
 
             aStrBuf.append( input2 );
@@ -1730,7 +1728,7 @@ namespace rtl_OStringBuffer
         void append_001_017()
         {
             OString                expVal( kTestStr29 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                input2( kTestStr38 );
 
             aStrBuf.append( input2 );
@@ -1747,7 +1745,7 @@ namespace rtl_OStringBuffer
         void append_001_018()
         {
             OString                expVal( kTestStr39 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                input2( kTestStr17 );
 
             aStrBuf.append( input2 );
@@ -1764,7 +1762,7 @@ namespace rtl_OStringBuffer
         void append_001_019()
         {
             OString                expVal( kTestStr40 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                input2( kTestStr31 );
 
             aStrBuf.append( input2 );
@@ -1781,7 +1779,7 @@ namespace rtl_OStringBuffer
         void append_001_020()
         {
             OString                expVal( kTestStr28 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                input2;
 
             aStrBuf.append( input2 );
@@ -1797,7 +1795,7 @@ namespace rtl_OStringBuffer
 
         void append_null()
         {
-            ::rtl::OStringBuffer   aStrBuf("hello world");
+            OStringBuffer   aStrBuf("hello world");
 
             aStrBuf.append('\0');
             aStrBuf.append('\1');
@@ -1860,7 +1858,7 @@ namespace rtl_OStringBuffer
         void append_002_001()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             const sal_Char*        input = kTestStr8;
 
             aStrBuf.append( input );
@@ -1876,7 +1874,7 @@ namespace rtl_OStringBuffer
         void append_002_002()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             const sal_Char*        input = kTestStr36;
 
             aStrBuf.append( input );
@@ -1892,7 +1890,7 @@ namespace rtl_OStringBuffer
         void append_002_003()
         {
             OString                expVal( kTestStr37 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             const sal_Char*        input = kTestStr23;
 
             aStrBuf.append( input );
@@ -1908,7 +1906,7 @@ namespace rtl_OStringBuffer
         void append_002_004()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             const sal_Char*        input = kTestStr25;
 
             aStrBuf.append( input );
@@ -1924,7 +1922,7 @@ namespace rtl_OStringBuffer
         void append_002_005()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             const sal_Char*        input = kTestStr7;
 
             aStrBuf.append( input );
@@ -1940,7 +1938,7 @@ namespace rtl_OStringBuffer
         void append_002_006()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             const sal_Char*        input = kTestStr2;
 
             aStrBuf.append( input );
@@ -1956,7 +1954,7 @@ namespace rtl_OStringBuffer
         void append_002_007()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             const sal_Char*        input = kTestStr1;
 
             aStrBuf.append( input );
@@ -1972,7 +1970,7 @@ namespace rtl_OStringBuffer
         void append_002_008()
         {
             OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             const sal_Char*        input = kTestStr25;
 
             aStrBuf.append( input );
@@ -1988,7 +1986,7 @@ namespace rtl_OStringBuffer
         void append_002_009()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             const sal_Char*        input = kTestStr7;
 
             aStrBuf.append( input );
@@ -2004,7 +2002,7 @@ namespace rtl_OStringBuffer
         void append_002_010()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             const sal_Char*        input = kTestStr2;
 
             aStrBuf.append( input );
@@ -2020,7 +2018,7 @@ namespace rtl_OStringBuffer
         void append_002_011()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             const sal_Char*        input = kTestStr1;
 
             aStrBuf.append( input );
@@ -2036,7 +2034,7 @@ namespace rtl_OStringBuffer
         void append_002_012()
         {
             OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             const sal_Char*        input = kTestStr25;
 
             aStrBuf.append( input );
@@ -2052,7 +2050,7 @@ namespace rtl_OStringBuffer
         void append_002_013()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             const sal_Char*        input = kTestStr7;
 
             aStrBuf.append( input );
@@ -2068,7 +2066,7 @@ namespace rtl_OStringBuffer
         void append_002_014()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             const sal_Char*        input = kTestStr2;
 
             aStrBuf.append( input );
@@ -2084,7 +2082,7 @@ namespace rtl_OStringBuffer
         void append_002_015()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             const sal_Char*        input = kTestStr1;
 
             aStrBuf.append( input );
@@ -2100,7 +2098,7 @@ namespace rtl_OStringBuffer
         void append_002_016()
         {
             OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             const sal_Char*        input = kTestStr25;
 
             aStrBuf.append( input );
@@ -2116,7 +2114,7 @@ namespace rtl_OStringBuffer
         void append_002_017()
         {
             OString                expVal( kTestStr29 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             const sal_Char*        input = kTestStr38;
 
             aStrBuf.append( input );
@@ -2132,7 +2130,7 @@ namespace rtl_OStringBuffer
         void append_002_018()
         {
             OString                expVal( kTestStr39 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             const sal_Char*        input = kTestStr17;
 
             aStrBuf.append( input );
@@ -2148,7 +2146,7 @@ namespace rtl_OStringBuffer
         void append_002_019()
         {
             OString                expVal( kTestStr40 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             const sal_Char*        input = kTestStr31;
 
             aStrBuf.append( input );
@@ -2164,7 +2162,7 @@ namespace rtl_OStringBuffer
         void append_002_020()
         {
             OString                expVal( kTestStr28 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             const sal_Char*        input = kTestStr25;
 
             aStrBuf.append( input );
@@ -2181,7 +2179,7 @@ namespace rtl_OStringBuffer
         void append_002_021()
         {
             OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             const sal_Char*        input = kTestStr25;
 
             aStrBuf.append( input );
@@ -2240,7 +2238,7 @@ namespace rtl_OStringBuffer
         void append_003_001()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             const sal_Char*        input1 = kTestStr36;
             sal_Int32              input2 = 12;
 
@@ -2257,7 +2255,7 @@ namespace rtl_OStringBuffer
         void append_003_002()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             const sal_Char*        input1 = kTestStr36;
             sal_Int32              input2 = 28;
 
@@ -2274,7 +2272,7 @@ namespace rtl_OStringBuffer
         void append_003_003()
         {
             OString                expVal( kTestStr37 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             const sal_Char*        input1 = kTestStr23;
             sal_Int32              input2 = 16;
 
@@ -2291,7 +2289,7 @@ namespace rtl_OStringBuffer
         void append_003_004()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 0;
 
@@ -2308,7 +2306,7 @@ namespace rtl_OStringBuffer
         void append_003_006()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 4;
 
@@ -2325,7 +2323,7 @@ namespace rtl_OStringBuffer
         void append_003_007()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 32;
 
@@ -2342,7 +2340,7 @@ namespace rtl_OStringBuffer
         void append_003_008()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 16;
 
@@ -2359,7 +2357,7 @@ namespace rtl_OStringBuffer
         void append_003_009()
         {
             OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 0;
 
@@ -2376,7 +2374,7 @@ namespace rtl_OStringBuffer
         void append_003_011()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 4;
 
@@ -2393,7 +2391,7 @@ namespace rtl_OStringBuffer
         void append_003_012()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 32;
 
@@ -2410,7 +2408,7 @@ namespace rtl_OStringBuffer
         void append_003_013()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 16;
 
@@ -2427,7 +2425,7 @@ namespace rtl_OStringBuffer
         void append_003_014()
         {
             OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 0;
 
@@ -2444,7 +2442,7 @@ namespace rtl_OStringBuffer
         void append_003_016()
         {
             OString                expVal( kTestStr7 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 4;
 
@@ -2461,7 +2459,7 @@ namespace rtl_OStringBuffer
         void append_003_017()
         {
             OString                expVal( kTestStr2 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 32;
 
@@ -2478,7 +2476,7 @@ namespace rtl_OStringBuffer
         void append_003_018()
         {
             OString                expVal( kTestStr1 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 16;
 
@@ -2495,7 +2493,7 @@ namespace rtl_OStringBuffer
         void append_003_019()
         {
             OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 0;
 
@@ -2512,7 +2510,7 @@ namespace rtl_OStringBuffer
         void append_003_021()
         {
             OString                expVal( kTestStr29 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             const sal_Char*        input1 = kTestStr38;
             sal_Int32              input2 = 7;
 
@@ -2529,7 +2527,7 @@ namespace rtl_OStringBuffer
         void append_003_022()
         {
             OString                expVal( kTestStr39 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             const sal_Char*        input1 = kTestStr17;
             sal_Int32              input2 = 22;
 
@@ -2546,7 +2544,7 @@ namespace rtl_OStringBuffer
         void append_003_023()
         {
             OString                expVal( kTestStr40 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             const sal_Char*        input1 = kTestStr31;
             sal_Int32              input2 = 16;
 
@@ -2563,7 +2561,7 @@ namespace rtl_OStringBuffer
         void append_003_024()
         {
             OString                expVal( kTestStr28 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             const sal_Char*        input1 = kTestStr2;
             sal_Int32              input2 = 0;
 
@@ -2619,7 +2617,7 @@ namespace rtl_OStringBuffer
         void append_004_001()
         {
             OString                expVal( kTestStr45 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             bool               input = true;
 
             aStrBuf.append( input );
@@ -2635,7 +2633,7 @@ namespace rtl_OStringBuffer
         void append_004_002()
         {
             OString                expVal( kTestStr46 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             bool               input = false;
 
             aStrBuf.append( input );
@@ -2651,7 +2649,7 @@ namespace rtl_OStringBuffer
         void append_004_003()
         {
             OString                expVal( kTestStr47 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             bool               input = true;
 
             aStrBuf.append( input );
@@ -2667,7 +2665,7 @@ namespace rtl_OStringBuffer
         void append_004_004()
         {
             OString                expVal( kTestStr48 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             bool               input = false;
 
             aStrBuf.append( input );
@@ -2683,7 +2681,7 @@ namespace rtl_OStringBuffer
         void append_004_005()
         {
             OString                expVal( kTestStr47 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             bool               input = true;
 
             aStrBuf.append( input );
@@ -2699,7 +2697,7 @@ namespace rtl_OStringBuffer
         void append_004_006()
         {
             OString                expVal( kTestStr48 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             bool               input = false;
 
             aStrBuf.append( input );
@@ -2715,7 +2713,7 @@ namespace rtl_OStringBuffer
         void append_004_007()
         {
             OString                expVal( kTestStr47 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             bool               input = true;
 
             aStrBuf.append( input );
@@ -2731,7 +2729,7 @@ namespace rtl_OStringBuffer
         void append_004_008()
         {
             OString                expVal( kTestStr48 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             bool               input = false;
 
             aStrBuf.append( input );
@@ -2747,7 +2745,7 @@ namespace rtl_OStringBuffer
         void append_004_009()
         {
             OString                expVal( kTestStr49 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             bool               input = true;
 
             aStrBuf.append( input );
@@ -2763,7 +2761,7 @@ namespace rtl_OStringBuffer
         void append_004_010()
         {
             OString                expVal( kTestStr50 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             bool               input = false;
 
             aStrBuf.append( input );
@@ -2780,7 +2778,7 @@ namespace rtl_OStringBuffer
         void append_004_011()
         {
             OString                expVal( kTestStr47 );
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             sal_Bool               input = sal_True;
 
             aStrBuf.append( input );
@@ -2796,7 +2794,7 @@ namespace rtl_OStringBuffer
         void append_004_012()
         {
             OString                expVal( kTestStr48 );
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             sal_Bool               input = sal_False;
 
             aStrBuf.append( input );
@@ -2848,7 +2846,7 @@ namespace rtl_OStringBuffer
         void append_001()
         {
             OString                expVal( kTestStr51 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             sal_Char               input = 'M';
 
             aStrBuf.append( input );
@@ -2864,7 +2862,7 @@ namespace rtl_OStringBuffer
         void append_002()
         {
             OString                expVal( kTestStr143 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             sal_Char               input = static_cast<sal_Char>(SAL_MAX_UINT8);
 
             aStrBuf.append( input );
@@ -2880,7 +2878,7 @@ namespace rtl_OStringBuffer
         void append_003()
         {
             OString                expVal( kTestStr27 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             sal_Char               input = 's';
 
             aStrBuf.append( input );
@@ -2896,7 +2894,7 @@ namespace rtl_OStringBuffer
         void append_004()
         {
             OString                expVal( kTestStr144 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             sal_Char               input = static_cast<sal_Char>(SAL_MAX_UINT8);
 
             aStrBuf.append( input );
@@ -2912,7 +2910,7 @@ namespace rtl_OStringBuffer
         void append_005_005()
         {
             OString                expVal( kTestStr27 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             sal_Char               input = 's';
 
             aStrBuf.append( input );
@@ -2928,7 +2926,7 @@ namespace rtl_OStringBuffer
         void append_006()
         {
             OString                expVal( kTestStr144 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             sal_Char               input = static_cast<sal_Char>(SAL_MAX_UINT8);
 
             aStrBuf.append( input );
@@ -2944,7 +2942,7 @@ namespace rtl_OStringBuffer
         void append_007()
         {
             OString                expVal( kTestStr27 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             sal_Char               input = 's';
 
             aStrBuf.append( input );
@@ -2960,7 +2958,7 @@ namespace rtl_OStringBuffer
         void append_008()
         {
             OString                expVal( kTestStr144 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             sal_Char               input = static_cast<sal_Char>(SAL_MAX_UINT8);
 
             aStrBuf.append( input );
@@ -2976,7 +2974,7 @@ namespace rtl_OStringBuffer
         void append_009()
         {
             OString                expVal( kTestStr56 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             sal_Char               input = 's';
 
             aStrBuf.append( input );
@@ -2992,7 +2990,7 @@ namespace rtl_OStringBuffer
         void append_010()
         {
             OString                expVal( kTestStr145 );
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             sal_Char               input = static_cast<sal_Char>(SAL_MAX_UINT8);
 
             aStrBuf.append( input );
@@ -3009,7 +3007,7 @@ namespace rtl_OStringBuffer
         void append_011()
         {
             OString                expVal( kTestStr27 );
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             sal_Char               input = 's';
 
             aStrBuf.append( input );
@@ -3025,7 +3023,7 @@ namespace rtl_OStringBuffer
         void append_012()
         {
             OString                expVal( kTestStr144 );
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             sal_Char               input = static_cast<sal_Char>(SAL_MAX_UINT8);
 
             aStrBuf.append( input );
@@ -3074,7 +3072,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 2;
@@ -3093,7 +3091,7 @@ namespace rtl_OStringBuffer
 
         void append_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 2;
@@ -3112,7 +3110,7 @@ namespace rtl_OStringBuffer
 
         void append_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 2;
@@ -3131,7 +3129,7 @@ namespace rtl_OStringBuffer
 
         void append_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 2;
@@ -3150,7 +3148,7 @@ namespace rtl_OStringBuffer
 
         void append_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 8;
@@ -3169,7 +3167,7 @@ namespace rtl_OStringBuffer
 
         void append_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 8;
@@ -3188,7 +3186,7 @@ namespace rtl_OStringBuffer
 
         void append_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 8;
@@ -3207,7 +3205,7 @@ namespace rtl_OStringBuffer
 
         void append_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 8;
@@ -3226,7 +3224,7 @@ namespace rtl_OStringBuffer
 
         void append_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 10;
@@ -3245,7 +3243,7 @@ namespace rtl_OStringBuffer
 
         void append_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 10;
@@ -3264,7 +3262,7 @@ namespace rtl_OStringBuffer
 
         void append_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 10;
@@ -3283,7 +3281,7 @@ namespace rtl_OStringBuffer
 
         void append_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 10;
@@ -3302,7 +3300,7 @@ namespace rtl_OStringBuffer
 
         void append_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 16;
@@ -3321,7 +3319,7 @@ namespace rtl_OStringBuffer
 
         void append_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 16;
@@ -3340,7 +3338,7 @@ namespace rtl_OStringBuffer
 
         void append_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 16;
@@ -3359,7 +3357,7 @@ namespace rtl_OStringBuffer
 
         void append_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 16;
@@ -3378,7 +3376,7 @@ namespace rtl_OStringBuffer
 
         void append_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 36;
@@ -3397,7 +3395,7 @@ namespace rtl_OStringBuffer
 
         void append_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 36;
@@ -3416,7 +3414,7 @@ namespace rtl_OStringBuffer
 
         void append_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 36;
@@ -3435,7 +3433,7 @@ namespace rtl_OStringBuffer
 
         void append_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 35;
             sal_Int16              radix = 36;
@@ -3454,7 +3452,7 @@ namespace rtl_OStringBuffer
 
         void append_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 2;
@@ -3473,7 +3471,7 @@ namespace rtl_OStringBuffer
 
         void append_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 2;
@@ -3492,7 +3490,7 @@ namespace rtl_OStringBuffer
 
         void append_023()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 2;
@@ -3511,7 +3509,7 @@ namespace rtl_OStringBuffer
 
         void append_024()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 2;
@@ -3530,7 +3528,7 @@ namespace rtl_OStringBuffer
 
         void append_025()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 8;
@@ -3549,7 +3547,7 @@ namespace rtl_OStringBuffer
 
         void append_026()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 8;
@@ -3568,7 +3566,7 @@ namespace rtl_OStringBuffer
 
         void append_027()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 8;
@@ -3587,7 +3585,7 @@ namespace rtl_OStringBuffer
 
         void append_028()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 8;
@@ -3606,7 +3604,7 @@ namespace rtl_OStringBuffer
 
         void append_029()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 10;
@@ -3625,7 +3623,7 @@ namespace rtl_OStringBuffer
 
         void append_030()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 10;
@@ -3644,7 +3642,7 @@ namespace rtl_OStringBuffer
 
         void append_031()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 10;
@@ -3663,7 +3661,7 @@ namespace rtl_OStringBuffer
 
         void append_032()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 10;
@@ -3682,7 +3680,7 @@ namespace rtl_OStringBuffer
 
         void append_033()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 16;
@@ -3701,7 +3699,7 @@ namespace rtl_OStringBuffer
 
         void append_034()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 16;
@@ -3720,7 +3718,7 @@ namespace rtl_OStringBuffer
 
         void append_035()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 16;
@@ -3739,7 +3737,7 @@ namespace rtl_OStringBuffer
 
         void append_036()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 16;
@@ -3758,7 +3756,7 @@ namespace rtl_OStringBuffer
 
         void append_037()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 36;
@@ -3777,7 +3775,7 @@ namespace rtl_OStringBuffer
 
         void append_038()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 36;
@@ -3796,7 +3794,7 @@ namespace rtl_OStringBuffer
 
         void append_039()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 36;
@@ -3815,7 +3813,7 @@ namespace rtl_OStringBuffer
 
         void append_040()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 35;
             sal_Int16              radix = 36;
@@ -3834,7 +3832,7 @@ namespace rtl_OStringBuffer
 
         void append_041()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 2;
@@ -3853,7 +3851,7 @@ namespace rtl_OStringBuffer
 
         void append_042()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 2;
@@ -3872,7 +3870,7 @@ namespace rtl_OStringBuffer
 
         void append_043()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 2;
@@ -3891,7 +3889,7 @@ namespace rtl_OStringBuffer
 
         void append_044()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 2;
@@ -3910,7 +3908,7 @@ namespace rtl_OStringBuffer
 
         void append_045()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 8;
@@ -3929,7 +3927,7 @@ namespace rtl_OStringBuffer
 
         void append_046()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 8;
@@ -3948,7 +3946,7 @@ namespace rtl_OStringBuffer
 
         void append_047()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 8;
@@ -3967,7 +3965,7 @@ namespace rtl_OStringBuffer
 
         void append_048()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 8;
@@ -3986,7 +3984,7 @@ namespace rtl_OStringBuffer
 
         void append_049()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 10;
@@ -4005,7 +4003,7 @@ namespace rtl_OStringBuffer
 
         void append_050()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 10;
@@ -4024,7 +4022,7 @@ namespace rtl_OStringBuffer
 
         void append_051()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 10;
@@ -4043,7 +4041,7 @@ namespace rtl_OStringBuffer
 
         void append_052()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 10;
@@ -4062,7 +4060,7 @@ namespace rtl_OStringBuffer
 
         void append_053()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 16;
@@ -4081,7 +4079,7 @@ namespace rtl_OStringBuffer
 
         void append_054()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 16;
@@ -4100,7 +4098,7 @@ namespace rtl_OStringBuffer
 
         void append_055()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 16;
@@ -4119,7 +4117,7 @@ namespace rtl_OStringBuffer
 
         void append_056()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 16;
@@ -4138,7 +4136,7 @@ namespace rtl_OStringBuffer
 
         void append_057()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 36;
@@ -4157,7 +4155,7 @@ namespace rtl_OStringBuffer
 
         void append_058()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 36;
@@ -4176,7 +4174,7 @@ namespace rtl_OStringBuffer
 
         void append_059()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 36;
@@ -4195,7 +4193,7 @@ namespace rtl_OStringBuffer
 
         void append_060()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 35;
             sal_Int16              radix = 36;
@@ -4214,7 +4212,7 @@ namespace rtl_OStringBuffer
 
         void append_061()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 2;
@@ -4233,7 +4231,7 @@ namespace rtl_OStringBuffer
 
         void append_062()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 2;
@@ -4252,7 +4250,7 @@ namespace rtl_OStringBuffer
 
         void append_063()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 2;
@@ -4271,7 +4269,7 @@ namespace rtl_OStringBuffer
 
         void append_064()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 2;
@@ -4290,7 +4288,7 @@ namespace rtl_OStringBuffer
 
         void append_065()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 8;
@@ -4309,7 +4307,7 @@ namespace rtl_OStringBuffer
 
         void append_066()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 8;
@@ -4328,7 +4326,7 @@ namespace rtl_OStringBuffer
 
         void append_067()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 8;
@@ -4347,7 +4345,7 @@ namespace rtl_OStringBuffer
 
         void append_068()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 8;
@@ -4366,7 +4364,7 @@ namespace rtl_OStringBuffer
 
         void append_069()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 10;
@@ -4385,7 +4383,7 @@ namespace rtl_OStringBuffer
 
         void append_070()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 10;
@@ -4404,7 +4402,7 @@ namespace rtl_OStringBuffer
 
         void append_071()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 10;
@@ -4423,7 +4421,7 @@ namespace rtl_OStringBuffer
 
         void append_072()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 10;
@@ -4442,7 +4440,7 @@ namespace rtl_OStringBuffer
 
         void append_073()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 16;
@@ -4461,7 +4459,7 @@ namespace rtl_OStringBuffer
 
         void append_074()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 16;
@@ -4480,7 +4478,7 @@ namespace rtl_OStringBuffer
 
         void append_075()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 16;
@@ -4499,7 +4497,7 @@ namespace rtl_OStringBuffer
 
         void append_076()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 16;
@@ -4518,7 +4516,7 @@ namespace rtl_OStringBuffer
 
         void append_077()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 36;
@@ -4537,7 +4535,7 @@ namespace rtl_OStringBuffer
 
         void append_078()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 36;
@@ -4556,7 +4554,7 @@ namespace rtl_OStringBuffer
 
         void append_079()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 36;
@@ -4575,7 +4573,7 @@ namespace rtl_OStringBuffer
 
         void append_080()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 35;
             sal_Int16              radix = 36;
@@ -4594,7 +4592,7 @@ namespace rtl_OStringBuffer
 
         void append_081()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 2;
@@ -4613,7 +4611,7 @@ namespace rtl_OStringBuffer
 
         void append_082()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 2;
@@ -4632,7 +4630,7 @@ namespace rtl_OStringBuffer
 
         void append_083()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 2;
@@ -4651,7 +4649,7 @@ namespace rtl_OStringBuffer
 
         void append_084()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 2;
@@ -4670,7 +4668,7 @@ namespace rtl_OStringBuffer
 
         void append_085()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 8;
@@ -4689,7 +4687,7 @@ namespace rtl_OStringBuffer
 
         void append_086()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 8;
@@ -4708,7 +4706,7 @@ namespace rtl_OStringBuffer
 
         void append_087()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 8;
@@ -4727,7 +4725,7 @@ namespace rtl_OStringBuffer
 
         void append_088()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 8;
@@ -4746,7 +4744,7 @@ namespace rtl_OStringBuffer
 
         void append_089()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 10;
@@ -4765,7 +4763,7 @@ namespace rtl_OStringBuffer
 
         void append_090()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 10;
@@ -4784,7 +4782,7 @@ namespace rtl_OStringBuffer
 
         void append_091()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 10;
@@ -4803,7 +4801,7 @@ namespace rtl_OStringBuffer
 
         void append_092()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 10;
@@ -4822,7 +4820,7 @@ namespace rtl_OStringBuffer
 
         void append_093()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 16;
@@ -4841,7 +4839,7 @@ namespace rtl_OStringBuffer
 
         void append_094()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 16;
@@ -4860,7 +4858,7 @@ namespace rtl_OStringBuffer
 
         void append_095()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 16;
@@ -4879,7 +4877,7 @@ namespace rtl_OStringBuffer
 
         void append_096()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 15;
             sal_Int16              radix = 16;
@@ -4898,7 +4896,7 @@ namespace rtl_OStringBuffer
 
         void append_097()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 0;
             sal_Int16              radix = 36;
@@ -4917,7 +4915,7 @@ namespace rtl_OStringBuffer
 
         void append_098()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 4;
             sal_Int16              radix = 36;
@@ -4936,7 +4934,7 @@ namespace rtl_OStringBuffer
 
         void append_099()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 8;
             sal_Int16              radix = 36;
@@ -4955,7 +4953,7 @@ namespace rtl_OStringBuffer
 
         void append_100()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = 35;
             sal_Int16              radix = 36;
@@ -5053,7 +5051,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 2;
@@ -5072,7 +5070,7 @@ namespace rtl_OStringBuffer
 
         void append_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 2;
@@ -5091,7 +5089,7 @@ namespace rtl_OStringBuffer
 
         void append_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 8;
@@ -5110,7 +5108,7 @@ namespace rtl_OStringBuffer
 
         void append_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 8;
@@ -5129,7 +5127,7 @@ namespace rtl_OStringBuffer
 
         void append_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 10;
@@ -5148,7 +5146,7 @@ namespace rtl_OStringBuffer
 
         void append_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 10;
@@ -5167,7 +5165,7 @@ namespace rtl_OStringBuffer
 
         void append_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 16;
@@ -5186,7 +5184,7 @@ namespace rtl_OStringBuffer
 
         void append_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 16;
@@ -5205,7 +5203,7 @@ namespace rtl_OStringBuffer
 
         void append_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 36;
@@ -5224,7 +5222,7 @@ namespace rtl_OStringBuffer
 
         void append_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 36;
@@ -5243,7 +5241,7 @@ namespace rtl_OStringBuffer
 
         void append_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 2;
@@ -5262,7 +5260,7 @@ namespace rtl_OStringBuffer
 
         void append_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 2;
@@ -5281,7 +5279,7 @@ namespace rtl_OStringBuffer
 
         void append_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 8;
@@ -5300,7 +5298,7 @@ namespace rtl_OStringBuffer
 
         void append_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 8;
@@ -5319,7 +5317,7 @@ namespace rtl_OStringBuffer
 
         void append_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 10;
@@ -5338,7 +5336,7 @@ namespace rtl_OStringBuffer
 
         void append_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 10;
@@ -5357,7 +5355,7 @@ namespace rtl_OStringBuffer
 
         void append_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 16;
@@ -5376,7 +5374,7 @@ namespace rtl_OStringBuffer
 
         void append_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 16;
@@ -5395,7 +5393,7 @@ namespace rtl_OStringBuffer
 
         void append_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 36;
@@ -5414,7 +5412,7 @@ namespace rtl_OStringBuffer
 
         void append_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 36;
@@ -5433,7 +5431,7 @@ namespace rtl_OStringBuffer
 
         void append_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 2;
@@ -5452,7 +5450,7 @@ namespace rtl_OStringBuffer
 
         void append_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 2;
@@ -5471,7 +5469,7 @@ namespace rtl_OStringBuffer
 
         void append_023()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 8;
@@ -5490,7 +5488,7 @@ namespace rtl_OStringBuffer
 
         void append_024()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 8;
@@ -5509,7 +5507,7 @@ namespace rtl_OStringBuffer
 
         void append_025()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 10;
@@ -5528,7 +5526,7 @@ namespace rtl_OStringBuffer
 
         void append_026()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 10;
@@ -5547,7 +5545,7 @@ namespace rtl_OStringBuffer
 
         void append_027()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 16;
@@ -5566,7 +5564,7 @@ namespace rtl_OStringBuffer
 
         void append_028()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 16;
@@ -5585,7 +5583,7 @@ namespace rtl_OStringBuffer
 
         void append_029()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 36;
@@ -5604,7 +5602,7 @@ namespace rtl_OStringBuffer
 
         void append_030()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 36;
@@ -5623,7 +5621,7 @@ namespace rtl_OStringBuffer
 
         void append_031()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 2;
@@ -5642,7 +5640,7 @@ namespace rtl_OStringBuffer
 
         void append_032()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 2;
@@ -5661,7 +5659,7 @@ namespace rtl_OStringBuffer
 
         void append_033()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 8;
@@ -5680,7 +5678,7 @@ namespace rtl_OStringBuffer
 
         void append_034()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 8;
@@ -5699,7 +5697,7 @@ namespace rtl_OStringBuffer
 
         void append_035()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 10;
@@ -5718,7 +5716,7 @@ namespace rtl_OStringBuffer
 
         void append_036()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 10;
@@ -5737,7 +5735,7 @@ namespace rtl_OStringBuffer
 
         void append_037()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 16;
@@ -5756,7 +5754,7 @@ namespace rtl_OStringBuffer
 
         void append_038()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 16;
@@ -5775,7 +5773,7 @@ namespace rtl_OStringBuffer
 
         void append_039()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 36;
@@ -5794,7 +5792,7 @@ namespace rtl_OStringBuffer
 
         void append_040()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 36;
@@ -5813,7 +5811,7 @@ namespace rtl_OStringBuffer
 
         void append_041()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 2;
@@ -5832,7 +5830,7 @@ namespace rtl_OStringBuffer
 
         void append_042()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 2;
@@ -5851,7 +5849,7 @@ namespace rtl_OStringBuffer
 
         void append_043()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 8;
@@ -5870,7 +5868,7 @@ namespace rtl_OStringBuffer
 
         void append_044()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 8;
@@ -5889,7 +5887,7 @@ namespace rtl_OStringBuffer
 
         void append_045()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 10;
@@ -5908,7 +5906,7 @@ namespace rtl_OStringBuffer
 
         void append_046()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 10;
@@ -5927,7 +5925,7 @@ namespace rtl_OStringBuffer
 
         void append_047()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 16;
@@ -5946,7 +5944,7 @@ namespace rtl_OStringBuffer
 
         void append_048()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 16;
@@ -5965,7 +5963,7 @@ namespace rtl_OStringBuffer
 
         void append_049()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt8Max;
             sal_Int16              radix = 36;
@@ -5984,7 +5982,7 @@ namespace rtl_OStringBuffer
 
         void append_050()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = kSInt32Max;
             sal_Int16              radix = 36;
@@ -6057,7 +6055,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 2;
@@ -6076,7 +6074,7 @@ namespace rtl_OStringBuffer
 
         void append_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 2;
@@ -6096,7 +6094,7 @@ namespace rtl_OStringBuffer
 
         void append_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 2;
@@ -6116,7 +6114,7 @@ namespace rtl_OStringBuffer
 
         void append_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 2;
@@ -6136,7 +6134,7 @@ namespace rtl_OStringBuffer
 
         void append_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 8;
@@ -6155,7 +6153,7 @@ namespace rtl_OStringBuffer
 
         void append_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 8;
@@ -6175,7 +6173,7 @@ namespace rtl_OStringBuffer
 
         void append_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 8;
@@ -6195,7 +6193,7 @@ namespace rtl_OStringBuffer
 
         void append_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 8;
@@ -6215,7 +6213,7 @@ namespace rtl_OStringBuffer
 
         void append_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 10;
@@ -6234,7 +6232,7 @@ namespace rtl_OStringBuffer
 
         void append_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 10;
@@ -6254,7 +6252,7 @@ namespace rtl_OStringBuffer
 
         void append_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 10;
@@ -6274,7 +6272,7 @@ namespace rtl_OStringBuffer
 
         void append_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 10;
@@ -6294,7 +6292,7 @@ namespace rtl_OStringBuffer
 
         void append_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 16;
@@ -6313,7 +6311,7 @@ namespace rtl_OStringBuffer
 
         void append_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 16;
@@ -6333,7 +6331,7 @@ namespace rtl_OStringBuffer
 
         void append_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 16;
@@ -6353,7 +6351,7 @@ namespace rtl_OStringBuffer
 
         void append_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 16;
@@ -6373,7 +6371,7 @@ namespace rtl_OStringBuffer
 
         void append_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 36;
@@ -6392,7 +6390,7 @@ namespace rtl_OStringBuffer
 
         void append_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 36;
@@ -6412,7 +6410,7 @@ namespace rtl_OStringBuffer
 
         void append_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 36;
@@ -6432,7 +6430,7 @@ namespace rtl_OStringBuffer
 
         void append_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -35;
             sal_Int16              radix = 36;
@@ -6452,7 +6450,7 @@ namespace rtl_OStringBuffer
 
         void append_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 2;
@@ -6471,7 +6469,7 @@ namespace rtl_OStringBuffer
 
         void append_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 2;
@@ -6491,7 +6489,7 @@ namespace rtl_OStringBuffer
 
         void append_023()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 2;
@@ -6511,7 +6509,7 @@ namespace rtl_OStringBuffer
 
         void append_024()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 2;
@@ -6531,7 +6529,7 @@ namespace rtl_OStringBuffer
 
         void append_025()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 8;
@@ -6550,7 +6548,7 @@ namespace rtl_OStringBuffer
 
         void append_026()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 8;
@@ -6570,7 +6568,7 @@ namespace rtl_OStringBuffer
 
         void append_027()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 8;
@@ -6590,7 +6588,7 @@ namespace rtl_OStringBuffer
 
         void append_028()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 8;
@@ -6610,7 +6608,7 @@ namespace rtl_OStringBuffer
 
         void append_029()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 10;
@@ -6629,7 +6627,7 @@ namespace rtl_OStringBuffer
 
         void append_030()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 10;
@@ -6649,7 +6647,7 @@ namespace rtl_OStringBuffer
 
         void append_031()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 10;
@@ -6669,7 +6667,7 @@ namespace rtl_OStringBuffer
 
         void append_032()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 10;
@@ -6689,7 +6687,7 @@ namespace rtl_OStringBuffer
 
         void append_033()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 16;
@@ -6708,7 +6706,7 @@ namespace rtl_OStringBuffer
 
         void append_034()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 16;
@@ -6728,7 +6726,7 @@ namespace rtl_OStringBuffer
 
         void append_035()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 16;
@@ -6748,7 +6746,7 @@ namespace rtl_OStringBuffer
 
         void append_036()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 16;
@@ -6768,7 +6766,7 @@ namespace rtl_OStringBuffer
 
         void append_037()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 36;
@@ -6787,7 +6785,7 @@ namespace rtl_OStringBuffer
 
         void append_038()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 36;
@@ -6807,7 +6805,7 @@ namespace rtl_OStringBuffer
 
         void append_039()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 36;
@@ -6827,7 +6825,7 @@ namespace rtl_OStringBuffer
 
         void append_040()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -35;
             sal_Int16              radix = 36;
@@ -6847,7 +6845,7 @@ namespace rtl_OStringBuffer
 
         void append_041()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 2;
@@ -6866,7 +6864,7 @@ namespace rtl_OStringBuffer
 
         void append_042()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 2;
@@ -6886,7 +6884,7 @@ namespace rtl_OStringBuffer
 
         void append_043()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 2;
@@ -6906,7 +6904,7 @@ namespace rtl_OStringBuffer
 
         void append_044()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 2;
@@ -6926,7 +6924,7 @@ namespace rtl_OStringBuffer
 
         void append_045()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 8;
@@ -6945,7 +6943,7 @@ namespace rtl_OStringBuffer
 
         void append_046()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 8;
@@ -6965,7 +6963,7 @@ namespace rtl_OStringBuffer
 
         void append_047()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 8;
@@ -6985,7 +6983,7 @@ namespace rtl_OStringBuffer
 
         void append_048()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 8;
@@ -7005,7 +7003,7 @@ namespace rtl_OStringBuffer
 
         void append_049()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 10;
@@ -7024,7 +7022,7 @@ namespace rtl_OStringBuffer
 
         void append_050()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 10;
@@ -7044,7 +7042,7 @@ namespace rtl_OStringBuffer
 
         void append_051()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 10;
@@ -7064,7 +7062,7 @@ namespace rtl_OStringBuffer
 
         void append_052()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 10;
@@ -7084,7 +7082,7 @@ namespace rtl_OStringBuffer
 
         void append_053()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 16;
@@ -7103,7 +7101,7 @@ namespace rtl_OStringBuffer
 
         void append_054()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 16;
@@ -7123,7 +7121,7 @@ namespace rtl_OStringBuffer
 
         void append_055()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 16;
@@ -7143,7 +7141,7 @@ namespace rtl_OStringBuffer
 
         void append_056()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 16;
@@ -7163,7 +7161,7 @@ namespace rtl_OStringBuffer
 
         void append_057()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 36;
@@ -7182,7 +7180,7 @@ namespace rtl_OStringBuffer
 
         void append_058()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 36;
@@ -7202,7 +7200,7 @@ namespace rtl_OStringBuffer
 
         void append_059()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 36;
@@ -7222,7 +7220,7 @@ namespace rtl_OStringBuffer
 
         void append_060()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -35;
             sal_Int16              radix = 36;
@@ -7242,7 +7240,7 @@ namespace rtl_OStringBuffer
 
         void append_061()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 2;
@@ -7261,7 +7259,7 @@ namespace rtl_OStringBuffer
 
         void append_062()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 2;
@@ -7281,7 +7279,7 @@ namespace rtl_OStringBuffer
 
         void append_063()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 2;
@@ -7301,7 +7299,7 @@ namespace rtl_OStringBuffer
 
         void append_064()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 2;
@@ -7321,7 +7319,7 @@ namespace rtl_OStringBuffer
 
         void append_065()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 8;
@@ -7340,7 +7338,7 @@ namespace rtl_OStringBuffer
 
         void append_066()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 8;
@@ -7360,7 +7358,7 @@ namespace rtl_OStringBuffer
 
         void append_067()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 8;
@@ -7380,7 +7378,7 @@ namespace rtl_OStringBuffer
 
         void append_068()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 8;
@@ -7400,7 +7398,7 @@ namespace rtl_OStringBuffer
 
         void append_069()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 10;
@@ -7419,7 +7417,7 @@ namespace rtl_OStringBuffer
 
         void append_070()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 10;
@@ -7439,7 +7437,7 @@ namespace rtl_OStringBuffer
 
         void append_071()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 10;
@@ -7459,7 +7457,7 @@ namespace rtl_OStringBuffer
 
         void append_072()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 10;
@@ -7479,7 +7477,7 @@ namespace rtl_OStringBuffer
 
         void append_073()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 16;
@@ -7498,7 +7496,7 @@ namespace rtl_OStringBuffer
 
         void append_074()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 16;
@@ -7518,7 +7516,7 @@ namespace rtl_OStringBuffer
 
         void append_075()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 16;
@@ -7538,7 +7536,7 @@ namespace rtl_OStringBuffer
 
         void append_076()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 16;
@@ -7558,7 +7556,7 @@ namespace rtl_OStringBuffer
 
         void append_077()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 36;
@@ -7577,7 +7575,7 @@ namespace rtl_OStringBuffer
 
         void append_078()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 36;
@@ -7597,7 +7595,7 @@ namespace rtl_OStringBuffer
 
         void append_079()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 36;
@@ -7617,7 +7615,7 @@ namespace rtl_OStringBuffer
 
         void append_080()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -35;
             sal_Int16              radix = 36;
@@ -7637,7 +7635,7 @@ namespace rtl_OStringBuffer
 
         void append_081()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 2;
@@ -7656,7 +7654,7 @@ namespace rtl_OStringBuffer
 
         void append_082()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 2;
@@ -7676,7 +7674,7 @@ namespace rtl_OStringBuffer
 
         void append_083()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 2;
@@ -7696,7 +7694,7 @@ namespace rtl_OStringBuffer
 
         void append_084()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 2;
@@ -7716,7 +7714,7 @@ namespace rtl_OStringBuffer
 
         void append_085()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 8;
@@ -7735,7 +7733,7 @@ namespace rtl_OStringBuffer
 
         void append_086()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 8;
@@ -7755,7 +7753,7 @@ namespace rtl_OStringBuffer
 
         void append_087()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 8;
@@ -7775,7 +7773,7 @@ namespace rtl_OStringBuffer
 
         void append_088()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 8;
@@ -7795,7 +7793,7 @@ namespace rtl_OStringBuffer
 
         void append_089()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 10;
@@ -7814,7 +7812,7 @@ namespace rtl_OStringBuffer
 
         void append_090()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 10;
@@ -7834,7 +7832,7 @@ namespace rtl_OStringBuffer
 
         void append_091()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 10;
@@ -7854,7 +7852,7 @@ namespace rtl_OStringBuffer
 
         void append_092()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 10;
@@ -7874,7 +7872,7 @@ namespace rtl_OStringBuffer
 
         void append_093()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 16;
@@ -7893,7 +7891,7 @@ namespace rtl_OStringBuffer
 
         void append_094()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 16;
@@ -7913,7 +7911,7 @@ namespace rtl_OStringBuffer
 
         void append_095()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 16;
@@ -7933,7 +7931,7 @@ namespace rtl_OStringBuffer
 
         void append_096()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -15;
             sal_Int16              radix = 16;
@@ -7953,7 +7951,7 @@ namespace rtl_OStringBuffer
 
         void append_097()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -0;
             sal_Int16              radix = 36;
@@ -7972,7 +7970,7 @@ namespace rtl_OStringBuffer
 
         void append_098()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -4;
             sal_Int16              radix = 36;
@@ -7991,7 +7989,7 @@ namespace rtl_OStringBuffer
 
         void append_099()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -8;
             sal_Int16              radix = 36;
@@ -8010,7 +8008,7 @@ namespace rtl_OStringBuffer
 
         void append_100()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int32              input = -35;
             sal_Int16              radix = 36;
@@ -8097,7 +8095,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( kTestStr59 );
             sal_Int32              input = 11;
 
@@ -8114,7 +8112,7 @@ namespace rtl_OStringBuffer
 
         void append_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( kTestStr62 );
             sal_Int32              input = 0;
 
@@ -8131,7 +8129,7 @@ namespace rtl_OStringBuffer
 
         void append_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( kTestStr63 );
             sal_Int32              input = -11;
 
@@ -8148,7 +8146,7 @@ namespace rtl_OStringBuffer
 
         void append_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( kTestStr64 );
             sal_Int32              input = 2147483647;
 
@@ -8165,7 +8163,7 @@ namespace rtl_OStringBuffer
 
         void append_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( kTestStr65 );
             sal_Int32              input = kNonSInt32Max;
 
@@ -8182,7 +8180,7 @@ namespace rtl_OStringBuffer
 
         void append_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( kTestStr60 );
             sal_Int32              input = 11;
 
@@ -8199,7 +8197,7 @@ namespace rtl_OStringBuffer
 
         void append_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( kTestStr66 );
             sal_Int32              input = 0;
 
@@ -8216,7 +8214,7 @@ namespace rtl_OStringBuffer
 
         void append_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( kTestStr67 );
             sal_Int32              input = -11;
 
@@ -8233,7 +8231,7 @@ namespace rtl_OStringBuffer
 
         void append_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( kTestStr68 );
             sal_Int32              input = 2147483647;
 
@@ -8250,7 +8248,7 @@ namespace rtl_OStringBuffer
 
         void append_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( kTestStr69 );
             sal_Int32              input = SAL_MIN_INT32 /*-2147483648*/;
 
@@ -8267,7 +8265,7 @@ namespace rtl_OStringBuffer
 
         void append_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( kTestStr60 );
             sal_Int32              input = 11;
 
@@ -8284,7 +8282,7 @@ namespace rtl_OStringBuffer
 
         void append_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( kTestStr66 );
             sal_Int32              input = 0;
 
@@ -8301,7 +8299,7 @@ namespace rtl_OStringBuffer
 
         void append_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( kTestStr67 );
             sal_Int32              input = -11;
 
@@ -8318,7 +8316,7 @@ namespace rtl_OStringBuffer
 
         void append_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( kTestStr68 );
             sal_Int32              input = 2147483647;
 
@@ -8335,7 +8333,7 @@ namespace rtl_OStringBuffer
 
         void append_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( kTestStr69 );
             sal_Int32              input = SAL_MIN_INT32;
 
@@ -8352,7 +8350,7 @@ namespace rtl_OStringBuffer
 
         void append_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( kTestStr60 );
             sal_Int32              input = 11;
 
@@ -8369,7 +8367,7 @@ namespace rtl_OStringBuffer
 
         void append_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( kTestStr66 );
             sal_Int32              input = 0;
 
@@ -8386,7 +8384,7 @@ namespace rtl_OStringBuffer
 
         void append_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( kTestStr67 );
             sal_Int32              input = -11;
 
@@ -8403,7 +8401,7 @@ namespace rtl_OStringBuffer
 
         void append_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( kTestStr68 );
             sal_Int32              input = 2147483647;
 
@@ -8420,7 +8418,7 @@ namespace rtl_OStringBuffer
 
         void append_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( kTestStr69 );
             sal_Int32              input = SAL_MIN_INT32;
 
@@ -8437,7 +8435,7 @@ namespace rtl_OStringBuffer
 
         void append_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( kTestStr61 );
             sal_Int32              input = 11;
 
@@ -8454,7 +8452,7 @@ namespace rtl_OStringBuffer
 
         void append_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( kTestStr70 );
             sal_Int32              input = 0;
 
@@ -8471,7 +8469,7 @@ namespace rtl_OStringBuffer
 
         void append_023()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( kTestStr71 );
             sal_Int32              input = -11;
 
@@ -8488,7 +8486,7 @@ namespace rtl_OStringBuffer
 
         void append_024()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( kTestStr72 );
             sal_Int32              input = 2147483647;
 
@@ -8505,7 +8503,7 @@ namespace rtl_OStringBuffer
 
         void append_025()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( kTestStr73 );
             sal_Int32              input = SAL_MIN_INT32;
 
@@ -8522,7 +8520,7 @@ namespace rtl_OStringBuffer
 #ifdef WITH_CORE
         void append_026()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             OString                expVal( kTestStr60 );
             sal_Int32              input = 11;
 
@@ -8539,7 +8537,7 @@ namespace rtl_OStringBuffer
 
         void append_027()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             OString                expVal( kTestStr66 );
             sal_Int32              input = 0;
 
@@ -8556,7 +8554,7 @@ namespace rtl_OStringBuffer
 
         void append_028()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             OString                expVal( kTestStr67 );
             sal_Int32              input = -11;
 
@@ -8573,7 +8571,7 @@ namespace rtl_OStringBuffer
 
         void append_029()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             OString                expVal( kTestStr68 );
             sal_Int32              input = 2147483647;
 
@@ -8590,7 +8588,7 @@ namespace rtl_OStringBuffer
 
         void append_030()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             OString                expVal( kTestStr69 );
             sal_Int32              input = SAL_MIN_INT32;
 
@@ -8664,7 +8662,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 2;
@@ -8683,7 +8681,7 @@ namespace rtl_OStringBuffer
 
         void append_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 2;
@@ -8702,7 +8700,7 @@ namespace rtl_OStringBuffer
 
         void append_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 2;
@@ -8721,7 +8719,7 @@ namespace rtl_OStringBuffer
 
         void append_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 2;
@@ -8740,7 +8738,7 @@ namespace rtl_OStringBuffer
 
         void append_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 8;
@@ -8759,7 +8757,7 @@ namespace rtl_OStringBuffer
 
         void append_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 8;
@@ -8778,7 +8776,7 @@ namespace rtl_OStringBuffer
 
         void append_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 8;
@@ -8797,7 +8795,7 @@ namespace rtl_OStringBuffer
 
         void append_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 8;
@@ -8816,7 +8814,7 @@ namespace rtl_OStringBuffer
 
         void append_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64             input = 0;
             sal_Int16              radix = 10;
@@ -8835,7 +8833,7 @@ namespace rtl_OStringBuffer
 
         void append_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 10;
@@ -8854,7 +8852,7 @@ namespace rtl_OStringBuffer
 
         void append_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 10;
@@ -8873,7 +8871,7 @@ namespace rtl_OStringBuffer
 
         void append_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 10;
@@ -8892,7 +8890,7 @@ namespace rtl_OStringBuffer
 
         void append_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 16;
@@ -8911,7 +8909,7 @@ namespace rtl_OStringBuffer
 
         void append_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 16;
@@ -8930,7 +8928,7 @@ namespace rtl_OStringBuffer
 
         void append_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 16;
@@ -8949,7 +8947,7 @@ namespace rtl_OStringBuffer
 
         void append_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 16;
@@ -8968,7 +8966,7 @@ namespace rtl_OStringBuffer
 
         void append_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 36;
@@ -8987,7 +8985,7 @@ namespace rtl_OStringBuffer
 
         void append_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 36;
@@ -9006,7 +9004,7 @@ namespace rtl_OStringBuffer
 
         void append_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 36;
@@ -9025,7 +9023,7 @@ namespace rtl_OStringBuffer
 
         void append_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 35;
             sal_Int16              radix = 36;
@@ -9044,7 +9042,7 @@ namespace rtl_OStringBuffer
 
         void append_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 2;
@@ -9063,7 +9061,7 @@ namespace rtl_OStringBuffer
 
         void append_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 2;
@@ -9082,7 +9080,7 @@ namespace rtl_OStringBuffer
 
         void append_023()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 2;
@@ -9101,7 +9099,7 @@ namespace rtl_OStringBuffer
 
         void append_024()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 2;
@@ -9120,7 +9118,7 @@ namespace rtl_OStringBuffer
 
         void append_025()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 8;
@@ -9139,7 +9137,7 @@ namespace rtl_OStringBuffer
 
         void append_026()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 8;
@@ -9158,7 +9156,7 @@ namespace rtl_OStringBuffer
 
         void append_027()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 8;
@@ -9177,7 +9175,7 @@ namespace rtl_OStringBuffer
 
         void append_028()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 8;
@@ -9196,7 +9194,7 @@ namespace rtl_OStringBuffer
 
         void append_029()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 10;
@@ -9215,7 +9213,7 @@ namespace rtl_OStringBuffer
 
         void append_030()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 10;
@@ -9234,7 +9232,7 @@ namespace rtl_OStringBuffer
 
         void append_031()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 10;
@@ -9253,7 +9251,7 @@ namespace rtl_OStringBuffer
 
         void append_032()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 10;
@@ -9272,7 +9270,7 @@ namespace rtl_OStringBuffer
 
         void append_033()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 16;
@@ -9291,7 +9289,7 @@ namespace rtl_OStringBuffer
 
         void append_034()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 16;
@@ -9310,7 +9308,7 @@ namespace rtl_OStringBuffer
 
         void append_035()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 16;
@@ -9329,7 +9327,7 @@ namespace rtl_OStringBuffer
 
         void append_036()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 16;
@@ -9348,7 +9346,7 @@ namespace rtl_OStringBuffer
 
         void append_037()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 36;
@@ -9367,7 +9365,7 @@ namespace rtl_OStringBuffer
 
         void append_038()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 36;
@@ -9386,7 +9384,7 @@ namespace rtl_OStringBuffer
 
         void append_039()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 36;
@@ -9405,7 +9403,7 @@ namespace rtl_OStringBuffer
 
         void append_040()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 35;
             sal_Int16              radix = 36;
@@ -9424,7 +9422,7 @@ namespace rtl_OStringBuffer
 
         void append_041()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 2;
@@ -9443,7 +9441,7 @@ namespace rtl_OStringBuffer
 
         void append_042()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 2;
@@ -9462,7 +9460,7 @@ namespace rtl_OStringBuffer
 
         void append_043()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 2;
@@ -9481,7 +9479,7 @@ namespace rtl_OStringBuffer
 
         void append_044()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 2;
@@ -9500,7 +9498,7 @@ namespace rtl_OStringBuffer
 
         void append_045()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 8;
@@ -9519,7 +9517,7 @@ namespace rtl_OStringBuffer
 
         void append_046()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 8;
@@ -9538,7 +9536,7 @@ namespace rtl_OStringBuffer
 
         void append_047()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 8;
@@ -9557,7 +9555,7 @@ namespace rtl_OStringBuffer
 
         void append_048()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 8;
@@ -9576,7 +9574,7 @@ namespace rtl_OStringBuffer
 
         void append_049()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 10;
@@ -9595,7 +9593,7 @@ namespace rtl_OStringBuffer
 
         void append_050()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 10;
@@ -9614,7 +9612,7 @@ namespace rtl_OStringBuffer
 
         void append_051()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 10;
@@ -9633,7 +9631,7 @@ namespace rtl_OStringBuffer
 
         void append_052()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 10;
@@ -9652,7 +9650,7 @@ namespace rtl_OStringBuffer
 
         void append_053()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 16;
@@ -9671,7 +9669,7 @@ namespace rtl_OStringBuffer
 
         void append_054()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 16;
@@ -9690,7 +9688,7 @@ namespace rtl_OStringBuffer
 
         void append_055()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 16;
@@ -9709,7 +9707,7 @@ namespace rtl_OStringBuffer
 
         void append_056()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 16;
@@ -9728,7 +9726,7 @@ namespace rtl_OStringBuffer
 
         void append_057()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 36;
@@ -9747,7 +9745,7 @@ namespace rtl_OStringBuffer
 
         void append_058()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 36;
@@ -9766,7 +9764,7 @@ namespace rtl_OStringBuffer
 
         void append_059()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 36;
@@ -9785,7 +9783,7 @@ namespace rtl_OStringBuffer
 
         void append_060()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 35;
             sal_Int16              radix = 36;
@@ -9804,7 +9802,7 @@ namespace rtl_OStringBuffer
 
         void append_061()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 2;
@@ -9823,7 +9821,7 @@ namespace rtl_OStringBuffer
 
         void append_062()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 2;
@@ -9842,7 +9840,7 @@ namespace rtl_OStringBuffer
 
         void append_063()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 2;
@@ -9861,7 +9859,7 @@ namespace rtl_OStringBuffer
 
         void append_064()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 2;
@@ -9880,7 +9878,7 @@ namespace rtl_OStringBuffer
 
         void append_065()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 8;
@@ -9899,7 +9897,7 @@ namespace rtl_OStringBuffer
 
         void append_066()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 8;
@@ -9918,7 +9916,7 @@ namespace rtl_OStringBuffer
 
         void append_067()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 8;
@@ -9937,7 +9935,7 @@ namespace rtl_OStringBuffer
 
         void append_068()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 8;
@@ -9956,7 +9954,7 @@ namespace rtl_OStringBuffer
 
         void append_069()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 10;
@@ -9975,7 +9973,7 @@ namespace rtl_OStringBuffer
 
         void append_070()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 10;
@@ -9994,7 +9992,7 @@ namespace rtl_OStringBuffer
 
         void append_071()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 10;
@@ -10013,7 +10011,7 @@ namespace rtl_OStringBuffer
 
         void append_072()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 10;
@@ -10032,7 +10030,7 @@ namespace rtl_OStringBuffer
 
         void append_073()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 16;
@@ -10051,7 +10049,7 @@ namespace rtl_OStringBuffer
 
         void append_074()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 16;
@@ -10070,7 +10068,7 @@ namespace rtl_OStringBuffer
 
         void append_075()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 16;
@@ -10089,7 +10087,7 @@ namespace rtl_OStringBuffer
 
         void append_076()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 16;
@@ -10108,7 +10106,7 @@ namespace rtl_OStringBuffer
 
         void append_077()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 36;
@@ -10127,7 +10125,7 @@ namespace rtl_OStringBuffer
 
         void append_078()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 36;
@@ -10146,7 +10144,7 @@ namespace rtl_OStringBuffer
 
         void append_079()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 36;
@@ -10165,7 +10163,7 @@ namespace rtl_OStringBuffer
 
         void append_080()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 35;
             sal_Int16              radix = 36;
@@ -10184,7 +10182,7 @@ namespace rtl_OStringBuffer
 
         void append_081()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 2;
@@ -10203,7 +10201,7 @@ namespace rtl_OStringBuffer
 
         void append_082()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 2;
@@ -10222,7 +10220,7 @@ namespace rtl_OStringBuffer
 
         void append_083()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 2;
@@ -10241,7 +10239,7 @@ namespace rtl_OStringBuffer
 
         void append_084()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 2;
@@ -10260,7 +10258,7 @@ namespace rtl_OStringBuffer
 
         void append_085()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 8;
@@ -10279,7 +10277,7 @@ namespace rtl_OStringBuffer
 
         void append_086()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 8;
@@ -10298,7 +10296,7 @@ namespace rtl_OStringBuffer
 
         void append_087()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 8;
@@ -10317,7 +10315,7 @@ namespace rtl_OStringBuffer
 
         void append_088()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 8;
@@ -10336,7 +10334,7 @@ namespace rtl_OStringBuffer
 
         void append_089()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 10;
@@ -10355,7 +10353,7 @@ namespace rtl_OStringBuffer
 
         void append_090()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 10;
@@ -10374,7 +10372,7 @@ namespace rtl_OStringBuffer
 
         void append_091()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 10;
@@ -10393,7 +10391,7 @@ namespace rtl_OStringBuffer
 
         void append_092()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 10;
@@ -10412,7 +10410,7 @@ namespace rtl_OStringBuffer
 
         void append_093()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 16;
@@ -10431,7 +10429,7 @@ namespace rtl_OStringBuffer
 
         void append_094()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 16;
@@ -10450,7 +10448,7 @@ namespace rtl_OStringBuffer
 
         void append_095()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 16;
@@ -10469,7 +10467,7 @@ namespace rtl_OStringBuffer
 
         void append_096()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 15;
             sal_Int16              radix = 16;
@@ -10488,7 +10486,7 @@ namespace rtl_OStringBuffer
 
         void append_097()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 0;
             sal_Int16              radix = 36;
@@ -10507,7 +10505,7 @@ namespace rtl_OStringBuffer
 
         void append_098()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 4;
             sal_Int16              radix = 36;
@@ -10526,7 +10524,7 @@ namespace rtl_OStringBuffer
 
         void append_099()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 8;
             sal_Int16              radix = 36;
@@ -10545,7 +10543,7 @@ namespace rtl_OStringBuffer
 
         void append_100()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = 35;
             sal_Int16              radix = 36;
@@ -10643,7 +10641,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 2;
@@ -10662,7 +10660,7 @@ namespace rtl_OStringBuffer
 
         void append_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 2;
@@ -10681,7 +10679,7 @@ namespace rtl_OStringBuffer
 
         void append_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 8;
@@ -10700,7 +10698,7 @@ namespace rtl_OStringBuffer
 
         void append_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64             input = kSInt64Max;
             sal_Int16              radix = 8;
@@ -10719,7 +10717,7 @@ namespace rtl_OStringBuffer
 
         void append_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 10;
@@ -10738,7 +10736,7 @@ namespace rtl_OStringBuffer
 
         void append_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 10;
@@ -10757,7 +10755,7 @@ namespace rtl_OStringBuffer
 
         void append_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 16;
@@ -10776,7 +10774,7 @@ namespace rtl_OStringBuffer
 
         void append_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 16;
@@ -10795,7 +10793,7 @@ namespace rtl_OStringBuffer
 
         void append_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 36;
@@ -10814,7 +10812,7 @@ namespace rtl_OStringBuffer
 
         void append_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 36;
@@ -10833,7 +10831,7 @@ namespace rtl_OStringBuffer
 
         void append_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 2;
@@ -10852,7 +10850,7 @@ namespace rtl_OStringBuffer
 
         void append_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 2;
@@ -10871,7 +10869,7 @@ namespace rtl_OStringBuffer
 
         void append_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 8;
@@ -10890,7 +10888,7 @@ namespace rtl_OStringBuffer
 
         void append_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 8;
@@ -10909,7 +10907,7 @@ namespace rtl_OStringBuffer
 
         void append_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 10;
@@ -10928,7 +10926,7 @@ namespace rtl_OStringBuffer
 
         void append_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 10;
@@ -10947,7 +10945,7 @@ namespace rtl_OStringBuffer
 
         void append_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 16;
@@ -10966,7 +10964,7 @@ namespace rtl_OStringBuffer
 
         void append_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 16;
@@ -10985,7 +10983,7 @@ namespace rtl_OStringBuffer
 
         void append_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 36;
@@ -11004,7 +11002,7 @@ namespace rtl_OStringBuffer
 
         void append_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 36;
@@ -11023,7 +11021,7 @@ namespace rtl_OStringBuffer
 
         void append_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 2;
@@ -11042,7 +11040,7 @@ namespace rtl_OStringBuffer
 
         void append_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 2;
@@ -11061,7 +11059,7 @@ namespace rtl_OStringBuffer
 
         void append_023()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 8;
@@ -11080,7 +11078,7 @@ namespace rtl_OStringBuffer
 
         void append_024()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 8;
@@ -11099,7 +11097,7 @@ namespace rtl_OStringBuffer
 
         void append_025()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 10;
@@ -11118,7 +11116,7 @@ namespace rtl_OStringBuffer
 
         void append_026()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 10;
@@ -11137,7 +11135,7 @@ namespace rtl_OStringBuffer
 
         void append_027()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 16;
@@ -11156,7 +11154,7 @@ namespace rtl_OStringBuffer
 
         void append_028()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 16;
@@ -11175,7 +11173,7 @@ namespace rtl_OStringBuffer
 
         void append_029()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 36;
@@ -11194,7 +11192,7 @@ namespace rtl_OStringBuffer
 
         void append_030()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 36;
@@ -11213,7 +11211,7 @@ namespace rtl_OStringBuffer
 
         void append_031()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 2;
@@ -11232,7 +11230,7 @@ namespace rtl_OStringBuffer
 
         void append_032()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 2;
@@ -11251,7 +11249,7 @@ namespace rtl_OStringBuffer
 
         void append_033()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 8;
@@ -11270,7 +11268,7 @@ namespace rtl_OStringBuffer
 
         void append_034()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 8;
@@ -11289,7 +11287,7 @@ namespace rtl_OStringBuffer
 
         void append_035()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 10;
@@ -11308,7 +11306,7 @@ namespace rtl_OStringBuffer
 
         void append_036()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 10;
@@ -11327,7 +11325,7 @@ namespace rtl_OStringBuffer
 
         void append_037()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 16;
@@ -11346,7 +11344,7 @@ namespace rtl_OStringBuffer
 
         void append_038()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 16;
@@ -11365,7 +11363,7 @@ namespace rtl_OStringBuffer
 
         void append_039()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 36;
@@ -11384,7 +11382,7 @@ namespace rtl_OStringBuffer
 
         void append_040()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 36;
@@ -11403,7 +11401,7 @@ namespace rtl_OStringBuffer
 
         void append_041()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 2;
@@ -11422,7 +11420,7 @@ namespace rtl_OStringBuffer
 
         void append_042()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 2;
@@ -11441,7 +11439,7 @@ namespace rtl_OStringBuffer
 
         void append_043()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 8;
@@ -11460,7 +11458,7 @@ namespace rtl_OStringBuffer
 
         void append_044()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 8;
@@ -11479,7 +11477,7 @@ namespace rtl_OStringBuffer
 
         void append_045()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 10;
@@ -11498,7 +11496,7 @@ namespace rtl_OStringBuffer
 
         void append_046()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 10;
@@ -11517,7 +11515,7 @@ namespace rtl_OStringBuffer
 
         void append_047()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 16;
@@ -11536,7 +11534,7 @@ namespace rtl_OStringBuffer
 
         void append_048()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 16;
@@ -11555,7 +11553,7 @@ namespace rtl_OStringBuffer
 
         void append_049()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt8Max;
             sal_Int16              radix = 36;
@@ -11574,7 +11572,7 @@ namespace rtl_OStringBuffer
 
         void append_050()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = kSInt64Max;
             sal_Int16              radix = 36;
@@ -11647,7 +11645,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 2;
@@ -11666,7 +11664,7 @@ namespace rtl_OStringBuffer
 
         void append_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 2;
@@ -11686,7 +11684,7 @@ namespace rtl_OStringBuffer
 
         void append_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 2;
@@ -11706,7 +11704,7 @@ namespace rtl_OStringBuffer
 
         void append_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 2;
@@ -11726,7 +11724,7 @@ namespace rtl_OStringBuffer
 
         void append_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 8;
@@ -11745,7 +11743,7 @@ namespace rtl_OStringBuffer
 
         void append_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 8;
@@ -11765,7 +11763,7 @@ namespace rtl_OStringBuffer
 
         void append_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 8;
@@ -11785,7 +11783,7 @@ namespace rtl_OStringBuffer
 
         void append_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 8;
@@ -11805,7 +11803,7 @@ namespace rtl_OStringBuffer
 
         void append_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 10;
@@ -11824,7 +11822,7 @@ namespace rtl_OStringBuffer
 
         void append_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 10;
@@ -11844,7 +11842,7 @@ namespace rtl_OStringBuffer
 
         void append_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 10;
@@ -11864,7 +11862,7 @@ namespace rtl_OStringBuffer
 
         void append_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 10;
@@ -11884,7 +11882,7 @@ namespace rtl_OStringBuffer
 
         void append_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 16;
@@ -11903,7 +11901,7 @@ namespace rtl_OStringBuffer
 
         void append_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 16;
@@ -11923,7 +11921,7 @@ namespace rtl_OStringBuffer
 
         void append_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 16;
@@ -11943,7 +11941,7 @@ namespace rtl_OStringBuffer
 
         void append_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 16;
@@ -11963,7 +11961,7 @@ namespace rtl_OStringBuffer
 
         void append_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 36;
@@ -11982,7 +11980,7 @@ namespace rtl_OStringBuffer
 
         void append_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 36;
@@ -12002,7 +12000,7 @@ namespace rtl_OStringBuffer
 
         void append_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 36;
@@ -12022,7 +12020,7 @@ namespace rtl_OStringBuffer
 
         void append_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -35;
             sal_Int16              radix = 36;
@@ -12042,7 +12040,7 @@ namespace rtl_OStringBuffer
 
         void append_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 2;
@@ -12061,7 +12059,7 @@ namespace rtl_OStringBuffer
 
         void append_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 2;
@@ -12081,7 +12079,7 @@ namespace rtl_OStringBuffer
 
         void append_023()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 2;
@@ -12101,7 +12099,7 @@ namespace rtl_OStringBuffer
 
         void append_024()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 2;
@@ -12121,7 +12119,7 @@ namespace rtl_OStringBuffer
 
         void append_025()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 8;
@@ -12140,7 +12138,7 @@ namespace rtl_OStringBuffer
 
         void append_026()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 8;
@@ -12160,7 +12158,7 @@ namespace rtl_OStringBuffer
 
         void append_027()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 8;
@@ -12180,7 +12178,7 @@ namespace rtl_OStringBuffer
 
         void append_028()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 8;
@@ -12200,7 +12198,7 @@ namespace rtl_OStringBuffer
 
         void append_029()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 10;
@@ -12219,7 +12217,7 @@ namespace rtl_OStringBuffer
 
         void append_030()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 10;
@@ -12239,7 +12237,7 @@ namespace rtl_OStringBuffer
 
         void append_031()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 10;
@@ -12259,7 +12257,7 @@ namespace rtl_OStringBuffer
 
         void append_032()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 10;
@@ -12279,7 +12277,7 @@ namespace rtl_OStringBuffer
 
         void append_033()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 16;
@@ -12298,7 +12296,7 @@ namespace rtl_OStringBuffer
 
         void append_034()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 16;
@@ -12318,7 +12316,7 @@ namespace rtl_OStringBuffer
 
         void append_035()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 16;
@@ -12338,7 +12336,7 @@ namespace rtl_OStringBuffer
 
         void append_036()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 16;
@@ -12358,7 +12356,7 @@ namespace rtl_OStringBuffer
 
         void append_037()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 36;
@@ -12377,7 +12375,7 @@ namespace rtl_OStringBuffer
 
         void append_038()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 36;
@@ -12397,7 +12395,7 @@ namespace rtl_OStringBuffer
 
         void append_039()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 36;
@@ -12417,7 +12415,7 @@ namespace rtl_OStringBuffer
 
         void append_040()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -35;
             sal_Int16              radix = 36;
@@ -12437,7 +12435,7 @@ namespace rtl_OStringBuffer
 
         void append_041()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 2;
@@ -12456,7 +12454,7 @@ namespace rtl_OStringBuffer
 
         void append_042()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 2;
@@ -12476,7 +12474,7 @@ namespace rtl_OStringBuffer
 
         void append_043()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 2;
@@ -12496,7 +12494,7 @@ namespace rtl_OStringBuffer
 
         void append_044()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 2;
@@ -12516,7 +12514,7 @@ namespace rtl_OStringBuffer
 
         void append_045()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 8;
@@ -12535,7 +12533,7 @@ namespace rtl_OStringBuffer
 
         void append_046()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 8;
@@ -12555,7 +12553,7 @@ namespace rtl_OStringBuffer
 
         void append_047()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 8;
@@ -12575,7 +12573,7 @@ namespace rtl_OStringBuffer
 
         void append_048()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 8;
@@ -12595,7 +12593,7 @@ namespace rtl_OStringBuffer
 
         void append_049()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 10;
@@ -12614,7 +12612,7 @@ namespace rtl_OStringBuffer
 
         void append_050()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 10;
@@ -12634,7 +12632,7 @@ namespace rtl_OStringBuffer
 
         void append_051()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 10;
@@ -12654,7 +12652,7 @@ namespace rtl_OStringBuffer
 
         void append_052()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 10;
@@ -12674,7 +12672,7 @@ namespace rtl_OStringBuffer
 
         void append_053()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 16;
@@ -12693,7 +12691,7 @@ namespace rtl_OStringBuffer
 
         void append_054()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 16;
@@ -12713,7 +12711,7 @@ namespace rtl_OStringBuffer
 
         void append_055()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 16;
@@ -12733,7 +12731,7 @@ namespace rtl_OStringBuffer
 
         void append_056()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 16;
@@ -12753,7 +12751,7 @@ namespace rtl_OStringBuffer
 
         void append_057()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 36;
@@ -12772,7 +12770,7 @@ namespace rtl_OStringBuffer
 
         void append_058()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 36;
@@ -12792,7 +12790,7 @@ namespace rtl_OStringBuffer
 
         void append_059()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 36;
@@ -12812,7 +12810,7 @@ namespace rtl_OStringBuffer
 
         void append_060()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -35;
             sal_Int16              radix = 36;
@@ -12832,7 +12830,7 @@ namespace rtl_OStringBuffer
 
         void append_061()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 2;
@@ -12851,7 +12849,7 @@ namespace rtl_OStringBuffer
 
         void append_062()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 2;
@@ -12871,7 +12869,7 @@ namespace rtl_OStringBuffer
 
         void append_063()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 2;
@@ -12891,7 +12889,7 @@ namespace rtl_OStringBuffer
 
         void append_064()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 2;
@@ -12911,7 +12909,7 @@ namespace rtl_OStringBuffer
 
         void append_065()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 8;
@@ -12930,7 +12928,7 @@ namespace rtl_OStringBuffer
 
         void append_066()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 8;
@@ -12950,7 +12948,7 @@ namespace rtl_OStringBuffer
 
         void append_067()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 8;
@@ -12970,7 +12968,7 @@ namespace rtl_OStringBuffer
 
         void append_068()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 8;
@@ -12990,7 +12988,7 @@ namespace rtl_OStringBuffer
 
         void append_069()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 10;
@@ -13009,7 +13007,7 @@ namespace rtl_OStringBuffer
 
         void append_070()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 10;
@@ -13029,7 +13027,7 @@ namespace rtl_OStringBuffer
 
         void append_071()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 10;
@@ -13049,7 +13047,7 @@ namespace rtl_OStringBuffer
 
         void append_072()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 10;
@@ -13069,7 +13067,7 @@ namespace rtl_OStringBuffer
 
         void append_073()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 16;
@@ -13088,7 +13086,7 @@ namespace rtl_OStringBuffer
 
         void append_074()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 16;
@@ -13108,7 +13106,7 @@ namespace rtl_OStringBuffer
 
         void append_075()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 16;
@@ -13128,7 +13126,7 @@ namespace rtl_OStringBuffer
 
         void append_076()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 16;
@@ -13148,7 +13146,7 @@ namespace rtl_OStringBuffer
 
         void append_077()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 36;
@@ -13167,7 +13165,7 @@ namespace rtl_OStringBuffer
 
         void append_078()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 36;
@@ -13187,7 +13185,7 @@ namespace rtl_OStringBuffer
 
         void append_079()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 36;
@@ -13207,7 +13205,7 @@ namespace rtl_OStringBuffer
 
         void append_080()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -35;
             sal_Int16              radix = 36;
@@ -13227,7 +13225,7 @@ namespace rtl_OStringBuffer
 
         void append_081()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 2;
@@ -13246,7 +13244,7 @@ namespace rtl_OStringBuffer
 
         void append_082()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 2;
@@ -13266,7 +13264,7 @@ namespace rtl_OStringBuffer
 
         void append_083()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 2;
@@ -13286,7 +13284,7 @@ namespace rtl_OStringBuffer
 
         void append_084()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 2;
@@ -13306,7 +13304,7 @@ namespace rtl_OStringBuffer
 
         void append_085()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 8;
@@ -13325,7 +13323,7 @@ namespace rtl_OStringBuffer
 
         void append_086()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 8;
@@ -13345,7 +13343,7 @@ namespace rtl_OStringBuffer
 
         void append_087()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 8;
@@ -13365,7 +13363,7 @@ namespace rtl_OStringBuffer
 
         void append_088()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 8;
@@ -13385,7 +13383,7 @@ namespace rtl_OStringBuffer
 
         void append_089()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 10;
@@ -13404,7 +13402,7 @@ namespace rtl_OStringBuffer
 
         void append_090()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 10;
@@ -13424,7 +13422,7 @@ namespace rtl_OStringBuffer
 
         void append_091()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 10;
@@ -13444,7 +13442,7 @@ namespace rtl_OStringBuffer
 
         void append_092()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 10;
@@ -13464,7 +13462,7 @@ namespace rtl_OStringBuffer
 
         void append_093()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 16;
@@ -13483,7 +13481,7 @@ namespace rtl_OStringBuffer
 
         void append_094()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 16;
@@ -13503,7 +13501,7 @@ namespace rtl_OStringBuffer
 
         void append_095()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 16;
@@ -13523,7 +13521,7 @@ namespace rtl_OStringBuffer
 
         void append_096()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -15;
             sal_Int16              radix = 16;
@@ -13543,7 +13541,7 @@ namespace rtl_OStringBuffer
 
         void append_097()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -0;
             sal_Int16              radix = 36;
@@ -13562,7 +13560,7 @@ namespace rtl_OStringBuffer
 
         void append_098()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -4;
             sal_Int16              radix = 36;
@@ -13582,7 +13580,7 @@ namespace rtl_OStringBuffer
 
         void append_099()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -8;
             sal_Int16              radix = 36;
@@ -13602,7 +13600,7 @@ namespace rtl_OStringBuffer
 
         void append_100()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( aStrBuf.getStr() );
             sal_Int64              input = -35;
             sal_Int16              radix = 36;
@@ -13690,7 +13688,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( kTestStr59 );
             sal_Int64              input = 11;
 
@@ -13707,7 +13705,7 @@ namespace rtl_OStringBuffer
 
         void append_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( kTestStr62 );
             sal_Int64              input = 0;
 
@@ -13724,7 +13722,7 @@ namespace rtl_OStringBuffer
 
         void append_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( kTestStr63 );
             sal_Int64              input = -11;
 
@@ -13741,7 +13739,7 @@ namespace rtl_OStringBuffer
 
         void append_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( kTestStr116 );
             sal_Int64              input = SAL_CONST_INT64(9223372036854775807);
             aStrBuf.append( input );
@@ -13757,7 +13755,7 @@ namespace rtl_OStringBuffer
 
         void append_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             OString                expVal( kTestStr117 );
             sal_Int64              input = SAL_MIN_INT64/*-9223372036854775808*/; // LLA: this is not the same :-( kNonSInt64Max;
 
@@ -13774,7 +13772,7 @@ namespace rtl_OStringBuffer
 
         void append_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( kTestStr60 );
             sal_Int64              input = 11;
 
@@ -13791,7 +13789,7 @@ namespace rtl_OStringBuffer
 
         void append_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( kTestStr66 );
             sal_Int64              input = 0;
 
@@ -13808,7 +13806,7 @@ namespace rtl_OStringBuffer
 
         void append_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( kTestStr67 );
             sal_Int64              input = -11;
 
@@ -13825,7 +13823,7 @@ namespace rtl_OStringBuffer
 
         void append_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( kTestStr118 );
             sal_Int64              input = SAL_CONST_INT64(9223372036854775807);
             aStrBuf.append( input );
@@ -13841,7 +13839,7 @@ namespace rtl_OStringBuffer
 
         void append_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             OString                expVal( kTestStr119 );
             sal_Int64              input = SAL_MIN_INT64; // LLA: this is not the same :-( kNonSInt64Max;
 
@@ -13858,7 +13856,7 @@ namespace rtl_OStringBuffer
 
         void append_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( kTestStr60 );
             sal_Int64              input = 11;
 
@@ -13875,7 +13873,7 @@ namespace rtl_OStringBuffer
 
         void append_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( kTestStr66 );
             sal_Int64              input = 0;
 
@@ -13892,7 +13890,7 @@ namespace rtl_OStringBuffer
 
         void append_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( kTestStr67 );
             sal_Int64              input = -11;
 
@@ -13909,7 +13907,7 @@ namespace rtl_OStringBuffer
 
         void append_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( kTestStr118 );
             sal_Int64              input = SAL_CONST_INT64(9223372036854775807);
             aStrBuf.append( input );
@@ -13925,7 +13923,7 @@ namespace rtl_OStringBuffer
 
         void append_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             OString                expVal( kTestStr119 );
             sal_Int64              input = SAL_MIN_INT64; // LLA: this is not the same :-( kNonSInt64Max;
 
@@ -13942,7 +13940,7 @@ namespace rtl_OStringBuffer
 
         void append_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( kTestStr60 );
             sal_Int64              input = 11;
 
@@ -13959,7 +13957,7 @@ namespace rtl_OStringBuffer
 
         void append_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( kTestStr66 );
             sal_Int64              input = 0;
 
@@ -13976,7 +13974,7 @@ namespace rtl_OStringBuffer
 
         void append_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( kTestStr67 );
             sal_Int64              input = -11;
 
@@ -13993,7 +13991,7 @@ namespace rtl_OStringBuffer
 
         void append_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( kTestStr118 );
             sal_Int64              input = SAL_CONST_INT64(9223372036854775807);
             aStrBuf.append( input );
@@ -14009,7 +14007,7 @@ namespace rtl_OStringBuffer
 
         void append_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             OString                expVal( kTestStr119 );
             sal_Int64              input = SAL_MIN_INT64; // LLA: this is not the same :-( kNonSInt64Max;
 
@@ -14026,7 +14024,7 @@ namespace rtl_OStringBuffer
 
         void append_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( kTestStr61 );
             sal_Int64              input = 11;
 
@@ -14043,7 +14041,7 @@ namespace rtl_OStringBuffer
 
         void append_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( kTestStr70 );
             sal_Int64              input = 0;
 
@@ -14060,7 +14058,7 @@ namespace rtl_OStringBuffer
 
         void append_023()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( kTestStr71 );
             sal_Int64              input = -11;
 
@@ -14077,7 +14075,7 @@ namespace rtl_OStringBuffer
 
         void append_024()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( kTestStr120 );
             sal_Int64              input = SAL_CONST_INT64(9223372036854775807);
             aStrBuf.append( input );
@@ -14093,7 +14091,7 @@ namespace rtl_OStringBuffer
 
         void append_025()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             OString                expVal( kTestStr121 );
             sal_Int64              input = SAL_MIN_INT64; // LLA: this is not the same :-( kNonSInt64Max;
 
@@ -14110,7 +14108,7 @@ namespace rtl_OStringBuffer
 #ifdef WITH_CORE
         void append_026()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt64Max );
+            OStringBuffer   aStrBuf( kSInt64Max );
             OString                expVal( kTestStr60 );
             sal_Int64              input = 11;
 
@@ -14127,7 +14125,7 @@ namespace rtl_OStringBuffer
 
         void append_027()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt64Max );
+            OStringBuffer   aStrBuf( kSInt64Max );
             OString                expVal( kTestStr66 );
             sal_Int64              input = 0;
 
@@ -14144,7 +14142,7 @@ namespace rtl_OStringBuffer
 
         void append_028()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt64Max );
+            OStringBuffer   aStrBuf( kSInt64Max );
             OString                expVal( kTestStr67 );
             sal_Int64              input = -11;
 
@@ -14161,7 +14159,7 @@ namespace rtl_OStringBuffer
 
         void append_029()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt64Max );
+            OStringBuffer   aStrBuf( kSInt64Max );
             OString                expVal( kTestStr118 );
             sal_Int64              input = 9223372036854775807;
 
@@ -14178,7 +14176,7 @@ namespace rtl_OStringBuffer
 
         void append_030()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt64Max );
+            OStringBuffer   aStrBuf( kSInt64Max );
             OString                expVal( kTestStr119 );
             sal_Int64              input = SAL_MIN_INT64; // LLA: this is not the same :-( kNonSInt64Max;
 
@@ -14235,7 +14233,7 @@ namespace rtl_OStringBuffer
     class checkfloat : public CppUnit::TestFixture
     {
     public:
-        bool checkIfStrBufContainAtPosTheFloat(rtl::OStringBuffer const& _sStrBuf, sal_Int32 _nLen, float _nFloat)
+        bool checkIfStrBufContainAtPosTheFloat(OStringBuffer const& _sStrBuf, sal_Int32 _nLen, float _nFloat)
             {
                 OString sFloatValue;
                 sFloatValue = OString::number(_nFloat);
@@ -14262,7 +14260,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("3.0"));
 
             // LLA:
@@ -14282,7 +14280,7 @@ namespace rtl_OStringBuffer
 
         void append_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("3.5"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14298,7 +14296,7 @@ namespace rtl_OStringBuffer
 
         void append_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("3.0625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14314,7 +14312,7 @@ namespace rtl_OStringBuffer
 
         void append_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("3.502525"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14330,7 +14328,7 @@ namespace rtl_OStringBuffer
 
         void append_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("3.141592"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14346,7 +14344,7 @@ namespace rtl_OStringBuffer
 
         void append_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("3.5025255"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14362,7 +14360,7 @@ namespace rtl_OStringBuffer
 
         void append_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("3.00390625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14378,7 +14376,7 @@ namespace rtl_OStringBuffer
 
         void append_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("3.0"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14394,7 +14392,7 @@ namespace rtl_OStringBuffer
 
         void append_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("3.5"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14410,7 +14408,7 @@ namespace rtl_OStringBuffer
 
         void append_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("3.0625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14426,7 +14424,7 @@ namespace rtl_OStringBuffer
 
         void append_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("3.502525"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14442,7 +14440,7 @@ namespace rtl_OStringBuffer
 
         void append_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("3.141592"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14458,7 +14456,7 @@ namespace rtl_OStringBuffer
 
         void append_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("3.5025255"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14474,7 +14472,7 @@ namespace rtl_OStringBuffer
 
         void append_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("3.00390625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14490,7 +14488,7 @@ namespace rtl_OStringBuffer
 
         void append_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("3.0"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14506,7 +14504,7 @@ namespace rtl_OStringBuffer
 
         void append_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("3.5"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14522,7 +14520,7 @@ namespace rtl_OStringBuffer
 
         void append_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("3.0625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14538,7 +14536,7 @@ namespace rtl_OStringBuffer
 
         void append_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("3.502525"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14554,7 +14552,7 @@ namespace rtl_OStringBuffer
 
         void append_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("3.141592"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14570,7 +14568,7 @@ namespace rtl_OStringBuffer
 
         void append_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("3.5025255"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14586,7 +14584,7 @@ namespace rtl_OStringBuffer
 
         void append_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("3.00390625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14602,7 +14600,7 @@ namespace rtl_OStringBuffer
 
         void append_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             float                  input = static_cast<float>(atof("3.0"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14618,7 +14616,7 @@ namespace rtl_OStringBuffer
 
         void append_023()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             float                  input = static_cast<float>(atof("3.5"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14634,7 +14632,7 @@ namespace rtl_OStringBuffer
 
         void append_024()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             float                  input = static_cast<float>(atof("3.0625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14650,7 +14648,7 @@ namespace rtl_OStringBuffer
 
         void append_025()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             float                  input = static_cast<float>(atof("3.502525"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14667,7 +14665,7 @@ namespace rtl_OStringBuffer
 #ifdef WITH_CORE
         void append_036()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14683,7 +14681,7 @@ namespace rtl_OStringBuffer
 
         void append_037()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14699,7 +14697,7 @@ namespace rtl_OStringBuffer
 
         void append_038()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14715,7 +14713,7 @@ namespace rtl_OStringBuffer
 
         void append_039()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14731,7 +14729,7 @@ namespace rtl_OStringBuffer
 
         void append_040()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14747,7 +14745,7 @@ namespace rtl_OStringBuffer
 
         void append_041()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14763,7 +14761,7 @@ namespace rtl_OStringBuffer
 
         void append_042()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14832,7 +14830,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("-3.0"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14848,7 +14846,7 @@ namespace rtl_OStringBuffer
 
         void append_002()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("-3.5"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14864,7 +14862,7 @@ namespace rtl_OStringBuffer
 
         void append_003()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("-3.0625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14880,7 +14878,7 @@ namespace rtl_OStringBuffer
 
         void append_004()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("-3.502525"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14896,7 +14894,7 @@ namespace rtl_OStringBuffer
 
         void append_005()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("-3.141592"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14912,7 +14910,7 @@ namespace rtl_OStringBuffer
 
         void append_006()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("-3.5025255"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14928,7 +14926,7 @@ namespace rtl_OStringBuffer
 
         void append_007()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             float                  input = static_cast<float>(atof("-3.00390625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14944,7 +14942,7 @@ namespace rtl_OStringBuffer
 
         void append_008()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("-3.0"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14960,7 +14958,7 @@ namespace rtl_OStringBuffer
 
         void append_009()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("-3.5"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14976,7 +14974,7 @@ namespace rtl_OStringBuffer
 
         void append_010()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("-3.0625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -14992,7 +14990,7 @@ namespace rtl_OStringBuffer
 
         void append_011()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("-3.502525"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15008,7 +15006,7 @@ namespace rtl_OStringBuffer
 
         void append_012()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("-3.141592"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15024,7 +15022,7 @@ namespace rtl_OStringBuffer
 
         void append_013()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("-3.5025255"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15040,7 +15038,7 @@ namespace rtl_OStringBuffer
 
         void append_014()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[1] );
+            OStringBuffer   aStrBuf( arrOUS[1] );
             float                  input = static_cast<float>(atof("-3.00390625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15056,7 +15054,7 @@ namespace rtl_OStringBuffer
 
         void append_015()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("-3.0"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15072,7 +15070,7 @@ namespace rtl_OStringBuffer
 
         void append_016()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("-3.5"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15088,7 +15086,7 @@ namespace rtl_OStringBuffer
 
         void append_017()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("-3.0625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15104,7 +15102,7 @@ namespace rtl_OStringBuffer
 
         void append_018()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("-3.502525"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15120,7 +15118,7 @@ namespace rtl_OStringBuffer
 
         void append_019()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("-3.141592"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15136,7 +15134,7 @@ namespace rtl_OStringBuffer
 
         void append_020()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("-3.5025255"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15152,7 +15150,7 @@ namespace rtl_OStringBuffer
 
         void append_021()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[2] );
+            OStringBuffer   aStrBuf( arrOUS[2] );
             float                  input = static_cast<float>(atof("-3.00390625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15168,7 +15166,7 @@ namespace rtl_OStringBuffer
 
         void append_022()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             float                  input = static_cast<float>(atof("-3.0"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15184,7 +15182,7 @@ namespace rtl_OStringBuffer
 
         void append_023()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             float                  input = static_cast<float>(atof("-3.5"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15200,7 +15198,7 @@ namespace rtl_OStringBuffer
 
         void append_024()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             float                  input = static_cast<float>(atof("-3.0625"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15216,7 +15214,7 @@ namespace rtl_OStringBuffer
 
         void append_025()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[3] );
+            OStringBuffer   aStrBuf( arrOUS[3] );
             float                  input = static_cast<float>(atof("-3.502525"));
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15233,7 +15231,7 @@ namespace rtl_OStringBuffer
 #ifdef WITH_CORE
         void append_036()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15249,7 +15247,7 @@ namespace rtl_OStringBuffer
 
         void append_037()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15265,7 +15263,7 @@ namespace rtl_OStringBuffer
 
         void append_038()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15281,7 +15279,7 @@ namespace rtl_OStringBuffer
 
         void append_039()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15297,7 +15295,7 @@ namespace rtl_OStringBuffer
 
         void append_040()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15313,7 +15311,7 @@ namespace rtl_OStringBuffer
 
         void append_041()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15329,7 +15327,7 @@ namespace rtl_OStringBuffer
 
         void append_042()
         {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
+            OStringBuffer   aStrBuf( kSInt32Max );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15385,7 +15383,7 @@ namespace rtl_OStringBuffer
     class checkdouble : public CppUnit::TestFixture
     {
     public:
-        bool checkIfStrBufContainAtPosTheDouble(rtl::OStringBuffer const& _sStrBuf, sal_Int32 _nLen, double _nDouble)
+        bool checkIfStrBufContainAtPosTheDouble(OStringBuffer const& _sStrBuf, sal_Int32 _nLen, double _nDouble)
             {
                 OString sDoubleValue;
                 sDoubleValue = OString::number(_nDouble);
@@ -15412,7 +15410,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             double                 input = atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15428,7 +15426,7 @@ namespace rtl_OStringBuffer
 
         void append_035()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             double                 input = atof("3.141592653589793238462643");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15466,7 +15464,7 @@ namespace rtl_OStringBuffer
 
         void append_001()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[0] );
+            OStringBuffer   aStrBuf( arrOUS[0] );
             double                 input = atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15482,7 +15480,7 @@ namespace rtl_OStringBuffer
 
         void append_035()
         {
-            ::rtl::OStringBuffer   aStrBuf( arrOUS[4] );
+            OStringBuffer   aStrBuf( arrOUS[4] );
             double                 input = atof("-3.141592653589793238462643");
 
             sal_Int32 nLen = aStrBuf.getLength();
diff --git a/sal/qa/inc/stringhelper.hxx b/sal/qa/inc/stringhelper.hxx
index e7a03287a32e..5bce6ebbb7e9 100644
--- a/sal/qa/inc/stringhelper.hxx
+++ b/sal/qa/inc/stringhelper.hxx
@@ -23,9 +23,9 @@
 #include <rtl/ustring.hxx>
 #include <rtl/string.hxx>
 
-inline void operator <<= (rtl::OString& _rAsciiString, rtl::OUString const & _rUnicodeString)
+inline void operator <<= (OString& _rAsciiString, OUString const & _rUnicodeString)
 {
-    _rAsciiString = rtl::OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US);
+    _rAsciiString = OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US);
 }
 
 #endif
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index 61082aaba791..6bcf9e73018d 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -38,7 +38,7 @@
 
 // condition names
 
-::rtl::OUString aTestCon( "testcondition" );
+OUString aTestCon( "testcondition" );
 
 const char pTestString[17] = "Sun Microsystems";
 
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index ed77b6d4484e..40bb81fb807a 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -109,7 +109,7 @@ OUString aUserDirectorySys( TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "" );
 // common used URL:temp, canonical, root, relative, link,etc
 
 OUString aCanURL1( FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/canonical.name" );
-rtl::OUString aCanURL2(
+OUString aCanURL2(
     RTL_CONSTASCII_USTRINGPARAM("ca@#;+.,$///78no\0ni..name"));
 OUString aCanURL3( "ca@#;+.,$//tmp/678nonical//name" );
 OUString aCanURL4( "canonical.name" );
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx
index f093d5fe1bb8..ee89b836d78b 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -78,8 +78,6 @@ const char * const aSource2[ ] =
 };
 #endif
 
-using ::rtl::OUString;
-
 void oldtestfile::test_file_001()
 {
 #ifndef _WIN32
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index a4c1ba44b0f6..41e9f88c9fea 100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -35,7 +35,7 @@ public:
         FileBase::RC err;
 
         //create a tempfile
-        rtl::OUString aTmpFile;
+        OUString aTmpFile;
         err = FileBase::createTempFile(nullptr, nullptr, &aTmpFile);
         CPPUNIT_ASSERT_EQUAL_MESSAGE("temp File creation failed", osl::FileBase::E_None, err);
 
@@ -43,8 +43,8 @@ public:
         File tmp_file(aTmpFile);
         err = tmp_file.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
 
-        rtl::OString sErrorMsg = "Expected that '";
-        sErrorMsg += rtl::OUStringToOString(aTmpFile, RTL_TEXTENCODING_ASCII_US);
+        OString sErrorMsg = "Expected that '";
+        sErrorMsg += OUStringToOString(aTmpFile, RTL_TEXTENCODING_ASCII_US);
         sErrorMsg += "' would exist!";
         CPPUNIT_ASSERT_EQUAL_MESSAGE(sErrorMsg.getStr(), FileBase::E_EXIST, err);
 
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index 9910925e3c5a..97d5cc1beaf4 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -23,19 +23,17 @@
 
 using namespace osl;
 
-using ::rtl::OUString;
-
 /** get dll file URL.
 */
-static ::rtl::OUString getDllURL()
+static OUString getDllURL()
 {
 #if defined(_WIN32)        // lib in Unix and lib in Windows are not same in file name.
-    ::rtl::OUString libPath( "test_Module_DLL.dll" );
+    OUString libPath( "test_Module_DLL.dll" );
 #else
-    ::rtl::OUString libPath( "libtest_Module_DLL.so" );
+    OUString libPath( "libtest_Module_DLL.so" );
 #endif
 
-    ::rtl::OUString dirPath, dllPath;
+    OUString dirPath, dllPath;
     osl::Module::getUrlFromAddress(
         reinterpret_cast<oslGenericFunction>(&getDllURL), dirPath);
     dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') + 1);
@@ -61,7 +59,7 @@ namespace osl_Module
 
     /** testing the methods:
         Module();
-        Module( const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT);
+        Module( const OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT);
     */
     class ctors : public CppUnit::TestFixture
     {
@@ -105,7 +103,7 @@ namespace osl_Module
     }; // class ctors
 
     /** testing the methods:
-        static sal_Bool getUrlFromAddress(void * addr, ::rtl::OUString & libraryUrl)
+        static sal_Bool getUrlFromAddress(void * addr, OUString & libraryUrl)
     */
     class getUrlFromAddress : public CppUnit::TestFixture
     {
@@ -164,7 +162,7 @@ namespace osl_Module
     }; // class getUrlFromAddress
 
     /** testing the method:
-        sal_Bool SAL_CALL load( const ::rtl::OUString& strModuleName,
+        sal_Bool SAL_CALL load( const OUString& strModuleName,
                                                  sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT)
     */
     class load : public CppUnit::TestFixture
@@ -252,7 +250,7 @@ namespace osl_Module
     }; // class is
 
     /** testing the methods:
-        void* SAL_CALL getSymbol( const ::rtl::OUString& strSymbolName)
+        void* SAL_CALL getSymbol( const OUString& strSymbolName)
     */
     class getSymbol : public CppUnit::TestFixture
     {
@@ -312,7 +310,7 @@ namespace osl_Module
 #if !defined( MACOSX )
             // TODO: Find out why this fails on Mac OS X
             ::osl::Module aMod( getDllURL( ) );
-            ::rtl::OUString funcName( "firstfunc" );
+            OUString funcName( "firstfunc" );
 
             FuncPtr pFunc = reinterpret_cast<FuncPtr>(osl_getSymbol( static_cast<oslModule>(aMod), funcName.pData ));
             bRes = false;
@@ -333,7 +331,7 @@ namespace osl_Module
     }; // class optr_oslModule
 
     /** testing the methods:
-        oslGenericFunction SAL_CALL getFunctionSymbol( const ::rtl::OUString& ustrFunctionSymbolName )
+        oslGenericFunction SAL_CALL getFunctionSymbol( const OUString& ustrFunctionSymbolName )
     */
     class getFunctionSymbol : public CppUnit::TestFixture
     {
@@ -346,7 +344,7 @@ namespace osl_Module
             // TODO: Find out why this fails on Mac OS X
             ::osl::Module aMod( getDllURL( ) );
             oslGenericFunction oslFunc = aMod.getFunctionSymbol( "firstfunc" );
-            ::rtl::OUString aLibraryURL;
+            OUString aLibraryURL;
             bRes = ::osl::Module::getUrlFromAddress( oslFunc, aLibraryURL);
             aMod.unload();
             CPPUNIT_ASSERT_MESSAGE( "#test comment#: load a dll and get its function addr and get its URL.",
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index d50921d4ff8c..482ae750f36f 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -39,9 +39,6 @@
 
 using namespace osl;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-
 /** print last error of pipe system.
  */
 static void printPipeError( ::osl::Pipe const & aPipe )
@@ -90,9 +87,9 @@ static void printPipeError( ::osl::Pipe const & aPipe )
 
 // pipe name and transfer contents
 
-const rtl::OUString aTestPipeName("testpipe2");
-const rtl::OUString aTestPipe1("testpipe1");
-const rtl::OUString aTestString("Sun Microsystems");
+const OUString aTestPipeName("testpipe2");
+const OUString aTestPipe1("testpipe1");
+const OUString aTestString("Sun Microsystems");
 
 const OString m_pTestString1("Sun Microsystems");
 const OString m_pTestString2("test pipe PASS/OK");
@@ -108,8 +105,8 @@ namespace osl_Pipe
 
     /** testing the methods:
         inline Pipe();
-        inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options);
-        inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options,const Security & rSecurity);
+        inline Pipe(const OUString& strName, oslPipeOptions Options);
+        inline Pipe(const OUString& strName, oslPipeOptions Options,const Security & rSecurity);
         inline Pipe(const Pipe& pipe);
         inline Pipe(oslPipe pipe, __sal_NoAcquire noacquire );
         inline Pipe(oslPipe Pipe);
@@ -264,9 +261,9 @@ namespace osl_Pipe
     };
 
     /** testing the methods:
-        inline sal_Bool create( const ::rtl::OUString & strName,
+        inline sal_Bool create( const OUString & strName,
         oslPipeOptions Options, const Security &rSec );
-        nline sal_Bool create( const ::rtl::OUString & strName,
+        nline sal_Bool create( const OUString & strName,
         oslPipeOptions Options = osl_Pipe_OPEN );
     */
     class create : public CppUnit::TestFixture
@@ -611,8 +608,8 @@ namespace osl_StreamPipe
         inline StreamPipe();
         inline StreamPipe(oslPipe Pipe);
         inline StreamPipe(const StreamPipe& Pipe);
-        inline StreamPipe(const ::rtl::OUString& strName, oslPipeOptions Options = osl_Pipe_OPEN);
-        inline StreamPipe(const ::rtl::OUString& strName, oslPipeOptions Options, const Security &rSec );
+        inline StreamPipe(const OUString& strName, oslPipeOptions Options = osl_Pipe_OPEN);
+        inline StreamPipe(const OUString& strName, oslPipeOptions Options, const Security &rSec );
         inline StreamPipe( oslPipe pipe, __sal_NoAcquire noacquire );
     */
     class ctors : public CppUnit::TestFixture
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 770b82691286..bfd17db06174 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -48,8 +48,6 @@
 
 using namespace osl;
 
-using ::rtl::OString;
-
 // Small stopwatch
 class StopWatch {
     TimeValue t1,t2;                                // Start and stoptime
@@ -935,9 +933,9 @@ namespace osl_Thread
     {
     public:
         // insert your test code here.
-        rtl::OString getPrioName(oslThreadPriority _aPriority)
+        OString getPrioName(oslThreadPriority _aPriority)
             {
-                rtl::OString sPrioStr;
+                OString sPrioStr;
                 switch (_aPriority)
                 {
                 case osl_Thread_PriorityHighest:
@@ -997,7 +995,7 @@ namespace osl_Thread
                 sal_Int32 nValueNormal2 = 0;
                 nValueNormal2 = p2Thread->getValue();
 
-                rtl::OString sPrio = getPrioName(_aPriority);
+                OString sPrio = getPrioName(_aPriority);
                 t_print("After 10 tenth seconds\n");
 
                 t_print("nValue in %s Prio Thread is  %d\n",sPrio.getStr(), static_cast<int>(nValueNormal));
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 1f484060e393..f08777d4f1ac 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -65,15 +65,11 @@
 
 using namespace osl;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
-
 /** get binary Path.
 */
-static ::rtl::OUString getExecutablePath()
+static OUString getExecutablePath()
 {
-    ::rtl::OUString dirPath;
+    OUString dirPath;
     osl::Module::getUrlFromAddress(
         reinterpret_cast<oslGenericFunction>(&getExecutablePath), dirPath);
     dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') );
@@ -405,9 +401,9 @@ public:
     {
         oslProcess process;
 #if defined(_WIN32)
-        rtl::OUString suBatch = suCWD + "/batch.bat";
+        OUString suBatch = suCWD + "/batch.bat";
 #else
-        rtl::OUString suBatch = suCWD + "/batch.sh";
+        OUString suBatch = suCWD + "/batch.sh";
 #endif
         oslProcessError osl_error = osl_executeProcess(
             suBatch.pData,
diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx
index 46201a258fa3..d1556bb157ae 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -40,11 +40,11 @@ namespace osl_Profile
 
 void oldtests::test_profile()
 {
-    rtl::OUString baseUrl;
+    OUString baseUrl;
     CPPUNIT_ASSERT(rtl::Bootstrap::get("UserInstallation", baseUrl));
 
     // successful write
-    oslProfile hProfile = osl_openProfile( rtl::OUString(baseUrl + "/soffice.ini").pData, osl_Profile_WRITELOCK );
+    oslProfile hProfile = osl_openProfile( OUString(baseUrl + "/soffice.ini").pData, osl_Profile_WRITELOCK );
     CPPUNIT_ASSERT(hProfile != nullptr);
     CPPUNIT_ASSERT_MESSAGE(
         "cannot write into init file",
@@ -52,7 +52,7 @@ void oldtests::test_profile()
     CPPUNIT_ASSERT(osl_closeProfile( hProfile ));
 
     // unsuccessful open
-    CPPUNIT_ASSERT_EQUAL(oslProfile(nullptr), osl_openProfile( rtl::OUString(baseUrl + "/not_existing_path/soffice.ini").pData, osl_Profile_WRITELOCK ));
+    CPPUNIT_ASSERT_EQUAL(oslProfile(nullptr), osl_openProfile( OUString(baseUrl + "/not_existing_path/soffice.ini").pData, osl_Profile_WRITELOCK ));
 }
 
 } // namespace osl_Profile
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 85b0e8f0fb0b..8f9980844530 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -38,12 +38,12 @@ using namespace rtl;
 
 /** print a UNI_CODE String.
 */
-static void printUString( const ::rtl::OUString & str )
+static void printUString( const OUString & str )
 {
-    rtl::OString aString;
+    OString aString;
 
     //t_print("#printUString_u# " );
-    aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
+    aString = OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
     t_print("%s\n", aString.getStr( ) );
 }
 
@@ -74,11 +74,11 @@ namespace osl_Security
     }; // class ctors
 
     /** testing the methods:
-        inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString& strName,
-                                       const ::rtl::OUString& strPasswd);
-        inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString & strName,
-                                       const ::rtl::OUString & strPasswd,
-                                       const ::rtl::OUString & strFileServer);
+        inline sal_Bool SAL_CALL logonUser(const OUString& strName,
+                                       const OUString& strPasswd);
+        inline sal_Bool SAL_CALL logonUser(const OUString & strName,
+                                       const OUString & strPasswd,
+                                       const OUString & strFileServer);
     */
     class logonUser : public CppUnit::TestFixture
     {
@@ -118,7 +118,7 @@ namespace osl_Security
     }; // class logonUser
 
     /** testing the method:
-        inline sal_Bool Security::getUserIdent( rtl::OUString& strIdent) const
+        inline sal_Bool Security::getUserIdent( OUString& strIdent) const
     */
     class getUserIdent : public CppUnit::TestFixture
     {
@@ -128,14 +128,14 @@ namespace osl_Security
         void getUserIdent_001( )
         {
             ::osl::Security aSec;
-            ::rtl::OUString strID;
+            OUString strID;
             bRes = aSec.getUserIdent( strID );
 
-            rtl::OStringBuffer aMessage;
+            OStringBuffer aMessage;
             aMessage.append("strUserID: ");
-            aMessage.append(rtl::OUStringToOString(strUserID, osl_getThreadTextEncoding()));
+            aMessage.append(OUStringToOString(strUserID, osl_getThreadTextEncoding()));
             aMessage.append(", strID: ");
-            aMessage.append(rtl::OUStringToOString(strID, osl_getThreadTextEncoding()));
+            aMessage.append(OUStringToOString(strID, osl_getThreadTextEncoding()));
             aMessage.append(", bRes: ");
             aMessage.append(bRes);
 
@@ -149,7 +149,7 @@ namespace osl_Security
     }; // class getUserIdent
 
     /** testing the method:
-        inline sal_Bool SAL_CALL getUserName( ::rtl::OUString& strName) const;
+        inline sal_Bool SAL_CALL getUserName( OUString& strName) const;
     */
     class getUserName : public CppUnit::TestFixture
     {
@@ -160,9 +160,9 @@ namespace osl_Security
         {
             ::osl::Security aSec;
 #ifdef _WIN32
-            ::rtl::OUString strName( strUserName ), strGetName;
+            OUString strName( strUserName ), strGetName;
 #else
-            ::rtl::OUString strName( strUserName ), strGetName;
+            OUString strName( strUserName ), strGetName;
 #endif
             bRes = aSec.getUserName( strGetName );
 
@@ -183,7 +183,7 @@ namespace osl_Security
     }; // class getUserName
 
     /** testing the method:
-        inline sal_Bool Security::getConfigDir( rtl::OUString& strDirectory ) const
+        inline sal_Bool Security::getConfigDir( OUString& strDirectory ) const
     */
     class getConfigDir : public CppUnit::TestFixture
     {
@@ -193,7 +193,7 @@ namespace osl_Security
         void getConfigDir_001( )
         {
             ::osl::Security aSec;
-            ::rtl::OUString strConfig;
+            OUString strConfig;
             bRes = aSec.getConfigDir( strConfig );
 
             CPPUNIT_ASSERT_MESSAGE( "failed to find a ConfigDir!", bRes );
@@ -279,9 +279,9 @@ namespace osl_Security
 
         void loginUserOnFileServer_001( )
             {
-                rtl::OUString suUserName;
-                rtl::OUString suPassword;
-                rtl::OUString suFileServer;
+                OUString suUserName;
+                OUString suPassword;
+                OUString suFileServer;
                 ::osl::Security aSec;
                 oslSecurity pSec = aSec.getHandle();
 
@@ -342,14 +342,14 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
     strUserID = OUString::number( getuid( ) );
 
     /// get user Name;
-    strUserName = ::rtl::OUString::createFromAscii( pw->pw_name );
+    strUserName = OUString::createFromAscii( pw->pw_name );
 
     /// get home directory;
     char *pw_dir = pw->pw_dir;
     if( getenv( "FAKEROOTKEY" ) )
         pw_dir = getenv("HOME");
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "#Convert from system path to URL failed.",
-                            ::osl::File::E_None, ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw_dir ), strHomeDirectory ) );
+                            ::osl::File::E_None, ::osl::File::getFileURLFromSystemPath( OUString::createFromAscii( pw_dir ), strHomeDirectory ) );
 
     /// get config directory;
     strConfigDirectory = strHomeDirectory.copy(0);
@@ -553,12 +553,12 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
         t_print("Administrator.\n" );
 
     /// get and display forwarded text if available.
-    rtl::OUString args[ 3 ];
+    OUString args[ 3 ];
     int argsCount = 0;
     sal_uInt32 n = rtl_getAppCommandArgCount();
     for (sal_uInt32 i = 0; i < n; ++i)
     {
-        rtl::OUString arg;
+        OUString arg;
         rtl_getAppCommandArg(i, &arg.pData);
         if( arg.startsWith("-") )
             continue;
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index 83dd21f31f14..58f578814693 100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -47,9 +47,9 @@
 #define BUFSIZE 1024
 const char pTestString[17] = "Sun Microsystems";
 
-::rtl::OUString aLogonUser, aLogonPasswd, aFileServer, aStringForward;
-::rtl::OUString strUserName, strComputerName, strHomeDirectory;
-::rtl::OUString strConfigDirectory, strUserID;
+OUString aLogonUser, aLogonPasswd, aFileServer, aStringForward;
+OUString strUserName, strComputerName, strHomeDirectory;
+OUString strConfigDirectory, strUserID;
 
 bool isAdmin = false;
 
diff --git a/sal/qa/rtl/bootstrap/expand.cxx b/sal/qa/rtl/bootstrap/expand.cxx
index a4102d38bc3b..e9799c15f37c 100644
--- a/sal/qa/rtl/bootstrap/expand.cxx
+++ b/sal/qa/rtl/bootstrap/expand.cxx
@@ -40,15 +40,15 @@ void Test::setUp() {
 }
 
 void Test::testDollar() {
-    rtl::OUString s("$WITH_DOLLAR");
+    OUString s("$WITH_DOLLAR");
     rtl::Bootstrap::expandMacros(s);
-    CPPUNIT_ASSERT_EQUAL(rtl::OUString("foo$TEST"), s);
+    CPPUNIT_ASSERT_EQUAL(OUString("foo$TEST"), s);
 }
 
 void Test::testIndirectDollar() {
-    rtl::OUString s("$INDIRECT");
+    OUString s("$INDIRECT");
     rtl::Bootstrap::expandMacros(s);
-    CPPUNIT_ASSERT_EQUAL(rtl::OUString("foo$TEST"), s);
+    CPPUNIT_ASSERT_EQUAL(OUString("foo$TEST"), s);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index 57c22eb573ac..1f6852184b43 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -154,7 +154,7 @@ class decode : public CppUnit::TestFixture
 {
 public:
 
-    void test_encode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, rtl::OString const& _sPlainTextStr)
+    void test_encode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, OString const& _sPlainTextStr)
         {
             rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB);
 #if defined LIBO_CIPHER_OPENSSL_BACKEND
@@ -209,7 +209,7 @@ public:
 #endif
         }
 
-    void test_encode_and_decode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, rtl::OString const& _sPlainTextStr)
+    void test_encode_and_decode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, OString const& _sPlainTextStr)
         {
             rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB);
 #if defined LIBO_CIPHER_OPENSSL_BACKEND
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 33b2bfeb3212..6bc9070be05c 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -248,7 +248,7 @@ public:
 
         CPPUNIT_ASSERT_EQUAL(rtl_Digest_E_None, aError);
 
-        rtl::OString aKey = createHex(pKeyBuffer.get(), nKeyLen);
+        OString aKey = createHex(pKeyBuffer.get(), nKeyLen);
 
         // OString sSalt = createHex(pSaltData, nSaltDataLen);
         // printf("Salt: %s\n", sSalt.getStr());
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index befc16f36e92..1975057e33e3 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -46,9 +46,9 @@
 #define CONST_TEST_STRING "gregorian"
 
 namespace {
-struct Gregorian : public rtl::StaticWithInit<rtl::OUString, Gregorian> {
-    const rtl::OUString operator () () {
-        return rtl::OUString( CONST_TEST_STRING );
+struct Gregorian : public rtl::StaticWithInit<OUString, Gregorian> {
+    const OUString operator () () {
+        return OUString( CONST_TEST_STRING );
     }
 };
 }
@@ -83,7 +83,7 @@ class OGetThread : public osl::Thread
     sal_Int32 m_nOK;
     sal_Int32 m_nFails;
 
-    rtl::OUString m_sConstStr;
+    OUString m_sConstStr;
 public:
     OGetThread()
             :m_nOK(0),
@@ -105,7 +105,7 @@ protected:
         {
             while(schedule())
             {
-                rtl::OUString aStr = Gregorian::get();
+                OUString aStr = Gregorian::get();
                 if (aStr == m_sConstStr)
                 {
                     m_nOK++;
@@ -141,7 +141,7 @@ namespace rtl_DoubleLocking
 
         void getValue_001()
             {
-                rtl::OUString aStr = Gregorian::get();
+                OUString aStr = Gregorian::get();
 
                 CPPUNIT_ASSERT_MESSAGE(
                     "Gregorian::get() failed, wrong value expected.",
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 80807d9ecffd..27e30db9f9d4 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -30,7 +30,7 @@ namespace rtl_locale
     // default locale for test purpose
     static void setDefaultLocale()
     {
-        rtl_locale_setDefault(rtl::OUString("de").getStr(), rtl::OUString("DE").getStr(), /* rtl::OUString() */ rtl::OUString("hochdeutsch").getStr() );
+        rtl_locale_setDefault(OUString("de").getStr(), OUString("DE").getStr(), /* OUString() */ OUString("hochdeutsch").getStr() );
     }
 
 class getDefault : public CppUnit::TestFixture
@@ -76,7 +76,7 @@ public:
     // insert your test code here.
     void setDefault_001()
     {
-        rtl_locale_setDefault(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr());
+        rtl_locale_setDefault(OUString("en").getStr(), OUString("US").getStr(), OUString().getStr());
         rtl_Locale* pData = rtl_locale_getDefault();
         CPPUNIT_ASSERT_MESSAGE("locale must not null", pData != nullptr);
 
@@ -106,13 +106,13 @@ public:
     void getLanguage_001()
     {
         rtl_Locale* pData = rtl_locale_getDefault();
-        rtl::OUString suLanguage = pData->Language;
+        OUString suLanguage = pData->Language;
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale language must be 'de'", OUString("de"), suLanguage );
     }
     void getLanguage_002()
     {
         rtl_Locale* pData = rtl_locale_getDefault();
-        rtl::OUString suLanguage(rtl_locale_getLanguage(pData), SAL_NO_ACQUIRE);
+        OUString suLanguage(rtl_locale_getLanguage(pData), SAL_NO_ACQUIRE);
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale language must be 'de'", OUString("de"), suLanguage );
     }
 
@@ -140,13 +140,13 @@ public:
     void getCountry_001()
     {
         rtl_Locale* pData = rtl_locale_getDefault();
-        rtl::OUString suCountry = pData->Country;
+        OUString suCountry = pData->Country;
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale country must be 'DE'", OUString("DE"), suCountry );
     }
     void getCountry_002()
     {
         rtl_Locale* pData = rtl_locale_getDefault();
-        rtl::OUString suCountry(rtl_locale_getCountry(pData), SAL_NO_ACQUIRE);
+        OUString suCountry(rtl_locale_getCountry(pData), SAL_NO_ACQUIRE);
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale country must be 'DE'", OUString("DE"), suCountry );
     }
 
@@ -174,13 +174,13 @@ public:
     void getVariant_001()
     {
         rtl_Locale* pData = rtl_locale_getDefault();
-        rtl::OUString suVariant = pData->Variant;
+        OUString suVariant = pData->Variant;
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale variant must be 'hochdeutsch'", OUString("hochdeutsch"), suVariant );
     }
     void getVariant_002()
     {
         rtl_Locale* pData = rtl_locale_getDefault();
-        rtl::OUString suVariant(rtl_locale_getVariant(pData), SAL_NO_ACQUIRE);
+        OUString suVariant(rtl_locale_getVariant(pData), SAL_NO_ACQUIRE);
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale variant must be 'hochdeutsch'", OUString("hochdeutsch"), suVariant );
     }
 
@@ -241,8 +241,8 @@ public:
     // insert your test code here.
     void equals_001()
     {
-        rtl_Locale* pData1 = rtl_locale_register(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr());
-        rtl_Locale* pData2 = rtl_locale_register(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr());
+        rtl_Locale* pData1 = rtl_locale_register(OUString("en").getStr(), OUString("US").getStr(), OUString().getStr());
+        rtl_Locale* pData2 = rtl_locale_register(OUString("en").getStr(), OUString("US").getStr(), OUString().getStr());
 
         bool bLocaleAreEqual = (pData1 == pData2);
 
@@ -251,8 +251,8 @@ public:
 
     void equals_002()
     {
-        rtl_Locale* pData1 = rtl_locale_register(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr());
-        rtl_Locale* pData2 = rtl_locale_register(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr());
+        rtl_Locale* pData1 = rtl_locale_register(OUString("en").getStr(), OUString("US").getStr(), OUString().getStr());
+        rtl_Locale* pData2 = rtl_locale_register(OUString("en").getStr(), OUString("US").getStr(), OUString().getStr());
 
         sal_Int32 nEqual = rtl_locale_equals(pData1, pData2);
         CPPUNIT_ASSERT(nEqual != 0);
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx
index 36e404f122e9..214ddb035177 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -54,49 +54,49 @@ public:
         rtl_math_ConversionStatus status;
         sal_Int32 end;
         double res = rtl::math::stringToDouble(
-            rtl::OUString("  +1.E01foo"),
+            OUString("  +1.E01foo"),
             '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(RTL_CONSTASCII_LENGTH("  +1.E01"), end);
         CPPUNIT_ASSERT_EQUAL(10.0, res);
 
         res = rtl::math::stringToDouble(
-                rtl::OUString("NaN"),
+                OUString("NaN"),
                 '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
         CPPUNIT_ASSERT_EQUAL(true, rtl::math::isNan(res));
 
         res = rtl::math::stringToDouble(
-                rtl::OUString("NaN1.23"),
+                OUString("NaN1.23"),
                 '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
         CPPUNIT_ASSERT_EQUAL(true, rtl::math::isNan(res));
 
         res = rtl::math::stringToDouble(
-                rtl::OUString("INF"),
+                OUString("INF"),
                 '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_OutOfRange, status);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
         CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res));
 
         res = rtl::math::stringToDouble(
-                rtl::OUString("INF1.23"),
+                OUString("INF1.23"),
                 '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_OutOfRange, status);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
         CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res));
 
         res = rtl::math::stringToDouble(
-                rtl::OUString(".5"),
+                OUString(".5"),
                 '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(2), end);
         CPPUNIT_ASSERT_EQUAL(0.5, res);
 
         res = rtl::math::stringToDouble(
-                rtl::OUString("5."),
+                OUString("5."),
                 '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(2), end);
@@ -107,28 +107,28 @@ public:
         rtl_math_ConversionStatus status;
         sal_Int32 end;
         double res = rtl::math::stringToDouble(
-            rtl::OUString("  +Efoo"),
+            OUString("  +Efoo"),
             '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
         CPPUNIT_ASSERT_EQUAL(0.0, res);
 
         res = rtl::math::stringToDouble(
-                rtl::OUString("."),
+                OUString("."),
                 '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
         CPPUNIT_ASSERT_EQUAL(0.0, res);
 
         res = rtl::math::stringToDouble(
-                rtl::OUString(" +.Efoo"),
+                OUString(" +.Efoo"),
                 '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
         CPPUNIT_ASSERT_EQUAL(0.0, res);
 
         res = rtl::math::stringToDouble(
-                rtl::OUString(" +,.Efoo"),
+                OUString(" +,.Efoo"),
                 '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
@@ -139,13 +139,13 @@ public:
         rtl_math_ConversionStatus status;
         sal_Int32 end;
         double res = rtl::math::stringToDouble(
-            rtl::OUString("1e"),
+            OUString("1e"),
             '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(RTL_CONSTASCII_LENGTH("1"), end);
         CPPUNIT_ASSERT_EQUAL(1.0, res);
         res = rtl::math::stringToDouble(
-            rtl::OUString("0e"),
+            OUString("0e"),
             '.', ',', &status, &end);
         CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
         CPPUNIT_ASSERT_EQUAL(RTL_CONSTASCII_LENGTH("1"), end);
@@ -155,7 +155,7 @@ public:
     void test_doubleToString() {
         double fVal = 999999999999999.0;
         sal_Int32 aGroups[3] = { 3, 2, 0 };
-        rtl::OUString aRes( rtl::math::doubleToUString( fVal,
+        OUString aRes( rtl::math::doubleToUString( fVal,
                     rtl_math_StringFormat_Automatic,
                     rtl_math_DecimalPlaces_Max,
                     '.', aGroups, ',', true));
diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx
index 1e22a96b5e48..2044750848c3 100644
--- a/sal/qa/rtl/ostring/rtl_OString2.cxx
+++ b/sal/qa/rtl/ostring/rtl_OString2.cxx
@@ -33,8 +33,8 @@ class valueOf : public CppUnit::TestFixture
 {
     void valueOf_float_test_impl(float _nValue)
         {
-            rtl::OString sValue;
-            sValue = rtl::OString::valueOf( _nValue );
+            OString sValue;
+            sValue = OString::valueOf( _nValue );
             printf("nFloat := %.9f  sValue := %s\n", _nValue, sValue.getStr());
 
             float nValueATOF = static_cast<float>(atof( sValue.getStr() ));
@@ -102,8 +102,8 @@ private:
 
     void valueOf_double_test_impl(double _nValue)
         {
-            rtl::OString sValue;
-            sValue = rtl::OString::valueOf( _nValue );
+            OString sValue;
+            sValue = OString::valueOf( _nValue );
             printf("nDouble := %.20f  sValue := %s\n", _nValue, sValue.getStr());
 
             double nValueATOF = atof( sValue.getStr() );
@@ -200,23 +200,23 @@ public:
             // testPrecision a;
         }
 
-    void toDouble_test_impl(rtl::OString const& _sValue)
+    void toDouble_test_impl(OString const& _sValue)
         {
             double nValueATOF = atof( _sValue.getStr() );
 
-            // rtl::OUString suValue = rtl::OUString::createFromAscii( _sValue.getStr() );
+            // OUString suValue = OUString::createFromAscii( _sValue.getStr() );
             double nValueToDouble = _sValue.toDouble();
 
             bool bEqualResult = is_double_equal(nValueToDouble, nValueATOF);
             CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult == true);
         }
 
-    void toDouble_test(rtl::OString const& _sValue)
+    void toDouble_test(OString const& _sValue)
         {
             toDouble_test_impl(_sValue);
 
             // test also the negative part.
-            rtl::OString sNegativValue("-");
+            OString sNegativValue("-");
             sNegativValue += _sValue;
             toDouble_test_impl(sNegativValue);
         }
@@ -246,64 +246,64 @@ public:
 
     void toDouble_test_3()
         {
-            rtl::OString sValue("3");
+            OString sValue("3");
             toDouble_test(sValue);
         }
     void toDouble_test_3_5()
         {
-            rtl::OString sValue("3.5");
+            OString sValue("3.5");
             toDouble_test(sValue);
         }
     void toDouble_test_3_0625()
         {
-            rtl::OString sValue("3.0625");
+            OString sValue("3.0625");
             toDouble_test(sValue);
         }
     void toDouble_test_pi()
         {
             // value from http://www.angio.net/pi/digits/50.txt
-            rtl::OString sValue("3.141592653589793238462643383279502884197169399375");
+            OString sValue("3.141592653589793238462643383279502884197169399375");
             toDouble_test(sValue);
         }
 
     void toDouble_test_1()
         {
-            rtl::OString sValue("1");
+            OString sValue("1");
             toDouble_test(sValue);
         }
     void toDouble_test_10()
         {
-            rtl::OString sValue("10");
+            OString sValue("10");
             toDouble_test(sValue);
         }
     void toDouble_test_100()
         {
-            rtl::OString sValue("100");
+            OString sValue("100");
             toDouble_test(sValue);
         }
     void toDouble_test_1000()
         {
-            rtl::OString sValue("1000");
+            OString sValue("1000");
             toDouble_test(sValue);
         }
     void toDouble_test_10000()
         {
-            rtl::OString sValue("10000");
+            OString sValue("10000");
             toDouble_test(sValue);
         }
     void toDouble_test_1e99()
         {
-            rtl::OString sValue("1e99");
+            OString sValue("1e99");
             toDouble_test(sValue);
         }
     void toDouble_test_1e_n99()
         {
-            rtl::OString sValue("1e-99");
+            OString sValue("1e-99");
             toDouble_test(sValue);
         }
     void toDouble_test_1e308()
         {
-            rtl::OString sValue("1e308");
+            OString sValue("1e308");
             toDouble_test(sValue);
         }
 
@@ -337,12 +337,12 @@ class getToken : public CppUnit::TestFixture
 public:
     void getToken_000()
         {
-            rtl::OString sTokenStr;
+            OString sTokenStr;
 
             sal_Int32 nIndex = 0;
             do
             {
-                rtl::OString sToken = sTokenStr.getToken( 0, ';', nIndex );
+                OString sToken = sTokenStr.getToken( 0, ';', nIndex );
             }
             while ( nIndex >= 0 );
             // printf("Index %d\n", nIndex);
@@ -351,68 +351,68 @@ public:
 
     void getToken_001()
         {
-            rtl::OString sTokenStr = "a;b";
+            OString sTokenStr = "a;b";
 
             sal_Int32 nIndex = 0;
 
-            rtl::OString sToken = sTokenStr.getToken( 0, ';', nIndex );
+            OString sToken = sTokenStr.getToken( 0, ';', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", sToken.equals("a") == sal_True);
 
-            /* rtl::OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
+            /* OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", sToken.equals("b") == sal_True);
             CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
         }
 
     void getToken_002()
         {
-            rtl::OString sTokenStr = "a;b.c";
+            OString sTokenStr = "a;b.c";
 
             sal_Int32 nIndex = 0;
 
-            rtl::OString sToken = sTokenStr.getToken( 0, ';', nIndex );
+            OString sToken = sTokenStr.getToken( 0, ';', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", sToken.equals("a") == sal_True);
 
-            /* rtl::OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
+            /* OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", sToken.equals("b") == sal_True);
 
-            /* rtl::OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
+            /* OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be a 'c'", sToken.equals("c") == sal_True);
             CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
         }
 
     void getToken_003()
         {
-            rtl::OString sTokenStr = "a;;b";
+            OString sTokenStr = "a;;b";
 
             sal_Int32 nIndex = 0;
 
-            rtl::OString sToken = sTokenStr.getToken( 0, ';', nIndex );
+            OString sToken = sTokenStr.getToken( 0, ';', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", sToken.equals("a") == sal_True);
 
-            /* rtl::OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
+            /* OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be empty", sToken.isEmpty());
 
-            /* rtl::OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
+            /* OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", sToken.equals("b") == sal_True);
             CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
         }
 
     void getToken_004()
         {
-            rtl::OString sTokenStr = "longer.then.ever.";
+            OString sTokenStr = "longer.then.ever.";
 
             sal_Int32 nIndex = 0;
 
-            rtl::OString sToken = sTokenStr.getToken( 0, '.', nIndex );
+            OString sToken = sTokenStr.getToken( 0, '.', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be 'longer'", sToken.equals("longer") == sal_True);
 
-            /* rtl::OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
+            /* OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be 'then'", sToken.equals("then") == sal_True);
 
-            /* rtl::OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
+            /* OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be 'ever'", sToken.equals("ever") == sal_True);
 
-            /* rtl::OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
+            /* OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be empty", sToken.isEmpty());
 
             CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
@@ -437,10 +437,10 @@ class replaceAt : public CppUnit::TestFixture
 {
 
 public:
-    sal_Bool check_replaceAt( const rtl::OString* expVal, const rtl::OString* input,
-        const rtl::OString* newStr, sal_Int32  index, sal_Int32 count)
+    sal_Bool check_replaceAt( const OString* expVal, const OString* input,
+        const OString* newStr, sal_Int32  index, sal_Int32 count)
     {
-         ::rtl::OString aStr1;
+         OString aStr1;
         aStr1= input->replaceAt( index, count, *newStr );
 
         printf("the result OString is %s#\n", aStr1.getStr() );
@@ -451,37 +451,37 @@ public:
 
    void replaceAt_001()
         {
-        sal_Bool bRes = check_replaceAt(new rtl::OString("Java@Sun"),
-            new rtl::OString("Sun java"), new rtl::OString("Java@Sun"), 0, 8 );
+        sal_Bool bRes = check_replaceAt(new OString("Java@Sun"),
+            new OString("Sun java"), new OString("Java@Sun"), 0, 8 );
             CPPUNIT_ASSERT_MESSAGE("string differs, replace whole string", bRes == sal_True);
         }
 
     void replaceAt_002()
         {
-            sal_Bool bRes = check_replaceAt(new rtl::OString("Sun Java desktop system"),
-            new rtl::OString("Sun "), new rtl::OString("Java desktop system"), 10, 8 );
+            sal_Bool bRes = check_replaceAt(new OString("Sun Java desktop system"),
+            new OString("Sun "), new OString("Java desktop system"), 10, 8 );
             CPPUNIT_ASSERT_MESSAGE("index > length of input string", bRes == sal_True);
         }
 
     void replaceAt_003()
         {
-            sal_Bool bRes = check_replaceAt(new rtl::OString("SuJava desktop system"),
-            new rtl::OString("Sun "), new rtl::OString("Java desktop system"), 2, 64 );
+            sal_Bool bRes = check_replaceAt(new OString("SuJava desktop system"),
+            new OString("Sun "), new OString("Java desktop system"), 2, 64 );
             CPPUNIT_ASSERT_MESSAGE("larger count", bRes == sal_True);
         }
 
     void replaceAt_004()
         {
 
-            sal_Bool bRes = check_replaceAt(new rtl::OString("Java desktop system"),
-            new rtl::OString("Sun "), new rtl::OString("Java desktop system"), -4, 8 );
+            sal_Bool bRes = check_replaceAt(new OString("Java desktop system"),
+            new OString("Sun "), new OString("Java desktop system"), -4, 8 );
             CPPUNIT_ASSERT_MESSAGE("navigate index", bRes == sal_True);
         }
     void replaceAt_005()
         {
 
-            sal_Bool bRes = check_replaceAt(new rtl::OString("Sun Jesktop System"),
-            new rtl::OString("Sun Java Desktop System"), new rtl::OString(""), 5, 5 );
+            sal_Bool bRes = check_replaceAt(new OString("Sun Jesktop System"),
+            new OString("Sun Java Desktop System"), new OString(""), 5, 5 );
             CPPUNIT_ASSERT_MESSAGE("replace with null string", bRes == sal_True);
         }
 
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index 94b741caae32..e2d79d812d77 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -39,13 +39,13 @@ namespace rtl_str
 
         void compare_000_1()
             {
-                rtl::OString aStr1 = "Line must be equal.";
+                OString aStr1 = "Line must be equal.";
                 rtl_str_compare( aStr1.getStr(), NULL);
             }
         void compare_001()
             {
-                rtl::OString aStr1 = "";
-                rtl::OString aStr2 = "";
+                OString aStr1 = "";
+                OString aStr2 = "";
 
                 sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -53,8 +53,8 @@ namespace rtl_str
 
         void compare_002()
             {
-                rtl::OString aStr1 = "Line must be equal.";
-                rtl::OString aStr2 = "Line must be equal.";
+                OString aStr1 = "Line must be equal.";
+                OString aStr2 = "Line must be equal.";
 
                 sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -62,8 +62,8 @@ namespace rtl_str
 
         void compare_003()
             {
-                rtl::OString aStr1 = "Line must differ.";
-                rtl::OString aStr2 = "Line foo bar, ok, differ.";
+                OString aStr1 = "Line must differ.";
+                OString aStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -93,13 +93,13 @@ namespace rtl_str
 
         void compare_000_1()
             {
-                rtl::OString aStr1 = "Line must be equal.";
+                OString aStr1 = "Line must be equal.";
                 rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
             }
         void compare_001()
             {
-                rtl::OString aStr1 = "";
-                rtl::OString aStr2 = "";
+                OString aStr1 = "";
+                OString aStr2 = "";
 
                 sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -107,8 +107,8 @@ namespace rtl_str
 
         void compare_002()
             {
-                rtl::OString aStr1 = "Line must be equal.";
-                rtl::OString aStr2 = "Line must be equal.";
+                OString aStr1 = "Line must be equal.";
+                OString aStr2 = "Line must be equal.";
 
                 sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -116,8 +116,8 @@ namespace rtl_str
 
         void compare_002_1()
             {
-                rtl::OString aStr1 = "Line must be equal.";
-                rtl::OString aStr2 = "LINE MUST BE EQUAL.";
+                OString aStr1 = "Line must be equal.";
+                OString aStr2 = "LINE MUST BE EQUAL.";
 
                 sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
@@ -125,8 +125,8 @@ namespace rtl_str
 
         void compare_003()
             {
-                rtl::OString aStr1 = "Line must differ.";
-                rtl::OString aStr2 = "Line foo bar, ok, differ.";
+                OString aStr1 = "Line must differ.";
+                OString aStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -157,13 +157,13 @@ namespace rtl_str
 
         void compare_000_1()
             {
-                rtl::OString aStr1 = "Line must be equal.";
+                OString aStr1 = "Line must be equal.";
                 rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0, 1);
             }
         void compare_001()
             {
-                rtl::OString aStr1 = "";
-                rtl::OString aStr2 = "";
+                OString aStr1 = "";
+                OString aStr2 = "";
 
                 sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), aStr1.getLength());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -171,8 +171,8 @@ namespace rtl_str
 
         void compare_002()
             {
-                rtl::OString aStr1 = "Line must be equal.";
-                rtl::OString aStr2 = "Line must be equal.";
+                OString aStr1 = "Line must be equal.";
+                OString aStr2 = "Line must be equal.";
 
                 sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -182,8 +182,8 @@ namespace rtl_str
 
         void compare_002_1()
             {
-                rtl::OString aStr1 = "Line must be equal.";
-                rtl::OString aStr2 = "LINE MUST BE EQUAL.";
+                OString aStr1 = "Line must be equal.";
+                OString aStr2 = "LINE MUST BE EQUAL.";
 
                 sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -193,8 +193,8 @@ namespace rtl_str
 
         void compare_003()
             {
-                rtl::OString aStr1 = "Line must differ.";
-                rtl::OString aStr2 = "Line foo bar, ok, differ.";
+                OString aStr1 = "Line must differ.";
+                OString aStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -204,8 +204,8 @@ namespace rtl_str
 
         void compare_004()
             {
-                rtl::OString aStr1 = "Line must differ.";
-                rtl::OString aStr2 = "Line foo bar, ok, differ.";
+                OString aStr1 = "Line must differ.";
+                OString aStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -239,7 +239,7 @@ namespace rtl_str
 
         void hashCode_001()
             {
-                rtl::OString aStr1 = "Line for a hashCode.";
+                OString aStr1 = "Line for a hashCode.";
                 sal_Int32 nHashCode = rtl_str_hashCode( aStr1.getStr() );
                 printf("hashcode: %d\n", nHashCode);
                 // CPPUNIT_ASSERT_MESSAGE("failed.", nValue == 0);
@@ -247,10 +247,10 @@ namespace rtl_str
 
         void hashCode_002()
             {
-                rtl::OString aStr1 = "Line for a hashCode.";
+                OString aStr1 = "Line for a hashCode.";
                 sal_Int32 nHashCode1 = rtl_str_hashCode( aStr1.getStr() );
 
-                rtl::OString aStr2 = "Line for a hashCode.";
+                OString aStr2 = "Line for a hashCode.";
                 sal_Int32 nHashCode2 = rtl_str_hashCode( aStr2.getStr() );
 
                 CPPUNIT_ASSERT_MESSAGE("hashcodes must be equal.", nHashCode1 == nHashCode2 );
@@ -258,10 +258,10 @@ namespace rtl_str
 
         void hashCode_003()
             {
-                rtl::OString aStr1 = "Line for a hashCode.";
+                OString aStr1 = "Line for a hashCode.";
                 sal_Int32 nHashCode1 = rtl_str_hashCode( aStr1.getStr() );
 
-                rtl::OString aStr2 = "Line for another hashcode.";
+                OString aStr2 = "Line for another hashcode.";
                 sal_Int32 nHashCode2 = rtl_str_hashCode( aStr2.getStr() );
 
                 CPPUNIT_ASSERT_MESSAGE("hashcodes must differ.", nHashCode1 != nHashCode2 );
@@ -290,7 +290,7 @@ namespace rtl_str
 
         void indexOfChar_001()
             {
-                rtl::OString aStr1 = "Line for a indexOfChar.";
+                OString aStr1 = "Line for a indexOfChar.";
 
                 sal_Int32 nIndex = rtl_str_indexOfChar( aStr1.getStr(), 'L' );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
@@ -307,7 +307,7 @@ namespace rtl_str
 
         void indexOfChar_002()
             {
-                rtl::OString aStr1 = "Line for a indexOfChar.";
+                OString aStr1 = "Line for a indexOfChar.";
                 sal_Int32 nIndex = rtl_str_indexOfChar( aStr1.getStr(), 'y' );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -335,7 +335,7 @@ namespace rtl_str
 
         void lastIndexOfChar_001()
             {
-                rtl::OString aStr1 = "Line for a lastIndexOfChar.";
+                OString aStr1 = "Line for a lastIndexOfChar.";
 
                 sal_Int32 nIndex = rtl_str_lastIndexOfChar( aStr1.getStr(), 'C' );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 22);
@@ -352,7 +352,7 @@ namespace rtl_str
 
         void lastIndexOfChar_002()
             {
-                rtl::OString aStr1 = "Line for a lastIndexOfChar.";
+                OString aStr1 = "Line for a lastIndexOfChar.";
                 sal_Int32 nIndex = rtl_str_lastIndexOfChar( aStr1.getStr(), 'y' );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -380,13 +380,13 @@ namespace rtl_str
 
         void indexOfStr_000_1()
             {
-                rtl::OString aStr1 = "Line for a indexOfStr.";
+                OString aStr1 = "Line for a indexOfStr.";
                 rtl_str_indexOfStr( aStr1.getStr(), 0 );
             }
 
         void indexOfStr_001()
             {
-                rtl::OString aStr1 = "Line for a indexOfStr.";
+                OString aStr1 = "Line for a indexOfStr.";
 
                 sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "Line" );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
@@ -403,7 +403,7 @@ namespace rtl_str
 
         void indexOfStr_002()
             {
-                rtl::OString aStr1 = "Line for a indexOfStr.";
+                OString aStr1 = "Line for a indexOfStr.";
                 sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "not exist" );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -431,31 +431,31 @@ namespace rtl_str
 
         void lastIndexOfStr_000_1()
             {
-                rtl::OString aStr1 = "Line for a lastIndexOfStr.";
+                OString aStr1 = "Line for a lastIndexOfStr.";
                 rtl_str_lastIndexOfStr( aStr1.getStr(), NULL );
             }
 
         void lastIndexOfStr_001()
             {
-                rtl::OString aStr1 = "Line for a lastIndexOfStr.";
-                rtl::OString aSearchStr = "Index";
+                OString aStr1 = "Line for a lastIndexOfStr.";
+                OString aSearchStr = "Index";
 
                 sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 15);
 
-                /* rtl::OString */ aSearchStr = "Line";
+                /* OString */ aSearchStr = "Line";
                 /* sal_Int32 */ nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
 
-                /* rtl::OString */ aSearchStr = "";
+                /* OString */ aSearchStr = "";
                 /* sal_Int32 */ nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1);
             }
 
         void lastIndexOfStr_002()
             {
-                rtl::OString aStr1 = "Line for a lastIndexOfStr.";
-                rtl::OString aSearchStr = "foo";
+                OString aStr1 = "Line for a lastIndexOfStr.";
+                OString aSearchStr = "foo";
                 sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -463,8 +463,8 @@ namespace rtl_str
 
         void lastIndexOfStr_003()
             {
-                rtl::OString aStr1 = "Line for a lastIndexOfStr.";
-                rtl::OString aSearchStr = "O";
+                OString aStr1 = "Line for a lastIndexOfStr.";
+                OString aSearchStr = "O";
                 sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 20 );
@@ -493,8 +493,8 @@ namespace rtl_str
 
         void replaceChar_001()
             {
-                rtl::OString aStr1 = "replace char.";
-                rtl::OString aShouldStr1 = "ruplacu char.";
+                OString aStr1 = "replace char.";
+                OString aShouldStr1 = "ruplacu char.";
 
                 sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
                 CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -502,7 +502,7 @@ namespace rtl_str
 
                 rtl_str_replaceChar( pStr, 'e', 'u' );
 
-                CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+                CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(OString(pStr)) == sal_True);
                 free(pStr);
             }
 
@@ -531,8 +531,8 @@ namespace rtl_str
             }
         void replaceChar_WithLength_001()
             {
-                rtl::OString aStr1 = "replace char.";
-                rtl::OString aShouldStr1 = "ruplace char.";
+                OString aStr1 = "replace char.";
+                OString aShouldStr1 = "ruplace char.";
 
                 sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
                 CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -540,7 +540,7 @@ namespace rtl_str
 
                 rtl_str_replaceChar_WithLength( pStr, 6, 'e', 'u' );
 
-                CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+                CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(OString(pStr)) == sal_True);
                 free(pStr);
             }
 
@@ -566,8 +566,8 @@ namespace rtl_str
 
         void toAsciiLowerCase_001()
             {
-                rtl::OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE.";
-                rtl::OString aShouldStr1 = "change this to ascii lower case.";
+                OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE.";
+                OString aShouldStr1 = "change this to ascii lower case.";
 
                 sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
                 CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -575,7 +575,7 @@ namespace rtl_str
 
                 rtl_str_toAsciiLowerCase( pStr );
 
-                CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+                CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True);
                 free(pStr);
             }
 
@@ -600,8 +600,8 @@ namespace rtl_str
 
         void toAsciiLowerCase_WithLength_001()
             {
-                rtl::OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE.";
-                rtl::OString aShouldStr1 = "change thiS TO ASCII LOWER CASE.";
+                OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE.";
+                OString aShouldStr1 = "change thiS TO ASCII LOWER CASE.";
 
                 sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
                 CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -610,7 +610,7 @@ namespace rtl_str
                 rtl_str_toAsciiLowerCase_WithLength( pStr, 10 );
 
                 printf("Lowercase with length: '%s'\n", pStr);
-                CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+                CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True);
                 free(pStr);
             }
 
@@ -635,8 +635,8 @@ namespace rtl_str
 
         void toAsciiUpperCase_001()
             {
-                rtl::OString aStr1 = "change this to ascii upper case.";
-                rtl::OString aShouldStr1 = "CHANGE THIS TO ASCII UPPER CASE.";
+                OString aStr1 = "change this to ascii upper case.";
+                OString aShouldStr1 = "CHANGE THIS TO ASCII UPPER CASE.";
 
                 sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
                 CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -644,7 +644,7 @@ namespace rtl_str
 
                 rtl_str_toAsciiUpperCase( pStr );
 
-                CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+                CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True);
                 free(pStr);
             }
 
@@ -669,8 +669,8 @@ namespace rtl_str
 
         void toAsciiUpperCase_WithLength_001()
             {
-                rtl::OString aStr1 = "change this to ascii lower case.";
-                rtl::OString aShouldStr1 = "CHANGE THIs to ascii lower case.";
+                OString aStr1 = "change this to ascii lower case.";
+                OString aShouldStr1 = "CHANGE THIs to ascii lower case.";
 
                 sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
                 CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -679,7 +679,7 @@ namespace rtl_str
                 rtl_str_toAsciiUpperCase_WithLength( pStr, 10 );
 
                 printf("Uppercase with length: '%s'\n", aStr1.getStr());
-                CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+                CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True);
                 free(pStr);
             }
 
diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx
index 4a92cffb8f8f..71c709519264 100644
--- a/sal/qa/rtl/ostring/rtl_string.cxx
+++ b/sal/qa/rtl/ostring/rtl_string.cxx
@@ -40,7 +40,7 @@ namespace rtl_string
 
         void getLength_001()
             {
-                rtl::OString aStr("Test Length.");
+                OString aStr("Test Length.");
                 sal_Int32 nValue = rtl_string_getLength( aStr.pData );
 
                 CPPUNIT_ASSERT_MESSAGE("Length must equal getLength()", aStr.getLength() == nValue);
@@ -72,12 +72,12 @@ namespace rtl_string
 
         void newFromString_001()
             {
-                rtl::OString aStr("Test Length.");
+                OString aStr("Test Length.");
                 rtl_String *pStr = NULL;
 
                 rtl_string_newFromString( &pStr, aStr.pData );
 
-                rtl::OString aNewStr(pStr);
+                OString aNewStr(pStr);
                 CPPUNIT_ASSERT_MESSAGE("Strings must be equal", aStr.equals(aNewStr) == sal_True);
 
                 rtl_string_release(pStr);
@@ -104,44 +104,44 @@ namespace rtl_string
 
         void convertUStringToString_001()
             {
-                rtl::OUString suString("Hello");
-                rtl::OString sString;
+                OUString suString("Hello");
+                OString sString;
                 sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS);
 
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Hello")) == sal_True);
+                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(OString("Hello")) == sal_True);
             }
 
         void convertUStringToString_002()
             {
-                rtl::OString sStr("H\xE4llo");
-                rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
+                OString sStr("H\xE4llo");
+                OUString suString = OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
 
-                rtl::OString sString;
+                OString sString;
                 sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS);
 
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("H\xE4llo")) == sal_True);
+                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(OString("H\xE4llo")) == sal_True);
             }
 
         void convertUStringToString_003()
             {
-                rtl::OString sStr("H\xC3\xA4llo");
-                rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_UTF8);
+                OString sStr("H\xC3\xA4llo");
+                OUString suString = OStringToOUString(sStr, RTL_TEXTENCODING_UTF8);
 
-                rtl::OString sString;
+                OString sString;
                 sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS);
 
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("H\xE4llo")) == sal_True);
+                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(OString("H\xE4llo")) == sal_True);
             }
 
         void convertUStringToString_004()
             {
-                rtl::OString sStr("Tsch\xFC\xDF");
-                rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
-                rtl::OString sString;
+                OString sStr("Tsch\xFC\xDF");
+                OUString suString = OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
+                OString sString;
 
                 sal_Bool       bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
                 /* sal_Bool */ bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS);
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Tsch\xFC\xDF")) == sal_True);
+                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(OString("Tsch\xFC\xDF")) == sal_True);
             }
 
         // Change the following lines only, if you add, remove or rename
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 7dce206300a2..b932e371be3d 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -55,8 +55,8 @@ class number : public CppUnit::TestFixture
 {
     void number_float_test_impl(float _nValue)
         {
-            rtl::OUString suValue(rtl::OUString::number(_nValue));
-            rtl::OString sValue;
+            OUString suValue(OUString::number(_nValue));
+            OString sValue;
             sValue <<= suValue;
             printf("nFloat := %.9f  sValue := %s\n", _nValue, sValue.getStr());
 
@@ -125,9 +125,9 @@ private:
 
     void number_double_test_impl(double _nValue)
         {
-            rtl::OUString suValue;
-            suValue = rtl::OUString::number( _nValue );
-            rtl::OString sValue;
+            OUString suValue;
+            suValue = OUString::number( _nValue );
+            OString sValue;
             sValue <<= suValue;
             printf("nDouble := %.20f  sValue := %s\n", _nValue, sValue.getStr());
 
@@ -218,22 +218,22 @@ public:
         void test() {
             CPPUNIT_ASSERT_EQUAL(
                 static_cast< sal_Int32 >(-0x76543210),
-                (rtl::OUString("-76543210").
+                (OUString("-76543210").
                  toInt32(16)));
             // @return 0 if this string represents no number or one of too large magnitude
             CPPUNIT_ASSERT_EQUAL(
                 static_cast< sal_Int32 >(0),
-                (rtl::OUString("+FEDCBA98").
+                (OUString("+FEDCBA98").
                  toInt32(16)));
             CPPUNIT_ASSERT_EQUAL(
                 static_cast< sal_Int64 >(-SAL_CONST_INT64(0x76543210FEDCBA98)),
-                (rtl::OUString(
+                (OUString(
                     "-76543210FEDCBA98").
                  toInt64(16)));
             // @return 0 if this string represents no number or one of too large magnitude
             CPPUNIT_ASSERT_EQUAL(
                 static_cast< sal_Int64 >(SAL_CONST_INT64(0)),
-                (rtl::OUString(
+                (OUString(
                     "+FEDCBA9876543210").
                  toInt64(16)));
         }
@@ -247,12 +247,12 @@ public:
     class toDouble : public CppUnit::TestFixture
     {
     public:
-        void toDouble_test_impl(rtl::OString const& _sValue)
+        void toDouble_test_impl(OString const& _sValue)
             {
                 //printf("the original str is %s\n", _sValue.getStr());
                 double nValueATOF = atof( _sValue.getStr() );
         //printf("original data is %e\n", nValueATOF);
-                rtl::OUString suValue = rtl::OUString::createFromAscii( _sValue.getStr() );
+                OUString suValue = OUString::createFromAscii( _sValue.getStr() );
                 double nValueToDouble = suValue.toDouble();
                 //printf("result data is %e\n", nValueToDouble);
 
@@ -260,12 +260,12 @@ public:
                 CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult);
             }
 
-        void toDouble_test(rtl::OString const& _sValue)
+        void toDouble_test(OString const& _sValue)
             {
                 toDouble_test_impl(_sValue);
 
                 // test also the negative part.
-                rtl::OString sNegativValue("-");
+                OString sNegativValue("-");
                 sNegativValue += _sValue;
                 toDouble_test_impl(sNegativValue);
             }
@@ -295,64 +295,64 @@ public:
 
         void toDouble_test_3()
             {
-                rtl::OString sValue("3");
+                OString sValue("3");
                 toDouble_test(sValue);
             }
         void toDouble_test_3_5()
             {
-                rtl::OString sValue("3.5");
+                OString sValue("3.5");
                 toDouble_test(sValue);
             }
         void toDouble_test_3_0625()
             {
-                rtl::OString sValue("3.0625");
+                OString sValue("3.0625");
                 toDouble_test(sValue);
             }
         void toDouble_test_pi()
             {
                 // value from http://www.angio.net/pi/digits/50.txt
-                rtl::OString sValue("3.141592653589793238462643383279502884197169399375");
+                OString sValue("3.141592653589793238462643383279502884197169399375");
                 toDouble_test(sValue);
             }
 
         void toDouble_test_1()
             {
-                rtl::OString sValue("1");
+                OString sValue("1");
                 toDouble_test(sValue);
             }
         void toDouble_test_10()
             {
-                rtl::OString sValue("10");
+                OString sValue("10");
                 toDouble_test(sValue);
             }
         void toDouble_test_100()
             {
-                rtl::OString sValue("100");
+                OString sValue("100");
                 toDouble_test(sValue);
             }
         void toDouble_test_1000()
             {
-                rtl::OString sValue("1000");
+                OString sValue("1000");
                 toDouble_test(sValue);
             }
         void toDouble_test_10000()
             {
-                rtl::OString sValue("10000");
+                OString sValue("10000");
                 toDouble_test(sValue);
             }
         void toDouble_test_1e99()
             {
-                rtl::OString sValue("1e99");
+                OString sValue("1e99");
                 toDouble_test(sValue);
             }
         void toDouble_test_1e_n99()
             {
-                rtl::OString sValue("1e-99");
+                OString sValue("1e-99");
                 toDouble_test(sValue);
             }
         void toDouble_test_1e308()
             {
-                rtl::OString sValue("1e308");
+                OString sValue("1e308");
                 toDouble_test(sValue);
             }
 
@@ -382,12 +382,12 @@ public:
     class toFloat : public CppUnit::TestFixture
     {
     public:
-        void toFloat_test_impl(rtl::OString const& _sValue)
+        void toFloat_test_impl(OString const& _sValue)
             {
                 //printf("the original str is %s\n", _sValue.getStr());
                 float nValueATOF = doubleToFloat(atof( _sValue.getStr() ));
         //printf("the original str is %.10f\n", nValueATOF);
-                rtl::OUString suValue = rtl::OUString::createFromAscii( _sValue.getStr() );
+                OUString suValue = OUString::createFromAscii( _sValue.getStr() );
                 float nValueToFloat = suValue.toFloat();
                 //printf("the result str is %.10f\n", nValueToFloat);
 
@@ -395,12 +395,12 @@ public:
                 CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult);
             }
 
-        void toFloat_test(rtl::OString const& _sValue)
+        void toFloat_test(OString const& _sValue)
             {
                 toFloat_test_impl(_sValue);
 
                 // test also the negative part.
-                rtl::OString sNegativValue("-");
+                OString sNegativValue("-");
                 sNegativValue += _sValue;
                 toFloat_test_impl(sNegativValue);
             }
@@ -423,74 +423,74 @@ public:
 
         void toFloat_test_3()
             {
-                rtl::OString sValue("3");
+                OString sValue("3");
                 toFloat_test(sValue);
             }
         void toFloat_test_3_5()
             {
-                rtl::OString sValue("3.5");
+                OString sValue("3.5");
                 toFloat_test(sValue);
             }
         void toFloat_test_3_0625()
             {
-                rtl::OString sValue("3.0625");
+                OString sValue("3.0625");
                 toFloat_test(sValue);
             }
         void toFloat_test_3_0625_e()
             {
-                rtl::OString sValue("3.0625e-4");
+                OString sValue("3.0625e-4");
                 toFloat_test(sValue);
             }
         void toFloat_test_pi()
             {
                 // value from http://www.angio.net/pi/digits/50.txt
-                rtl::OString sValue("3.141592653589793238462643383279502884197169399375");
+                OString sValue("3.141592653589793238462643383279502884197169399375");
                 toFloat_test(sValue);
             }
 
         void toFloat_test_1()
             {
-                rtl::OString sValue("1");
+                OString sValue("1");
                 toFloat_test(sValue);
             }
         void toFloat_test_10()
             {
-                rtl::OString sValue("10");
+                OString sValue("10");
                 toFloat_test(sValue);
             }
         void toFloat_test_100()
             {
-                rtl::OString sValue("100");
+                OString sValue("100");
                 toFloat_test(sValue);
             }
         void toFloat_test_1000()
             {
-                rtl::OString sValue("1000");
+                OString sValue("1000");
                 toFloat_test(sValue);
             }
         void toFloat_test_10000()
             {
-                rtl::OString sValue("10000");
+                OString sValue("10000");
                 toFloat_test(sValue);
             }
         void toFloat_test_mix()
             {
-                rtl::OString sValue("456789321455.123456789012");
+                OString sValue("456789321455.123456789012");
                 toFloat_test(sValue);
             }
         void toFloat_test_1e99()
             {
-                rtl::OString sValue("1e99");
+                OString sValue("1e99");
                 toFloat_test(sValue);
             }
         void toFloat_test_1e_n99()
             {
-                rtl::OString sValue("1e-9");
+                OString sValue("1e-9");
                 toFloat_test(sValue);
             }
         void toFloat_test_1e308()
             {
-                rtl::OString sValue("1e308");
+                OString sValue("1e308");
                 toFloat_test(sValue);
             }
 
@@ -523,17 +523,17 @@ class lastIndexOf : public CppUnit::TestFixture
 {
 
 public:
-    void lastIndexOf_oustring(rtl::OUString const& _suStr, rtl::OUString const& _suSearchStr, sal_Int32 _nExpectedResultPos)
+    void lastIndexOf_oustring(OUString const& _suStr, OUString const& _suSearchStr, sal_Int32 _nExpectedResultPos)
         {
             // Algorithm
-            // search the string _suSearchStr (rtl::OUString) in the string _suStr.
+            // search the string _suSearchStr (OUString) in the string _suStr.
             // check if the _nExpectedResultPos occurs.
 
             sal_Int32 nPos = _suStr.lastIndexOf(_suSearchStr);
             CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
         }
 
-    void lastIndexOf_salunicode(rtl::OUString const& _suStr, sal_Unicode _cuSearchChar, sal_Int32 _nExpectedResultPos)
+    void lastIndexOf_salunicode(OUString const& _suStr, sal_Unicode _cuSearchChar, sal_Int32 _nExpectedResultPos)
         {
             // Algorithm
             // search the unicode char _suSearchChar (sal_Unicode) in the string _suStr.
@@ -543,13 +543,13 @@ public:
             CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
         }
 
-    void lastIndexOf_oustring_offset(rtl::OUString const& _suStr, rtl::OUString const& _suSearchStr, sal_Int32 _nExpectedResultPos, sal_Int32 _nStartOffset)
+    void lastIndexOf_oustring_offset(OUString const& _suStr, OUString const& _suSearchStr, sal_Int32 _nExpectedResultPos, sal_Int32 _nStartOffset)
         {
             sal_Int32 nPos = _suStr.lastIndexOf(_suSearchStr, _nStartOffset);
             CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
         }
 
-    void lastIndexOf_salunicode_offset(rtl::OUString const& _suStr, sal_Unicode _cuSearchChar, sal_Int32 _nExpectedResultPos, sal_Int32 _nStartOffset)
+    void lastIndexOf_salunicode_offset(OUString const& _suStr, sal_Unicode _cuSearchChar, sal_Int32 _nExpectedResultPos, sal_Int32 _nStartOffset)
         {
             sal_Int32 nPos = _suStr.lastIndexOf(_cuSearchChar, _nStartOffset);
             CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
@@ -558,104 +558,104 @@ public:
     void lastIndexOf_test_oustring_offset_001()
         {
             // search for sun, start at the end, found (pos==0)
-            rtl::OUString aStr("sun java system");
-            rtl::OUString aSearchStr("sun");
+            OUString aStr("sun java system");
+            OUString aSearchStr("sun");
             lastIndexOf_oustring_offset(aStr, aSearchStr, 0, aStr.getLength());
         }
 
     void lastIndexOf_test_oustring_offset_002()
         {
             // search for sun, start at pos = 3, found (pos==0)
-            rtl::OUString aStr("sun java system");
-            rtl::OUString aSearchStr("sun");
+            OUString aStr("sun java system");
+            OUString aSearchStr("sun");
             lastIndexOf_oustring_offset(aStr, aSearchStr, 0, 3);
         }
 
     void lastIndexOf_test_oustring_offset_003()
         {
             // search for sun, start at pos = 2, found (pos==-1)
-            rtl::OUString aStr("sun java system");
-            rtl::OUString aSearchStr("sun");
+            OUString aStr("sun java system");
+            OUString aSearchStr("sun");
             lastIndexOf_oustring_offset(aStr, aSearchStr, -1, 2);
         }
 
     void lastIndexOf_test_oustring_offset_004()
         {
             // search for sun, start at the end, found (pos==0)
-            rtl::OUString aStr("sun java system");
-            rtl::OUString aSearchStr("sun");
+            OUString aStr("sun java system");
+            OUString aSearchStr("sun");
             lastIndexOf_oustring_offset(aStr, aSearchStr, -1, 1);
         }
 
     void lastIndexOf_test_oustring_001()
         {
             // search for sun, found (pos==0)
-            rtl::OUString aStr("sun java system");
-            rtl::OUString aSearchStr("sun");
+            OUString aStr("sun java system");
+            OUString aSearchStr("sun");
             lastIndexOf_oustring(aStr, aSearchStr, 0);
         }
 
     void lastIndexOf_test_oustring_002()
         {
             // search for sun, found (pos==4)
-            rtl::OUString aStr("the sun java system");
-            rtl::OUString aSearchStr("sun");
+            OUString aStr("the sun java system");
+            OUString aSearchStr("sun");
             lastIndexOf_oustring(aStr, aSearchStr, 4);
         }
 
     void lastIndexOf_test_oustring_003()
         {
             // search for sun, found (pos==8)
-            rtl::OUString aStr("the sun sun java system");
-            rtl::OUString aSearchStr("sun");
+            OUString aStr("the sun sun java system");
+            OUString aSearchStr("sun");
             lastIndexOf_oustring(aStr, aSearchStr, 8);
         }
 
     void lastIndexOf_test_oustring_004()
         {
             // search for sun, found (pos==8)
-            rtl::OUString aStr("the sun sun");
-            rtl::OUString aSearchStr("sun");
+            OUString aStr("the sun sun");
+            OUString aSearchStr("sun");
             lastIndexOf_oustring(aStr, aSearchStr, 8);
         }
 
     void lastIndexOf_test_oustring_005()
         {
             // search for sun, found (pos==4)
-            rtl::OUString aStr("the sun su");
-            rtl::OUString aSearchStr("sun");
+            OUString aStr("the sun su");
+            OUString aSearchStr("sun");
             lastIndexOf_oustring(aStr, aSearchStr, 4);
         }
 
     void lastIndexOf_test_oustring_006()
         {
             // search for sun, found (pos==-1)
-            rtl::OUString aStr("the su su");
-            rtl::OUString aSearchStr("sun");
+            OUString aStr("the su su");
+            OUString aSearchStr("sun");
             lastIndexOf_oustring(aStr, aSearchStr, -1);
         }
 
     void lastIndexOf_test_oustring_007()
         {
             // search for earth, not found (-1)
-            rtl::OUString aStr("the su su");
-            rtl::OUString aSearchStr("earth");
+            OUString aStr("the su su");
+            OUString aSearchStr("earth");
             lastIndexOf_oustring(aStr, aSearchStr, -1);
         }
 
     void lastIndexOf_test_oustring_008()
         {
             // search for earth, not found (-1)
-            rtl::OUString aStr = rtl::OUString();
-            rtl::OUString aSearchStr("earth");
+            OUString aStr = OUString();
+            OUString aSearchStr("earth");
             lastIndexOf_oustring(aStr, aSearchStr, -1);
         }
 
     void lastIndexOf_test_oustring_009()
         {
             // search for earth, not found (-1)
-            rtl::OUString aStr = rtl::OUString();
-            rtl::OUString aSearchStr = rtl::OUString();
+            OUString aStr = OUString();
+            OUString aSearchStr = OUString();
             lastIndexOf_oustring(aStr, aSearchStr, -1);
 
         }
@@ -663,7 +663,7 @@ public:
     void lastIndexOf_test_salunicode_001()
         {
             // search for 's', found (19)
-            rtl::OUString aStr("the sun sun java system");
+            OUString aStr("the sun sun java system");
             sal_Unicode suChar = L's';
             lastIndexOf_salunicode(aStr, suChar, 19);
         }
@@ -671,7 +671,7 @@ public:
     void lastIndexOf_test_salunicode_002()
         {
             // search for 'x', not found (-1)
-            rtl::OUString aStr("the sun sun java system");
+            OUString aStr("the sun sun java system");
             sal_Unicode suChar = L'x';
             lastIndexOf_salunicode(aStr, suChar, -1);
         }
@@ -679,21 +679,21 @@ public:
     void lastIndexOf_test_salunicode_offset_001()
         {
             // search for 's', start from pos last char, found (19)
-            rtl::OUString aStr("the sun sun java system");
+            OUString aStr("the sun sun java system");
             sal_Unicode cuChar = L's';
             lastIndexOf_salunicode_offset(aStr, cuChar, 19, aStr.getLength());
         }
     void lastIndexOf_test_salunicode_offset_002()
         {
             // search for 's', start pos is last occur from search behind, found (17)
-            rtl::OUString aStr("the sun sun java system");
+            OUString aStr("the sun sun java system");
             sal_Unicode cuChar = L's';
             lastIndexOf_salunicode_offset(aStr, cuChar, 17, 19);
         }
     void lastIndexOf_test_salunicode_offset_003()
         {
             // search for 't', start pos is 1, found (0)
-            rtl::OUString aStr("the sun sun java system");
+            OUString aStr("the sun sun java system");
             sal_Unicode cuChar = L't';
             lastIndexOf_salunicode_offset(aStr, cuChar, 0, 1);
         }
@@ -735,7 +735,7 @@ class getToken : public CppUnit::TestFixture
 public:
     void getToken_000()
         {
-            rtl::OUString suTokenStr;
+            OUString suTokenStr;
 
             sal_Int32 nIndex = 0;
             do
@@ -749,75 +749,75 @@ public:
 
     void getToken_001()
         {
-            rtl::OUString suTokenStr("a;b");
+            OUString suTokenStr("a;b");
 
             sal_Int32 nIndex = 0;
 
-            rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", rtl::OUString("a"), suToken);
+            OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", OUString("a"), suToken);
 
-            /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", rtl::OUString("b"), suToken);
+            /* OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", OUString("b"), suToken);
             CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
         }
 
     void getToken_002()
         {
-            rtl::OUString suTokenStr("a;b.c");
+            OUString suTokenStr("a;b.c");
 
             sal_Int32 nIndex = 0;
 
-            rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", rtl::OUString("a"), suToken );
+            OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", OUString("a"), suToken );
 
-            /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", rtl::OUString("b"), suToken );
+            /* OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", OUString("b"), suToken );
 
-            /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'c'", rtl::OUString("c"), suToken );
+            /* OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'c'", OUString("c"), suToken );
             CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
         }
 
     void getToken_003()
         {
-            rtl::OUString suTokenStr("a;;b");
+            OUString suTokenStr("a;;b");
 
             sal_Int32 nIndex = 0;
 
-            rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", rtl::OUString("a"), suToken );
+            OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", OUString("a"), suToken );
 
-            /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
+            /* OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.isEmpty());
 
-            /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", rtl::OUString("b"), suToken );
+            /* OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", OUString("b"), suToken );
             CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
         }
 
     void getToken_004()
         {
-            rtl::OUString suTokenStr("longer.then.ever.");
+            OUString suTokenStr("longer.then.ever.");
 
             sal_Int32 nIndex = 0;
 
-            rtl::OUString suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'longer'", rtl::OUString("longer"), suToken );
+            OUString suToken = suTokenStr.getToken( 0, '.', nIndex );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'longer'", OUString("longer"), suToken );
 
-            /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'then'", rtl::OUString("then"), suToken );
+            /* OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'then'", OUString("then"), suToken );
 
-            /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'ever'", rtl::OUString("ever"), suToken );
+            /* OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'ever'", OUString("ever"), suToken );
 
-            /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
+            /* OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.isEmpty());
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
         }
 
     void getToken_005() {
-        rtl::OUString ab("ab");
+        OUString ab("ab");
         sal_Int32 n = 0;
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "token should be 'ab'", ab, ab.getToken(0, '-', n));
@@ -847,14 +847,14 @@ public:
 
 void convertToString::test() {
     static sal_Unicode const utf16[] = { 0x0041, 0x00E4, 0x0061 };
-    rtl::OString s;
+    OString s;
     CPPUNIT_ASSERT(
-        rtl::OUString(utf16, SAL_N_ELEMENTS(utf16)).convertToString(
+        OUString(utf16, SAL_N_ELEMENTS(utf16)).convertToString(
             &s, RTL_TEXTENCODING_UTF7,
             (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR |
              RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)));
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OString(RTL_CONSTASCII_STRINGPARAM("A+AOQ-a")), s);
+        OString(RTL_CONSTASCII_STRINGPARAM("A+AOQ-a")), s);
 }
 
 // - string construction & interning (tests)
@@ -865,13 +865,13 @@ public:
     void construct()
     {
 #ifdef RTL_INLINE_STRINGS
-        ::rtl::OUString aFoo( "foo" );
+        OUString aFoo( "foo" );
         CPPUNIT_ASSERT_MESSAGE("string contents", aFoo[0] == 'f');
         CPPUNIT_ASSERT_MESSAGE("string contents", aFoo[1] == 'o');
         CPPUNIT_ASSERT_MESSAGE("string contents", aFoo[2] == 'o');
         CPPUNIT_ASSERT_MESSAGE("string length", aFoo.getLength() == 3);
 
-        ::rtl::OUString aBaa( "this is a very long string with a lot of long things inside it and it goes on and on and on forever etc." );
+        OUString aBaa( "this is a very long string with a lot of long things inside it and it goes on and on and on forever etc." );
         CPPUNIT_ASSERT_MESSAGE("string length", aBaa.getLength() == 104);
         // Dig at the internals ... FIXME: should we have the bit-flag defines public ?
         CPPUNIT_ASSERT_MESSAGE("string static flags", (aBaa.pData->refCount & 1<<30) != 0);
@@ -881,12 +881,12 @@ public:
     void intern()
     {
         // The empty string is 'static' a special case ...
-        rtl::OUString().intern();
-        rtl::OUString::intern( "",strlen(""),RTL_TEXTENCODING_ASCII_US );
+        OUString().intern();
+        OUString::intern( "",strlen(""),RTL_TEXTENCODING_ASCII_US );
 
-        ::rtl::OUString aFoo( "foo" );
-        ::rtl::OUString aFooIntern = aFoo.intern();
-        CPPUNIT_ASSERT_EQUAL_MESSAGE( "string contents", rtl::OUString("foo"), aFooIntern);
+        OUString aFoo( "foo" );
+        OUString aFooIntern = aFoo.intern();
+        CPPUNIT_ASSERT_EQUAL_MESSAGE( "string contents", OUString("foo"), aFooIntern);
         CPPUNIT_ASSERT_EQUAL_MESSAGE("string length", static_cast<sal_Int32>(3), aFooIntern.getLength());
         // We have to dup due to no atomic 'intern' bit-set operation
         CPPUNIT_ASSERT_MESSAGE("intern dups", aFoo.pData != aFooIntern.pData);
@@ -894,14 +894,14 @@ public:
         // Test interning lots of things
         int i;
         static const int nSequence = 4096;
-        std::unique_ptr<rtl::OUString[]> pStrs(new rtl::OUString[nSequence]);
+        std::unique_ptr<OUString[]> pStrs(new OUString[nSequence]);
         for (i = 0; i < nSequence; i++)
         {
-            pStrs[i] = rtl::OUString::number( sqrt( static_cast<double>(i) ) ).intern();
+            pStrs[i] = OUString::number( sqrt( static_cast<double>(i) ) ).intern();
         }
         for (i = 0; i < nSequence; i++)
         {
-            rtl::OUString aNew = rtl::OUString::number( sqrt( static_cast<double>(i) ) ).intern();
+            OUString aNew = OUString::number( sqrt( static_cast<double>(i) ) ).intern();
             CPPUNIT_ASSERT_EQUAL_MESSAGE("double intern failed",
                                    pStrs[i].pData, aNew.pData);
         }
@@ -923,16 +923,16 @@ public:
 };
 
 void indexOfAscii::test() {
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), rtl::OUString().indexOf(""));
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), rtl::OUString().lastIndexOf(""));
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rtl::OUString("foo").indexOf("foo"));
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rtl::OUString("foo").lastIndexOf("foo"));
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), OUString().indexOf(""));
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), OUString().lastIndexOf(""));
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(0), OUString("foo").indexOf("foo"));
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(0), OUString("foo").lastIndexOf("foo"));
     CPPUNIT_ASSERT_EQUAL(
-        sal_Int32(2), rtl::OUString("fofoobar").indexOf("foo"));
+        sal_Int32(2), OUString("fofoobar").indexOf("foo"));
     CPPUNIT_ASSERT_EQUAL(
-        sal_Int32(3), rtl::OUString("foofoofob").lastIndexOf("foo"));
+        sal_Int32(3), OUString("foofoofob").lastIndexOf("foo"));
     CPPUNIT_ASSERT_EQUAL(
-        sal_Int32(3), rtl::OUString("foofoobar").indexOf("foo", 1));
+        sal_Int32(3), OUString("foofoobar").indexOf("foo", 1));
 }
 
 class endsWith: public CppUnit::TestFixture {
@@ -945,11 +945,11 @@ public:
 };
 
 void endsWith::test() {
-    CPPUNIT_ASSERT_EQUAL(true, rtl::OUString().endsWith(""));
-    CPPUNIT_ASSERT_EQUAL(false, rtl::OUString().endsWith("foo"));
-    CPPUNIT_ASSERT_EQUAL(true, rtl::OUString("bar").endsWith("bar"));
-    CPPUNIT_ASSERT_EQUAL(true, rtl::OUString("foobar").endsWith("bar"));
-    CPPUNIT_ASSERT_EQUAL(false, rtl::OUString("FOOBAR").endsWith("bar"));
+    CPPUNIT_ASSERT_EQUAL(true, OUString().endsWith(""));
+    CPPUNIT_ASSERT_EQUAL(false, OUString().endsWith("foo"));
+    CPPUNIT_ASSERT_EQUAL(true, OUString("bar").endsWith("bar"));
+    CPPUNIT_ASSERT_EQUAL(true, OUString("foobar").endsWith("bar"));
+    CPPUNIT_ASSERT_EQUAL(false, OUString("FOOBAR").endsWith("bar"));
 }
 
 class isEmpty: public CppUnit::TestFixture {
@@ -985,9 +985,9 @@ public:
 void createFromCodePoints::test() {
     CPPUNIT_ASSERT_EQUAL(
         sal_Int32(0),
-        rtl::OUString(static_cast< sal_uInt32 const * >(nullptr), 0).getLength());
+        OUString(static_cast< sal_uInt32 const * >(nullptr), 0).getLength());
     static sal_uInt32 const cp[] = { 0, 0xD800, 0xFFFF, 0x10000, 0x10FFFF };
-    rtl::OUString s(cp, SAL_N_ELEMENTS(cp));
+    OUString s(cp, SAL_N_ELEMENTS(cp));
     CPPUNIT_ASSERT_EQUAL(sal_Int32(7), s.getLength());
     CPPUNIT_ASSERT_EQUAL(u'\0', s[0]);
     CPPUNIT_ASSERT_EQUAL(u'\xD800', s[1]);
@@ -1010,7 +1010,7 @@ public:
 void iterateCodePoints::testNotWellFormed() {
     static sal_Unicode const utf16[] =
         { 0xD800, 0xDC00, 0x0041, 0xDBFF, 0xDFFF, 0xDDEF, 0xD9AB };
-    rtl::OUString s(utf16, SAL_N_ELEMENTS(utf16));
+    OUString s(utf16, SAL_N_ELEMENTS(utf16));
     sal_Int32 i = 0;
     CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x10000), s.iterateCodePoints(&i));
     CPPUNIT_ASSERT_EQUAL(sal_Int32(2), i);
@@ -1050,7 +1050,7 @@ public:
 };
 
 void convertFromString::test() {
-    rtl::OUString t;
+    OUString t;
     CPPUNIT_ASSERT(
         !rtl_convertStringToUString(
             &t.pData, RTL_CONSTASCII_STRINGPARAM("\x80"), RTL_TEXTENCODING_UTF8,
diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx
index 0b533a363b53..615b171fe23d 100644
--- a/sal/qa/rtl/oustring/rtl_ustr.cxx
+++ b/sal/qa/rtl/oustring/rtl_ustr.cxx
@@ -24,12 +24,12 @@
 /** print a UNI_CODE file name.
 */
 /*
-inline void printOUString( ::rtl::OUString const & _suStr )
+inline void printOUString( OUString const & _suStr )
 {
-    rtl::OString aString;
+    OString aString;
 
     printf( "OUString: " );
-    aString = ::rtl::OUStringToOString( _suStr, RTL_TEXTENCODING_ASCII_US );
+    aString = OUStringToOString( _suStr, RTL_TEXTENCODING_ASCII_US );
     printf( "%s\n", aString.getStr( ) );
 }
 */
@@ -49,14 +49,14 @@ namespace rtl_ustr
 
         void compare_000_1()
             {
-                rtl::OUString aStr1("Line must be equal.");
+                OUString aStr1("Line must be equal.");
                 rtl_ustr_compare( aStr1.getStr(), NULL);
                 // should not GPF
             }
         void compare_001()
             {
-                rtl::OUString aStr1;
-                rtl::OUString aStr2;
+                OUString aStr1;
+                OUString aStr2;
 
                 sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -64,8 +64,8 @@ namespace rtl_ustr
 
         void compare_002()
             {
-                rtl::OUString aStr1("Line must be equal.");
-                rtl::OUString aStr2("Line must be equal.");
+                OUString aStr1("Line must be equal.");
+                OUString aStr2("Line must be equal.");
 
                 sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -73,8 +73,8 @@ namespace rtl_ustr
 
         void compare_003()
             {
-                rtl::OUString aStr1("Line must differ.");
-                rtl::OUString aStr2("Line foo bar, ok, differ.");
+                OUString aStr1("Line must differ.");
+                OUString aStr2("Line foo bar, ok, differ.");
 
                 sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -104,13 +104,13 @@ namespace rtl_ustr
 
         void compare_000_1()
             {
-                rtl::OUString aStr1("Line must be equal.");
+                OUString aStr1("Line must be equal.");
                 rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
             }
         void compare_001()
             {
-                rtl::OUString aStr1;
-                rtl::OUString aStr2;
+                OUString aStr1;
+                OUString aStr2;
 
                 sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -118,8 +118,8 @@ namespace rtl_ustr
 
         void compare_002()
             {
-                rtl::OUString aStr1("Line must be equal.");
-                rtl::OUString aStr2("Line must be equal.");
+                OUString aStr1("Line must be equal.");
+                OUString aStr2("Line must be equal.");
 
                 sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -127,8 +127,8 @@ namespace rtl_ustr
 
         void compare_002_1()
             {
-                rtl::OUString aStr1("Line must be equal.");
-                rtl::OUString aStr2("LINE MUST BE EQUAL.");
+                OUString aStr1("Line must be equal.");
+                OUString aStr2("LINE MUST BE EQUAL.");
 
                 sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
@@ -136,8 +136,8 @@ namespace rtl_ustr
 
         void compare_003()
             {
-                rtl::OUString aStr1("Line must differ.");
-                rtl::OUString aStr2("Line foo bar, ok, differ.");
+                OUString aStr1("Line must differ.");
+                OUString aStr2("Line foo bar, ok, differ.");
 
                 sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -168,13 +168,13 @@ namespace rtl_ustr
 
         void compare_000_1()
             {
-                rtl::OUString aStr1("Line must be equal.");
+                OUString aStr1("Line must be equal.");
                 rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0, 1);
             }
         void compare_001()
             {
-                rtl::OUString aStr1;
-                rtl::OUString aStr2;
+                OUString aStr1;
+                OUString aStr2;
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), aStr1.getLength());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -182,8 +182,8 @@ namespace rtl_ustr
 
         void compare_002()
             {
-                rtl::OUString aStr1("Line must be equal.");
-                rtl::OUString aStr2("Line must be equal.");
+                OUString aStr1("Line must be equal.");
+                OUString aStr2("Line must be equal.");
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -193,8 +193,8 @@ namespace rtl_ustr
 
         void compare_002_1()
             {
-                rtl::OUString aStr1("Line must be equal.");
-                rtl::OUString aStr2("LINE MUST BE EQUAL.");
+                OUString aStr1("Line must be equal.");
+                OUString aStr2("LINE MUST BE EQUAL.");
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -204,8 +204,8 @@ namespace rtl_ustr
 
         void compare_003()
             {
-                rtl::OUString aStr1("Line must differ.");
-                rtl::OUString aStr2("Line foo bar, ok, differ.");
+                OUString aStr1("Line must differ.");
+                OUString aStr2("Line foo bar, ok, differ.");
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -215,8 +215,8 @@ namespace rtl_ustr
 
         void compare_004()
             {
-                rtl::OUString aStr1("Line must differ.");
-                rtl::OUString aStr2("Line foo bar, ok, differ.");
+                OUString aStr1("Line must differ.");
+                OUString aStr2("Line foo bar, ok, differ.");
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -253,7 +253,7 @@ namespace rtl_ustr
 //
 //         void hashCode_001()
 //             {
-//                 rtl::OString aStr1 = "Line for a hashCode.";
+//                 OString aStr1 = "Line for a hashCode.";
 //                 sal_Int32 nHashCode = rtl_ustr_hashCode( aStr1.getStr() );
 //                 printf("hashcode: %d\n", nHashCode);
 //                 // CPPUNIT_ASSERT_MESSAGE("failed.", nValue == 0);
@@ -261,10 +261,10 @@ namespace rtl_ustr
 //
 //         void hashCode_002()
 //             {
-//                 rtl::OString aStr1 = "Line for a hashCode.";
+//                 OString aStr1 = "Line for a hashCode.";
 //                 sal_Int32 nHashCode1 = rtl_ustr_hashCode( aStr1.getStr() );
 //
-//                 rtl::OString aStr2 = "Line for a hashCode.";
+//                 OString aStr2 = "Line for a hashCode.";
 //                 sal_Int32 nHashCode2 = rtl_ustr_hashCode( aStr2.getStr() );
 //
 //                 CPPUNIT_ASSERT_MESSAGE("hashcodes must be equal.", nHashCode1 == nHashCode2 );
@@ -272,10 +272,10 @@ namespace rtl_ustr
 //
 //         void hashCode_003()
 //             {
-//                 rtl::OString aStr1 = "Line for a hashCode.";
+//                 OString aStr1 = "Line for a hashCode.";
 //                 sal_Int32 nHashCode1 = rtl_ustr_hashCode( aStr1.getStr() );
 //
-//                 rtl::OString aStr2 = "Line for another hashcode.";
+//                 OString aStr2 = "Line for another hashcode.";
 //                 sal_Int32 nHashCode2 = rtl_ustr_hashCode( aStr2.getStr() );
 //
 //                 CPPUNIT_ASSERT_MESSAGE("hashcodes must differ.", nHashCode1 != nHashCode2 );
@@ -304,7 +304,7 @@ namespace rtl_ustr
 
         void indexOfChar_001()
             {
-                rtl::OUString aStr1("Line for a indexOfChar.");
+                OUString aStr1("Line for a indexOfChar.");
 
                 sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'L' );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
@@ -321,7 +321,7 @@ namespace rtl_ustr
 
         void indexOfChar_002()
             {
-                rtl::OUString aStr1("Line for a indexOfChar.");
+                OUString aStr1("Line for a indexOfChar.");
                 sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'y' );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -349,7 +349,7 @@ namespace rtl_ustr
 
         void lastIndexOfChar_001()
             {
-                rtl::OUString aStr1("Line for a lastIndexOfChar.");
+                OUString aStr1("Line for a lastIndexOfChar.");
 
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'C' );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 22);
@@ -366,7 +366,7 @@ namespace rtl_ustr
 
         void lastIndexOfChar_002()
             {
-                rtl::OUString aStr1("Line for a lastIndexOfChar.");
+                OUString aStr1("Line for a lastIndexOfChar.");
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'y' );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -394,35 +394,35 @@ namespace rtl_ustr
 
         void indexOfStr_000_1()
             {
-                rtl::OUString aStr1("Line for a indexOfStr.");
+                OUString aStr1("Line for a indexOfStr.");
                 rtl_ustr_indexOfStr( aStr1.getStr(), 0 );
             }
 
         void indexOfStr_001()
             {
-                rtl::OUString aStr1("Line for a indexOfStr.");
+                OUString aStr1("Line for a indexOfStr.");
 
-                rtl::OUString suSearch("Line");
+                OUString suSearch("Line");
                 sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
 
-                /* rtl::OUString */ suSearch("for");
+                /* OUString */ suSearch("for");
                 /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 5);
 
-                /* rtl::OUString */ suSearch("a");
+                /* OUString */ suSearch("a");
                 /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 9);
 
-                /* rtl::OUString */ suSearch("a index");
+                /* OUString */ suSearch("a index");
                 /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex ==9);
             }
 
         void indexOfStr_002()
             {
-                rtl::OUString aStr1("Line for a indexOfStr.");
-                rtl::OUString suSearch("not exist");
+                OUString aStr1("Line for a indexOfStr.");
+                OUString suSearch("not exist");
                 sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -450,31 +450,31 @@ namespace rtl_ustr
 
         void lastIndexOfStr_000_1()
             {
-                rtl::OUString aStr1("Line for a lastIndexOfStr.");
+                OUString aStr1("Line for a lastIndexOfStr.");
                 rtl_ustr_lastIndexOfStr( aStr1.getStr(), NULL );
             }
 
         void lastIndexOfStr_001()
             {
-                rtl::OUString aStr1("Line for a lastIndexOfStr.");
-                rtl::OUString aSearchStr("Index");
+                OUString aStr1("Line for a lastIndexOfStr.");
+                OUString aSearchStr("Index");
 
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 15);
 
-                /* rtl::OString */ aSearchStr = rtl::OUString("Line");
+                /* OString */ aSearchStr = OUString("Line");
                 /* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
 
-                /* rtl::OString */ aSearchStr = rtl::OUString();
+                /* OString */ aSearchStr = OUString();
                 /* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1);
             }
 
         void lastIndexOfStr_002()
             {
-                rtl::OUString aStr1("Line for a lastIndexOfStr.");
-                rtl::OUString aSearchStr("foo");
+                OUString aStr1("Line for a lastIndexOfStr.");
+                OUString aSearchStr("foo");
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -482,8 +482,8 @@ namespace rtl_ustr
 
         void lastIndexOfStr_003()
             {
-                rtl::OUString aStr1("Line for a lastIndexOfStr.");
-                rtl::OUString aSearchStr("O");
+                OUString aStr1("Line for a lastIndexOfStr.");
+                OUString aSearchStr("O");
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 20 );
@@ -512,8 +512,8 @@ namespace rtl_ustr
 
         void replaceChar_001()
             {
-                rtl::OUString aStr1("replace char.");
-                rtl::OUString aShouldStr1("ruplacu char.");
+                OUString aStr1("replace char.");
+                OUString aShouldStr1("ruplacu char.");
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc( nLength + sizeof(sal_Unicode)); // length + 1 (null terminator)
@@ -522,7 +522,7 @@ namespace rtl_ustr
                 pStr[aStr1.getLength()] = 0;
 
                 rtl_ustr_replaceChar( pStr, 'e', 'u' );
-                rtl::OUString suStr(pStr, aStr1.getLength());
+                OUString suStr(pStr, aStr1.getLength());
 
                 CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(suStr) == sal_True);
                 free(pStr);
@@ -553,8 +553,8 @@ namespace rtl_ustr
             }
         void replaceChar_WithLength_001()
             {
-                rtl::OUString aStr1("replace char.");
-                rtl::OUString aShouldStr1("ruplace char.");
+                OUString aStr1("replace char.");
+                OUString aShouldStr1("ruplace char.");
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -562,7 +562,7 @@ namespace rtl_ustr
                 memcpy(pStr, aStr1.getStr(), nLength);
 
                 rtl_ustr_replaceChar_WithLength( pStr, 6, 'e', 'u' );
-                rtl::OUString suStr(pStr, aStr1.getLength());
+                OUString suStr(pStr, aStr1.getLength());
 
                 CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(suStr) == sal_True);
                 free(pStr);
@@ -570,8 +570,8 @@ namespace rtl_ustr
 
         void replaceChar_WithLength_002()
             {
-                rtl::OUString aStr1      ("eeeeeeeeeeeee");
-                rtl::OUString aShouldStr1("uuuuuueeeeeee");
+                OUString aStr1      ("eeeeeeeeeeeee");
+                OUString aShouldStr1("uuuuuueeeeeee");
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);                 // no null terminator is need
@@ -579,7 +579,7 @@ namespace rtl_ustr
                 memcpy(pStr, aStr1.getStr(), nLength);
 
                 rtl_ustr_replaceChar_WithLength( pStr, 6, 'e', 'u' );
-                rtl::OUString suStr(pStr, aStr1.getLength());
+                OUString suStr(pStr, aStr1.getLength());
 
                 CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(suStr) == sal_True);
                 free(pStr);
@@ -608,8 +608,8 @@ namespace rtl_ustr
 
         void toAsciiLowerCase_001()
             {
-                rtl::OUString aStr1("CHANGE THIS TO ASCII LOWER CASE.");
-                rtl::OUString aShouldStr1("change this to ascii lower case.");
+                OUString aStr1("CHANGE THIS TO ASCII LOWER CASE.");
+                OUString aShouldStr1("change this to ascii lower case.");
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode) );  // we need to add '\0' so one more
@@ -618,7 +618,7 @@ namespace rtl_ustr
                 pStr[aStr1.getLength()] = 0;
 
                 rtl_ustr_toAsciiLowerCase( pStr );
-                rtl::OUString suStr(pStr, aStr1.getLength());
+                OUString suStr(pStr, aStr1.getLength());
 
                 CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(suStr) == sal_True);
                 free(pStr);
@@ -645,8 +645,8 @@ namespace rtl_ustr
 
         void toAsciiLowerCase_WithLength_001()
             {
-                rtl::OUString aStr1("CHANGE THIS TO ASCII LOWER CASE.");
-                rtl::OUString aShouldStr1("change thiS TO ASCII LOWER CASE.");
+                OUString aStr1("CHANGE THIS TO ASCII LOWER CASE.");
+                OUString aShouldStr1("change thiS TO ASCII LOWER CASE.");
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -655,7 +655,7 @@ namespace rtl_ustr
 
                 rtl_ustr_toAsciiLowerCase_WithLength( pStr, 10 );
 
-                rtl::OUString suStr(pStr, aStr1.getLength());
+                OUString suStr(pStr, aStr1.getLength());
                 sal_Bool bResult = aShouldStr1.equals(suStr);
 
                 printOUString(suStr);
@@ -687,8 +687,8 @@ namespace rtl_ustr
 
         void toAsciiUpperCase_001()
             {
-                rtl::OUString aStr1("change this to ascii upper case.");
-                rtl::OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
+                OUString aStr1("change this to ascii upper case.");
+                OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -697,7 +697,7 @@ namespace rtl_ustr
                 pStr[aStr1.getLength()] = 0;
 
                 rtl_ustr_toAsciiUpperCase( pStr );
-                rtl::OUString suStr(pStr, aStr1.getLength());
+                OUString suStr(pStr, aStr1.getLength());
 
                 CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(suStr) == sal_True);
                 free(pStr);
@@ -724,8 +724,8 @@ namespace rtl_ustr
 
         void toAsciiUpperCase_WithLength_001()
             {
-                rtl::OUString aStr1("change this to ascii lower case.");
-                rtl::OUString aShouldStr1("CHANGE THIs to ascii lower case.");
+                OUString aStr1("change this to ascii lower case.");
+                OUString aShouldStr1("CHANGE THIs to ascii lower case.");
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -733,7 +733,7 @@ namespace rtl_ustr
 
                 memcpy(pStr, aStr1.getStr(), nLength);
                 rtl_ustr_toAsciiUpperCase_WithLength( pStr, 10 );
-                rtl::OUString suStr(pStr, aStr1.getLength());
+                OUString suStr(pStr, aStr1.getLength());
 
                 // printf("Uppercase with length: '%s'\n", aStr1.getStr());
                 CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(suStr) == sal_True);
@@ -761,7 +761,7 @@ namespace rtl_ustr
 
         void trim_WithLength_000_1()
         {
-            rtl::OUString suStr("  trim this");
+            OUString suStr("  trim this");
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -773,20 +773,20 @@ namespace rtl_ustr
 
         void trim_WithLength_001()
         {
-            rtl::OUString suStr("  trim this");
+            OUString suStr("  trim this");
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
             memcpy(pStr, suStr.getStr(), nLength);
 
             rtl_ustr_trim_WithLength( pStr, 2 );
 
-            CPPUNIT_ASSERT_MESSAGE("string should be empty", rtl::OUString(pStr).getLength() == 0);
+            CPPUNIT_ASSERT_MESSAGE("string should be empty", OUString(pStr).getLength() == 0);
             free(pStr);
         }
 
         void trim_WithLength_002()
         {
-            rtl::OUString suStr("trim this");
+            OUString suStr("trim this");
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -794,13 +794,13 @@ namespace rtl_ustr
 
             rtl_ustr_trim_WithLength( pStr, 5 );
 
-            CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", rtl::OUString(pStr).getLength() == 4);
+            CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", OUString(pStr).getLength() == 4);
             free(pStr);
         }
 
         void trim_WithLength_003()
         {
-            rtl::OUString suStr("     trim   this");
+            OUString suStr("     trim   this");
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -808,13 +808,13 @@ namespace rtl_ustr
 
             rtl_ustr_trim_WithLength( pStr, 11 );
 
-            CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", rtl::OUString(pStr).getLength() == 4);
+            CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", OUString(pStr).getLength() == 4);
             free(pStr);
         }
 
         void trim_WithLength_004()
         {
-            rtl::OUString suStr("\r\n\t \n\r    trim  \n this");
+            OUString suStr("\r\n\t \n\r    trim  \n this");
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -822,13 +822,13 @@ namespace rtl_ustr
 
             rtl_ustr_trim_WithLength( pStr, 17 );
 
-            CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", rtl::OUString(pStr).getLength() == 4);
+            CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", OUString(pStr).getLength() == 4);
             free(pStr);
         }
 
         void trim_WithLength_005()
         {
-            rtl::OUString suStr("\r\n\t \n\r    trim \t this \n\r\t\t     ");
+            OUString suStr("\r\n\t \n\r    trim \t this \n\r\t\t     ");
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -836,7 +836,7 @@ namespace rtl_ustr
 
             rtl_ustr_trim_WithLength( pStr, suStr.getLength() );
 
-            CPPUNIT_ASSERT_MESSAGE("string should contain 'trim \\t this'", rtl::OUString(pStr).getLength() == 11);
+            CPPUNIT_ASSERT_MESSAGE("string should contain 'trim \\t this'", OUString(pStr).getLength() == 11);
             free(pStr);
         }
 
@@ -899,7 +899,7 @@ namespace rtl_ustr
 
         void equal_ascii_shorter()
         {
-            rtl::OUString refStr("referenceString");
+            OUString refStr("referenceString");
             char const * pAscii = "reference";
 
             sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii);
@@ -908,7 +908,7 @@ namespace rtl_ustr
 
         void equal_ascii_shorter_asciiLength()
         {
-            rtl::OUString refStr("referenceString");
+            OUString refStr("referenceString");
             char const * pAscii = "reference";
 
             sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, rtl_str_getLength(pAscii), pAscii);
@@ -917,7 +917,7 @@ namespace rtl_ustr
 
         void equal_ref_shorter()
         {
-            rtl::OUString refStr("reference");
+            OUString refStr("reference");
             char const * pAscii = "referenceString";
 
             sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii);
@@ -926,7 +926,7 @@ namespace rtl_ustr
 
         void equal()
         {
-            rtl::OUString refStr("reference");
+            OUString refStr("reference");
             char const * pAscii = "reference";
 
             sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii);
@@ -935,7 +935,7 @@ namespace rtl_ustr
 
         void unequal_reference_bigger()
        {
-            rtl::OUString refStr("defghi");
+            OUString refStr("defghi");
             char const * pAscii = "abc";
 
             sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii);
@@ -944,7 +944,7 @@ namespace rtl_ustr
 
         void unequal_ascii_bigger()
         {
-            rtl::OUString refStr("abc");
+            OUString refStr("abc");
             char const * pAscii = "defghi";
 
             sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii);
@@ -975,21 +975,21 @@ namespace rtl_ustr
 
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_1()
             {
-                rtl::OUString aStr1("Line must be equal.");
+                OUString aStr1("Line must be equal.");
                 rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0);
                 // should not GPF
             }
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_2()
             {
-                rtl::OUString aStr1("Line must be equal.");
-                rtl::OString sStr2 =                                 "Line is shorter.";
+                OUString aStr1("Line must be equal.");
+                OString sStr2 =                                 "Line is shorter.";
                 rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr(), 0);
                 // should not GPF
             }
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_001()
             {
-                rtl::OUString suStr1;
-                rtl::OString sStr2;
+                OUString suStr1;
+                OString sStr2;
 
                 sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1, 0, sStr2.getStr(), 0);
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -997,8 +997,8 @@ namespace rtl_ustr
 
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_002()
             {
-                rtl::OUString suStr1("Line must be equal.");
-                rtl::OString sStr2 =                                  "Line must be equal.";
+                OUString suStr1("Line must be equal.");
+                OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1006,8 +1006,8 @@ namespace rtl_ustr
 
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_003()
             {
-                rtl::OUString suStr1("Line must differ.");
-                rtl::OString sStr2 =                                  "Line must be differ and longer.";
+                OUString suStr1("Line must differ.");
+                OString sStr2 =                                  "Line must be differ and longer.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -1039,21 +1039,21 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_WithLength_000_1()
             {
-                rtl::OUString aStr1("Line must be equal.");
+                OUString aStr1("Line must be equal.");
                 rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), 0, NULL);
                 // should not GPF
             }
         void ascii_compareIgnoreAsciiCase_WithLength_000_2()
             {
-                rtl::OUString aStr1("Line must be equal.");
-                rtl::OString sStr2 =                                 "Line is shorter.";
+                OUString aStr1("Line must be equal.");
+                OString sStr2 =                                 "Line is shorter.";
                 rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr());
                 // should not GPF
             }
         void ascii_compareIgnoreAsciiCase_WithLength_001()
             {
-                rtl::OUString suStr1;
-                rtl::OString sStr2;
+                OUString suStr1;
+                OString sStr2;
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1, 0, sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compareIgnoreAsciiCase_WithLength failed, strings are equal.", nValue == 0);
@@ -1061,8 +1061,8 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_WithLength_002()
             {
-                rtl::OUString suStr1("Line must be equal.");
-                rtl::OString sStr2 =                                  "Line must be equal.";
+                OUString suStr1("Line must be equal.");
+                OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1070,8 +1070,8 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_WithLength_003()
             {
-                rtl::OUString suStr1("Line must differ.");
-                rtl::OString sStr2 =                                  "Line must be differ and longer.";
+                OUString suStr1("Line must differ.");
+                OString sStr2 =                                  "Line must be differ and longer.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -1103,14 +1103,14 @@ namespace rtl_ustr
 
         void ascii_compare_000_1()
             {
-                rtl::OUString aStr1("Line must be equal.");
+                OUString aStr1("Line must be equal.");
                 rtl_ustr_ascii_compare( aStr1.getStr(), NULL);
                 // should not GPF
             }
         void ascii_compare_001()
             {
-                rtl::OUString suStr1;
-                rtl::OString sStr2;
+                OUString suStr1;
+                OString sStr2;
 
                 sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1, sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1118,8 +1118,8 @@ namespace rtl_ustr
 
         void ascii_compare_002()
             {
-                rtl::OUString suStr1("Line must be equal.");
-                rtl::OString sStr2 =                                  "Line must be equal.";
+                OUString suStr1("Line must be equal.");
+                OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1127,8 +1127,8 @@ namespace rtl_ustr
 
         void ascii_compare_003()
             {
-                rtl::OUString suStr1("Line must differ.");
-                rtl::OString sStr2 = "Line foo bar, ok, differ.";
+                OUString suStr1("Line must differ.");
+                OString sStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -1159,14 +1159,14 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_000_1()
             {
-                rtl::OUString aStr1("Line must be equal.");
+                OUString aStr1("Line must be equal.");
                 rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
                 // should not GPF
             }
         void ascii_compareIgnoreAsciiCase_001()
             {
-                rtl::OUString suStr1;
-                rtl::OString sStr2;
+                OUString suStr1;
+                OString sStr2;
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1, sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1174,8 +1174,8 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002()
             {
-                rtl::OUString suStr1("Line must be equal.");
-                rtl::OString sStr2 =                                  "Line must be equal.";
+                OUString suStr1("Line must be equal.");
+                OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1183,8 +1183,8 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002_1()
             {
-                rtl::OUString suStr1("Line must be equal, when ignore case.");
-                rtl::OString sStr2 =                                 "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
+                OUString suStr1("Line must be equal, when ignore case.");
+                OString sStr2 =                                 "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
@@ -1192,8 +1192,8 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_003()
             {
-                rtl::OUString suStr1("Line must differ.");
-                rtl::OString sStr2 = "Line foo bar, ok, differ.";
+                OUString suStr1("Line must differ.");
+                OString sStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -1203,8 +1203,8 @@ namespace rtl_ustr
 
         // void ascii_compareIgnoreAsciiCase_001()
         //     {
-        //         rtl::OUString suStr1("change this to ascii upper case.");
-        //         rtl::OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
+        //         OUString suStr1("change this to ascii upper case.");
+        //         OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
         //
         //         sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode);
         //         sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -1213,7 +1213,7 @@ namespace rtl_ustr
         //         memcpy(pStr, suStr1.getStr(), nLength);
         //
         //         rtl_ustr_ascii_compareIgnoreAsciiCase( pStr );
-        //         rtl::OUString suStr(pStr, suStr1.getLength());
+        //         OUString suStr(pStr, suStr1.getLength());
         //
         //         CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(suStr) == sal_True);
         //         free(pStr);
@@ -1256,14 +1256,14 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_000_1()
             {
-                rtl::OUString aStr1("Line must be equal.");
+                OUString aStr1("Line must be equal.");
                 rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
                 // should not GPF
             }
         void ascii_compareIgnoreAsciiCase_001()
             {
-                rtl::OUString suStr1;
-                rtl::OString sStr2;
+                OUString suStr1;
+                OString sStr2;
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1, sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1271,8 +1271,8 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002()
             {
-                rtl::OUString suStr1("Line must be equal.");
-                rtl::OString sStr2 =                                  "Line must be equal.";
+                OUString suStr1("Line must be equal.");
+                OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1280,8 +1280,8 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002_1()
             {
-                rtl::OUString suStr1("Line must be equal, when ignore case.");
-                rtl::OString sStr2 =                                 "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
+                OUString suStr1("Line must be equal, when ignore case.");
+                OString sStr2 =                                 "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
@@ -1289,8 +1289,8 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_003()
             {
-                rtl::OUString suStr1("Line must differ.");
-                rtl::OString sStr2 = "Line foo bar, ok, differ.";
+                OUString suStr1("Line must differ.");
+                OString sStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -1300,8 +1300,8 @@ namespace rtl_ustr
 
         // void ascii_compareIgnoreAsciiCase_001()
         //     {
-        //         rtl::OUString suStr1("change this to ascii upper case.");
-        //         rtl::OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
+        //         OUString suStr1("change this to ascii upper case.");
+        //         OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
         //
         //         sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode);
         //         sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -1310,7 +1310,7 @@ namespace rtl_ustr
         //         memcpy(pStr, suStr1.getStr(), nLength);
         //
         //         rtl_ustr_ascii_compareIgnoreAsciiCase( pStr );
-        //         rtl::OUString suStr(pStr, suStr1.getLength());
+        //         OUString suStr(pStr, suStr1.getLength());
         //
         //         CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(suStr) == sal_True);
         //         free(pStr);
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
index b51bfb9a1132..f1a151fdc836 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
@@ -27,7 +27,7 @@ private:
 void AppendChar::testAppendChar() {
     // Check that append('a') does not unexpectedly pick
     // append(sal_Int32 i, sal_Int16 radix = 10):
-    rtl::OUStringBuffer s;
+    OUStringBuffer s;
     s.append('a');
     CPPUNIT_ASSERT_EQUAL(sal_Int32(1), s.getLength());
     CPPUNIT_ASSERT_EQUAL(u'a', s[0]);
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
index 3601bd4c47ab..c50f9699ad49 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
@@ -40,14 +40,14 @@ private:
 CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::ToString);
 
 void test::oustringbuffer::ToString::testToString() {
-    rtl::OUStringBuffer sb(rtl::OUString("test string"));
-    rtl::OUString str = sb.toString();
-    CPPUNIT_ASSERT_EQUAL( rtl::OUString("test string"), str );
+    OUStringBuffer sb(OUString("test string"));
+    OUString str = sb.toString();
+    CPPUNIT_ASSERT_EQUAL( OUString("test string"), str );
     // returned OUString must be independent from sb
     sb.append( 'a' );
-    CPPUNIT_ASSERT_EQUAL( rtl::OUString("test string"), str );
+    CPPUNIT_ASSERT_EQUAL( OUString("test string"), str );
     sb.setLength(0);
-    CPPUNIT_ASSERT_EQUAL( rtl::OUString("test string"), str );
+    CPPUNIT_ASSERT_EQUAL( OUString("test string"), str );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
index 9dfcf0de8332..53f738285761 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
@@ -46,7 +46,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::Utf32);
 
 namespace {
 
-void appendString(rtl::OStringBuffer & buffer, rtl::OUString const & string) {
+void appendString(OStringBuffer & buffer, OUString const & string) {
     buffer.append('"');
     for (int i = 0; i < string.getLength(); ++i) {
         buffer.append("\\u");
@@ -67,8 +67,8 @@ void appendString(rtl::OStringBuffer & buffer, rtl::OUString const & string) {
 }
 
 void createMessage(
-    rtl::OStringBuffer & message, rtl::OUString const & string1,
-    rtl::OUString const & string2)
+    OStringBuffer & message, OUString const & string1,
+    OUString const & string2)
 {
     message.setLength(0);
     appendString(message, string1);
@@ -85,19 +85,19 @@ void test::oustringbuffer::Utf32::appendUtf32() {
     sal_Unicode const str2[str2Len] = { 'a', 'b', 'c', 'd' };
     int const str3Len = 6;
     sal_Unicode const str3[str3Len] = { 'a', 'b', 'c', 'd', 0xD800, 0xDC00 };
-    rtl::OStringBuffer message;
-    rtl::OUStringBuffer buf1(rtl::OUString(str1, str1Len));
+    OStringBuffer message;
+    OUStringBuffer buf1(OUString(str1, str1Len));
     buf1.appendUtf32('d');
-    rtl::OUString res1(buf1.makeStringAndClear());
-    createMessage(message, res1, rtl::OUString(str2, str2Len));
+    OUString res1(buf1.makeStringAndClear());
+    createMessage(message, res1, OUString(str2, str2Len));
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
-        message.getStr(), rtl::OUString(str2, str2Len), res1);
-    rtl::OUStringBuffer buf2(rtl::OUString(str2, str2Len));
+        message.getStr(), OUString(str2, str2Len), res1);
+    OUStringBuffer buf2(OUString(str2, str2Len));
     buf2.appendUtf32(0x10000);
-    rtl::OUString res2(buf2.makeStringAndClear());
-    createMessage(message, res2, rtl::OUString(str3, str3Len));
+    OUString res2(buf2.makeStringAndClear());
+    createMessage(message, res2, OUString(str3, str3Len));
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
-        message.getStr(), rtl::OUString(str3, str3Len), res2);
+        message.getStr(), OUString(str3, str3Len), res2);
 }
 
 void test::oustringbuffer::Utf32::insertUtf32() {
@@ -107,19 +107,19 @@ void test::oustringbuffer::Utf32::insertUtf32() {
     sal_Unicode const str2[str2Len] = { 'a', 'b', 'd', 'c' };
     int const str3Len = 6;
     sal_Unicode const str3[str3Len] = { 'a', 'b', 0xDBFF, 0xDFFF, 'd', 'c' };
-    rtl::OStringBuffer message;
-    rtl::OUStringBuffer buf1(rtl::OUString(str1, str1Len));
+    OStringBuffer message;
+    OUStringBuffer buf1(OUString(str1, str1Len));
     buf1.insertUtf32(2, 'd');
-    rtl::OUString res1(buf1.makeStringAndClear());
-    createMessage(message, res1, rtl::OUString(str2, str2Len));
+    OUString res1(buf1.makeStringAndClear());
+    createMessage(message, res1, OUString(str2, str2Len));
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
-        message.getStr(), rtl::OUString(str2, str2Len), res1);
-    rtl::OUStringBuffer buf2(rtl::OUString(str2, str2Len));
+        message.getStr(), OUString(str2, str2Len), res1);
+    OUStringBuffer buf2(OUString(str2, str2Len));
     buf2.insertUtf32(2, 0x10FFFF);
-    rtl::OUString res2(buf2.makeStringAndClear());
-    createMessage(message, res2, rtl::OUString(str3, str3Len));
+    OUString res2(buf2.makeStringAndClear());
+    createMessage(message, res2, OUString(str3, str3Len));
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
-        message.getStr(), rtl::OUString(str3, str3Len), res2);
+        message.getStr(), OUString(str3, str3Len), res2);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/process/child_process.cxx b/sal/qa/rtl/process/child_process.cxx
index a51cdde51631..d5039b059c96 100644
--- a/sal/qa/rtl/process/child_process.cxx
+++ b/sal/qa/rtl/process/child_process.cxx
@@ -40,8 +40,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(, argv)
     for( sal_Int32 i = 0 ; i < nCount ; i ++ )
     {
         rtl_getAppCommandArg( i , &(suArg[i].pData) );
-        rtl::OString aString;
-        aString = ::rtl::OUStringToOString( suArg[i], RTL_TEXTENCODING_ASCII_US );
+        OString aString;
+        aString = OUStringToOString( suArg[i], RTL_TEXTENCODING_ASCII_US );
         printf(
             "# Parameter[%ld] is %s\n", sal::static_int_cast< long >(i),
             aString.getStr());
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index ab3b8433d4c3..37e79825c739 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -37,26 +37,22 @@
 
 using namespace osl;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
-
 /** print a UNI_CODE String. And also print some comments of the string.
 */
-static void printUString( const ::rtl::OUString & str, const sal_Char * msg )
+static void printUString( const OUString & str, const sal_Char * msg )
 {
     if ( msg != nullptr )
     {
         printf("#%s #printUString_u# ", msg );
     }
-    rtl::OString aString;
-    aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
+    OString aString;
+    aString = OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
     printf("%s\n", aString.getStr( ) );
 }
 
-static ::rtl::OUString getModulePath()
+static OUString getModulePath()
 {
-    ::rtl::OUString suDirPath;
+    OUString suDirPath;
     ::osl::Module::getUrlFromAddress(
         reinterpret_cast< oslGenericFunction >(getModulePath), suDirPath );
 
@@ -75,12 +71,12 @@ public:
     void getAppCommandArg_001()
     {
 #if defined(_WIN32)
-    const rtl::OUString EXECUTABLE_NAME("child_process.exe");
+    const OUString EXECUTABLE_NAME("child_process.exe");
 #else
-    const rtl::OUString EXECUTABLE_NAME("child_process");
+    const OUString EXECUTABLE_NAME("child_process");
 #endif
-        rtl::OUString suCWD = getModulePath();
-        // rtl::OUString suCWD2 = getExecutableDirectory();
+        OUString suCWD = getModulePath();
+        // OUString suCWD2 = getExecutableDirectory();
 
         printUString(suCWD, "path to the current module");
         // printUString(suCWD2, "suCWD2");
@@ -95,7 +91,7 @@ public:
         pParameters[2] = suParam2.pData;
         pParameters[3] = suParam3.pData;
 
-        rtl::OUString suFileURL = suCWD + "/" + EXECUTABLE_NAME;
+        OUString suFileURL = suCWD + "/" + EXECUTABLE_NAME;
 
         oslProcessError osl_error = osl_executeProcess(
             suFileURL.pData,
@@ -200,9 +196,9 @@ public:
     void getGlobalProcessId_002()
     {
 #if defined(_WIN32)
-    const rtl::OUString EXEC_NAME("child_process_id.exe");
+    const OUString EXEC_NAME("child_process_id.exe");
 #else
-    const rtl::OUString EXEC_NAME("child_process_id");
+    const OUString EXEC_NAME("child_process_id");
 #endif
         sal_uInt8 pTargetUUID1[16];
         rtl_getGlobalProcessId( pTargetUUID1 );
@@ -211,9 +207,9 @@ public:
           printUuidtoBuffer( pTargetUUID1, pUUID1 );
     printf("# UUID to String is %s\n", pUUID1);
 
-    rtl::OUString suCWD = getModulePath();
+    OUString suCWD = getModulePath();
         oslProcess hProcess = nullptr;
-       rtl::OUString suFileURL = suCWD + "/" + EXEC_NAME;
+       OUString suFileURL = suCWD + "/" + EXEC_NAME;
     oslFileHandle* pChildOutputRead = new oslFileHandle();
         oslProcessError osl_error = osl_executeProcess_WithRedirectedIO(
             suFileURL.pData,
diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h
index 8f5c7463c261..50c38eb97e6a 100644
--- a/sal/qa/rtl/process/rtl_Process_Const.h
+++ b/sal/qa/rtl/process/rtl_Process_Const.h
@@ -27,10 +27,10 @@ extern "C"
 {
 #endif
 
-::rtl::OUString suParam0("-join");
-::rtl::OUString suParam1("-with");
-::rtl::OUString suParam2("-child");
-::rtl::OUString suParam3("-process");
+OUString suParam0("-join");
+OUString suParam1("-with");
+OUString suParam2("-child");
+OUString suParam3("-process");
 
 #ifdef __cplusplus
 }
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx
index 5e9bc0f73a5d..2f4172e51493 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -48,18 +48,18 @@ void test::oustring::Compare::equalsIgnoreAsciiCaseAscii()
     const char* const abc = "abc";
     const char* const abcd = "abcd";
     const char* const empty = "";
-    CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAscii(abc));
-    CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAsciiL(abc,3));
-    CPPUNIT_ASSERT(!rtl::OUString("abc").
+    CPPUNIT_ASSERT(!OUString().equalsIgnoreAsciiCaseAscii(abc));
+    CPPUNIT_ASSERT(!OUString().equalsIgnoreAsciiCaseAsciiL(abc,3));
+    CPPUNIT_ASSERT(!OUString("abc").
                    equalsIgnoreAsciiCaseAscii(empty));
-    CPPUNIT_ASSERT(!rtl::OUString("abc").
+    CPPUNIT_ASSERT(!OUString("abc").
                    equalsIgnoreAsciiCaseAsciiL(empty,0));
 
-    CPPUNIT_ASSERT(rtl::OUString("abc").
+    CPPUNIT_ASSERT(OUString("abc").
                    equalsIgnoreAsciiCaseAscii(abc));
-    CPPUNIT_ASSERT(!rtl::OUString("abcd").
+    CPPUNIT_ASSERT(!OUString("abcd").
                    equalsIgnoreAsciiCaseAscii(abc));
-    CPPUNIT_ASSERT(!rtl::OUString("abc").
+    CPPUNIT_ASSERT(!OUString("abc").
                    equalsIgnoreAsciiCaseAscii(abcd));
 }
 
@@ -67,12 +67,12 @@ void test::oustring::Compare::compareToIgnoreAsciiCase()
 {
     CPPUNIT_ASSERT_EQUAL(
         sal_Int32(0),
-        rtl::OUString("abc").compareToIgnoreAsciiCase("ABC"));
+        OUString("abc").compareToIgnoreAsciiCase("ABC"));
     CPPUNIT_ASSERT(
-        rtl::OUString("ABC").compareToIgnoreAsciiCase("abcdef")
+        OUString("ABC").compareToIgnoreAsciiCase("abcdef")
         < 0);
     CPPUNIT_ASSERT(
-        rtl::OUString("A").compareToIgnoreAsciiCase("_") > 0);
+        OUString("A").compareToIgnoreAsciiCase("_") > 0);
 }
 
 void test::oustring::Compare::compareTo()
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx
index b80c446936dd..cbf32ec13d52 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -55,14 +55,14 @@ struct TestConvertToString
 
 void testConvertToString(TestConvertToString const & rTest)
 {
-    const rtl::OUString aSource(rTest.aSource, rTest.nLength);
-    rtl::OString aStrict(RTL_CONSTASCII_STRINGPARAM("12345"));
+    const OUString aSource(rTest.aSource, rTest.nLength);
+    OString aStrict(RTL_CONSTASCII_STRINGPARAM("12345"));
     bool bSuccess = aSource.convertToString(&aStrict, rTest.nEncoding,
                                             rTest.nFlags);
-    rtl::OString aRelaxed(rtl::OUStringToOString(aSource, rTest.nEncoding,
+    OString aRelaxed(OUStringToOString(aSource, rTest.nEncoding,
                                                  rTest.nFlags));
 
-    rtl::OStringBuffer aPrefix;
+    OStringBuffer aPrefix;
     aPrefix.append("{");
     for (sal_Int32 i = 0; i < rTest.nLength; ++i)
     {
@@ -81,7 +81,7 @@ void testConvertToString(TestConvertToString const & rTest)
     {
         if (rTest.pStrict == nullptr || aStrict != rTest.pStrict)
         {
-            rtl::OStringBuffer aMessage(aPrefix);
+            OStringBuffer aMessage(aPrefix);
             aMessage.append("strict = \"");
             aMessage.append(aStrict);
             aMessage.append("\"");
@@ -90,22 +90,22 @@ void testConvertToString(TestConvertToString const & rTest)
     }
     else
     {
-        if (aStrict != rtl::OString(RTL_CONSTASCII_STRINGPARAM("12345")))
+        if (aStrict != OString(RTL_CONSTASCII_STRINGPARAM("12345")))
         {
-            rtl::OStringBuffer aMessage(aPrefix);
+            OStringBuffer aMessage(aPrefix);
             aMessage.append("modified output");
             CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), false);
         }
         if (rTest.pStrict != nullptr)
         {
-            rtl::OStringBuffer aMessage(aPrefix);
+            OStringBuffer aMessage(aPrefix);
             aMessage.append("failed");
             CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), false);
         }
     }
     if (aRelaxed != rTest.pRelaxed)
     {
-        rtl::OStringBuffer aMessage(aPrefix);
+        OStringBuffer aMessage(aPrefix);
         aMessage.append("relaxed = \"");
         aMessage.append(aRelaxed);
         aMessage.append("\"");
diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx
index 22c68abd1d2e..33858e12ae23 100644
--- a/sal/qa/rtl/strings/test_oustring_endswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx
@@ -45,7 +45,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::EndsWith);
 
 namespace {
 
-void appendString(rtl::OStringBuffer & buffer, rtl::OString const & string)
+void appendString(OStringBuffer & buffer, OString const & string)
 {
     buffer.append('"');
     for (int i = 0; i < string.getLength(); ++i) {
@@ -94,16 +94,16 @@ void test::oustring::EndsWith::endsWith()
         { RTL_CONSTASCII_STRINGPARAM("a\0b\0c"),
           RTL_CONSTASCII_STRINGPARAM("b"), false } };
     for (size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
-        rtl::OStringBuffer msg;
-        appendString(msg, rtl::OString(data[i].str1, data[i].str1Len));
+        OStringBuffer msg;
+        appendString(msg, OString(data[i].str1, data[i].str1Len));
         msg.append(".endsWithIgnoreAsciiCaseAsciiL(");
-        appendString(msg, rtl::OString(data[i].str2, data[i].str2Len));
+        appendString(msg, OString(data[i].str2, data[i].str2Len));
         msg.append(") == ");
         msg.append(data[i].endsWith);
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             msg.getStr(),
             data[i].endsWith,
-            rtl::OUString(
+            OUString(
                 data[i].str1, data[i].str1Len,
                 RTL_TEXTENCODING_ASCII_US).endsWithIgnoreAsciiCaseAsciiL(
                     data[i].str2, data[i].str2Len));
diff --git a/sal/qa/rtl/strings/test_oustring_startswith.cxx b/sal/qa/rtl/strings/test_oustring_startswith.cxx
index 3a8a15a03377..43d4c9e921c4 100644
--- a/sal/qa/rtl/strings/test_oustring_startswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_startswith.cxx
@@ -30,9 +30,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StartsWith);
 
 void test::oustring::StartsWith::startsWith()
 {
-    CPPUNIT_ASSERT( rtl::OUString( "foobar" ).startsWith( "foo" ));
-    CPPUNIT_ASSERT( !rtl::OUString( "foo" ).startsWith( "foobar" ));
-    CPPUNIT_ASSERT( !rtl::OUString( "foobar" ).startsWith( "oo" ));
+    CPPUNIT_ASSERT( OUString( "foobar" ).startsWith( "foo" ));
+    CPPUNIT_ASSERT( !OUString( "foo" ).startsWith( "foobar" ));
+    CPPUNIT_ASSERT( !OUString( "foobar" ).startsWith( "oo" ));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/strings/test_strings_replace.cxx b/sal/qa/rtl/strings/test_strings_replace.cxx
index 40c0117e5c66..a27f5f14286b 100644
--- a/sal/qa/rtl/strings/test_strings_replace.cxx
+++ b/sal/qa/rtl/strings/test_strings_replace.cxx
@@ -66,175 +66,175 @@ private:
 
 void Test::stringReplaceFirst() {
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OString("otherbarfoo"),
-        rtl::OString("foobarfoo").replaceFirst("foo", "other"));
+        OString("otherbarfoo"),
+        OString("foobarfoo").replaceFirst("foo", "other"));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OString("foobarfoo"),
-        rtl::OString("foobarfoo").replaceFirst("bars", "other"));
+        OString("foobarfoo"),
+        OString("foobarfoo").replaceFirst("bars", "other"));
 
     {
         sal_Int32 n = 0;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OString("otherbarfoo"),
-            rtl::OString("foobarfoo").replaceFirst("foo", "other", &n));
+            OString("otherbarfoo"),
+            OString("foobarfoo").replaceFirst("foo", "other", &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
     }
 
     {
         sal_Int32 n = 1;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OString("foobarother"),
-            rtl::OString("foobarfoo").replaceFirst("foo", "other", &n));
+            OString("foobarother"),
+            OString("foobarfoo").replaceFirst("foo", "other", &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
     }
 
     {
         sal_Int32 n = 4;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OString("foobarfoo"),
-            rtl::OString("foobarfoo").replaceFirst("bar", "other", &n));
+            OString("foobarfoo"),
+            OString("foobarfoo").replaceFirst("bar", "other", &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
     }
 }
 
 void Test::stringReplaceAll() {
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OString("otherbarother"),
-        rtl::OString("foobarfoo").replaceAll("foo", "other"));
+        OString("otherbarother"),
+        OString("foobarfoo").replaceAll("foo", "other"));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OString("foobarfoo"),
-        rtl::OString("foobarfoo").replaceAll("bars", "other"));
+        OString("foobarfoo"),
+        OString("foobarfoo").replaceAll("bars", "other"));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OString("xxa"), rtl::OString("xaa").replaceAll("xa", "xx"));
+        OString("xxa"), OString("xaa").replaceAll("xa", "xx"));
 }
 
 void Test::ustringReplaceFirst() {
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("otherbarfoo"),
-        rtl::OUString("foobarfoo").replaceFirst(s_foo, s_other));
+        OUString("otherbarfoo"),
+        OUString("foobarfoo").replaceFirst(s_foo, s_other));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("foobarfoo"),
-        rtl::OUString("foobarfoo").replaceFirst(s_bars, s_other));
+        OUString("foobarfoo"),
+        OUString("foobarfoo").replaceFirst(s_bars, s_other));
 
     {
         sal_Int32 n = 0;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("otherbarfoo"),
-            rtl::OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
+            OUString("otherbarfoo"),
+            OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
     }
 
     {
         sal_Int32 n = 1;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("foobarother"),
-            rtl::OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
+            OUString("foobarother"),
+            OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
     }
 
     {
         sal_Int32 n = 4;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("foobarfoo"),
-            rtl::OUString("foobarfoo").replaceFirst(s_bar, s_other, &n));
+            OUString("foobarfoo"),
+            OUString("foobarfoo").replaceFirst(s_bar, s_other, &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
     }
 }
 
 void Test::ustringReplaceFirstAsciiL() {
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("otherbarfoo"),
-        rtl::OUString("foobarfoo").replaceFirst("foo", s_other));
+        OUString("otherbarfoo"),
+        OUString("foobarfoo").replaceFirst("foo", s_other));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("foobarfoo"),
-        rtl::OUString("foobarfoo").replaceFirst("bars", s_other));
+        OUString("foobarfoo"),
+        OUString("foobarfoo").replaceFirst("bars", s_other));
 
     {
         sal_Int32 n = 0;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("otherbarfoo"),
-            rtl::OUString("foobarfoo").replaceFirst("foo", s_other, &n));
+            OUString("otherbarfoo"),
+            OUString("foobarfoo").replaceFirst("foo", s_other, &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
     }
 
     {
         sal_Int32 n = 1;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("foobarother"),
-            rtl::OUString("foobarfoo").replaceFirst("foo", s_other, &n));
+            OUString("foobarother"),
+            OUString("foobarfoo").replaceFirst("foo", s_other, &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
     }
 
     {
         sal_Int32 n = 4;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("foobarfoo"),
-            rtl::OUString("foobarfoo").replaceFirst("bar", s_other, &n));
+            OUString("foobarfoo"),
+            OUString("foobarfoo").replaceFirst("bar", s_other, &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
     }
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString(), rtl::OUString("xa").replaceFirst("xa", s_empty));
+        OUString(), OUString("xa").replaceFirst("xa", s_empty));
 }
 
 void Test::ustringReplaceFirstToAsciiL() {
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("otherbarfoo"),
-        rtl::OUString("foobarfoo").replaceFirst(s_foo, "other"));
+        OUString("otherbarfoo"),
+        OUString("foobarfoo").replaceFirst(s_foo, "other"));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("foobarfoo"),
-        rtl::OUString("foobarfoo").replaceFirst(s_bars, "other"));
+        OUString("foobarfoo"),
+        OUString("foobarfoo").replaceFirst(s_bars, "other"));
 
     {
         sal_Int32 n = 0;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("otherbarfoo"),
-            rtl::OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
+            OUString("otherbarfoo"),
+            OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
     }
 
     {
         sal_Int32 n = 1;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("foobarother"),
-            rtl::OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
+            OUString("foobarother"),
+            OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
     }
 
     {
         sal_Int32 n = 4;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("foobarfoo"),
-            rtl::OUString("foobarfoo").replaceFirst(s_bar, "other", &n));
+            OUString("foobarfoo"),
+            OUString("foobarfoo").replaceFirst(s_bar, "other", &n));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
     }
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString(), rtl::OUString("xa").replaceFirst(s_xa, ""));
+        OUString(), OUString("xa").replaceFirst(s_xa, ""));
 }
 
 void Test::ustringReplaceFirstAsciiLAsciiL() {
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("otherbarfoo"),
-        (rtl::OUString("foobarfoo").
+        OUString("otherbarfoo"),
+        (OUString("foobarfoo").
          replaceFirst("foo", "other")));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("foobarfoo"),
-        (rtl::OUString("foobarfoo").
+        OUString("foobarfoo"),
+        (OUString("foobarfoo").
          replaceFirst("bars", "other")));
 
     {
         sal_Int32 n = 0;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("otherbarfoo"),
-            (rtl::OUString("foobarfoo").
+            OUString("otherbarfoo"),
+            (OUString("foobarfoo").
              replaceFirst("foo", "other", &n)));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
     }
@@ -242,8 +242,8 @@ void Test::ustringReplaceFirstAsciiLAsciiL() {
     {
         sal_Int32 n = 1;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("foobarother"),
-            (rtl::OUString("foobarfoo").
+            OUString("foobarother"),
+            (OUString("foobarfoo").
              replaceFirst("foo", "other", &n)));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
     }
@@ -251,82 +251,82 @@ void Test::ustringReplaceFirstAsciiLAsciiL() {
     {
         sal_Int32 n = 4;
         CPPUNIT_ASSERT_EQUAL(
-            rtl::OUString("foobarfoo"),
-            (rtl::OUString("foobarfoo").
+            OUString("foobarfoo"),
+            (OUString("foobarfoo").
              replaceFirst("bar", "other", &n)));
         CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
     }
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString(), rtl::OUString("xa").replaceFirst("xa", ""));
+        OUString(), OUString("xa").replaceFirst("xa", ""));
 }
 
 void Test::ustringReplaceAll() {
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("otherbarother"),
-        rtl::OUString("foobarfoo").replaceAll(s_foo, s_other));
+        OUString("otherbarother"),
+        OUString("foobarfoo").replaceAll(s_foo, s_other));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("foobarfoo"),
-        rtl::OUString("foobarfoo").replaceAll(s_bars, s_other));
+        OUString("foobarfoo"),
+        OUString("foobarfoo").replaceAll(s_bars, s_other));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("xxa"),
-        rtl::OUString("xaa").replaceAll(s_xa, s_xx));
+        OUString("xxa"),
+        OUString("xaa").replaceAll(s_xa, s_xx));
 }
 
 void Test::ustringReplaceAllAsciiL() {
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("otherbarother"),
-        rtl::OUString("foobarfoo").replaceAll("foo", s_other));
+        OUString("otherbarother"),
+        OUString("foobarfoo").replaceAll("foo", s_other));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("foobarfoo"),
-        rtl::OUString("foobarfoo").replaceAll("bars", s_other));
+        OUString("foobarfoo"),
+        OUString("foobarfoo").replaceAll("bars", s_other));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("xxa"),
-        rtl::OUString("xaa").replaceAll("xa", s_xx));
+        OUString("xxa"),
+        OUString("xaa").replaceAll("xa", s_xx));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString(), rtl::OUString("xa").replaceAll("xa", s_empty));
+        OUString(), OUString("xa").replaceAll("xa", s_empty));
 }
 
 void Test::ustringReplaceAllToAsciiL() {
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("otherbarother"),
-        rtl::OUString("foobarfoo").replaceAll(s_foo, "other"));
+        OUString("otherbarother"),
+        OUString("foobarfoo").replaceAll(s_foo, "other"));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("foobarfoo"),
-        rtl::OUString("foobarfoo").replaceAll(s_bars, "other"));
+        OUString("foobarfoo"),
+        OUString("foobarfoo").replaceAll(s_bars, "other"));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("xxa"),
-        rtl::OUString("xaa").replaceAll(s_xa, "xx"));
+        OUString("xxa"),
+        OUString("xaa").replaceAll(s_xa, "xx"));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString(), rtl::OUString("xa").replaceAll(s_xa, ""));
+        OUString(), OUString("xa").replaceAll(s_xa, ""));
 }
 
 void Test::ustringReplaceAllAsciiLAsciiL() {
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("otherbarother"),
-        (rtl::OUString("foobarfoo").
+        OUString("otherbarother"),
+        (OUString("foobarfoo").
          replaceAll("foo", "other")));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("foobarfoo"),
-        (rtl::OUString("foobarfoo").
+        OUString("foobarfoo"),
+        (OUString("foobarfoo").
          replaceAll("bars", "other")));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("xxa"),
-        (rtl::OUString("xaa").
+        OUString("xxa"),
+        (OUString("xaa").
          replaceAll("xa", "xx")));
 
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString(), rtl::OUString("xa").replaceAll("xa", ""));
+        OUString(), OUString("xa").replaceAll("xa", ""));
 }
 
 }
diff --git a/sal/qa/rtl/strings/test_strings_toint.cxx b/sal/qa/rtl/strings/test_strings_toint.cxx
index 38b74bf651aa..d81525b94405 100644
--- a/sal/qa/rtl/strings/test_strings_toint.cxx
+++ b/sal/qa/rtl/strings/test_strings_toint.cxx
@@ -64,8 +64,8 @@ private:
     }
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION(Test< rtl::OString >);
-CPPUNIT_TEST_SUITE_REGISTRATION(Test< rtl::OUString >);
+CPPUNIT_TEST_SUITE_REGISTRATION(Test< OString >);
+CPPUNIT_TEST_SUITE_REGISTRATION(Test< OUString >);
 
 }
 
diff --git a/sal/qa/rtl/strings/test_strings_valuex.cxx b/sal/qa/rtl/strings/test_strings_valuex.cxx
index 5253a4b99ddb..b1102cce6fd1 100644
--- a/sal/qa/rtl/strings/test_strings_valuex.cxx
+++ b/sal/qa/rtl/strings/test_strings_valuex.cxx
@@ -49,11 +49,11 @@ void testBoolean() {
 }
 
 void test::strings::valueX::testOBoolean() {
-    testBoolean<rtl::OString>();
+    testBoolean<OString>();
 }
 
 void test::strings::valueX::testOUBoolean() {
-    testBoolean<rtl::OUString>();
+    testBoolean<OUString>();
 }
 
 template< typename T >
@@ -91,11 +91,11 @@ static void testInt() {
 }
 
 void test::strings::valueX::testOUInt() {
-    testInt<rtl::OUString>();
+    testInt<OUString>();
 }
 
 void test::strings::valueX::testOInt() {
-    testInt<rtl::OString>();
+    testInt<OString>();
 }
 
 template< typename T >
@@ -106,10 +106,10 @@ static void testFloat() {
 }
 
 void test::strings::valueX::testOUFloat() {
-    testFloat<rtl::OUString>();
+    testFloat<OUString>();
 }
 
 void test::strings::valueX::testOFloat() {
-    testFloat<rtl::OString>();
+    testFloat<OString>();
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 79d232f42355..81ec983450f5 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -33,35 +33,35 @@ namespace Stringtest
     class Convert : public CppUnit::TestFixture
     {
     public:
-        rtl::OString convertToOString(rtl::OUString const& _suStr)
+        OString convertToOString(OUString const& _suStr)
             {
-                return rtl::OUStringToOString(_suStr, osl_getThreadTextEncoding()/*RTL_TEXTENCODING_ASCII_US*/);
+                return OUStringToOString(_suStr, osl_getThreadTextEncoding()/*RTL_TEXTENCODING_ASCII_US*/);
             }
 
-        void showContent(rtl::OUString const& _suStr)
+        void showContent(OUString const& _suStr)
             {
-                rtl::OString sStr = convertToOString(_suStr);
+                OString sStr = convertToOString(_suStr);
                 printf("%s\n", sStr.getStr());
             }
 
         void test_FromUTF8_001()
             {
                 // string --> ustring
-                rtl::OString sStrUTF8("h%C3%A4llo");
-                rtl::OUString suStrUTF8 = rtl::OStringToOUString(sStrUTF8, RTL_TEXTENCODING_ASCII_US);
+                OString sStrUTF8("h%C3%A4llo");
+                OUString suStrUTF8 = OStringToOUString(sStrUTF8, RTL_TEXTENCODING_ASCII_US);
 
                 // UTF8 --> real ustring
-                rtl::OUString suStr_UriDecodeToIuri      = rtl::Uri::decode(suStrUTF8, rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);
+                OUString suStr_UriDecodeToIuri      = rtl::Uri::decode(suStrUTF8, rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);
                 showContent(suStr_UriDecodeToIuri);
 
                 // string --> ustring
-                rtl::OString sStr("h\xE4llo", strlen("h\xE4llo"));
-                rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
+                OString sStr("h\xE4llo", strlen("h\xE4llo"));
+                OUString suString = OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
 
                 CPPUNIT_ASSERT_EQUAL_MESSAGE("Strings must be equal", suString, suStr_UriDecodeToIuri);
 
                 // ustring --> ustring (UTF8)
-                rtl::OUString suStr2 = rtl::Uri::encode(suStr_UriDecodeToIuri, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
+                OUString suStr2 = rtl::Uri::encode(suStr_UriDecodeToIuri, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
                 showContent(suStr2);
 
                 CPPUNIT_ASSERT_EQUAL_MESSAGE("Strings must be equal", suStr2, suStrUTF8);
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index 049640ef3982..3310ec25bba6 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -44,13 +44,13 @@ void Test::test_Uri() {
     rtl_UriCharClass const eFirstCharClass = rtl_UriCharClassNone;
     rtl_UriCharClass const eLastCharClass = rtl_UriCharClassUnoParamValue;
 
-    rtl::OUStringBuffer aBuffer;
-    rtl::OUString aText1;
-    rtl::OUString aText2;
+    OUStringBuffer aBuffer;
+    OUString aText1;
+    OUString aText2;
 
     // Check that all characters map back to themselves when encoded/decoded:
 
-    aText1 = rtl::OUString(
+    aText1 = OUString(
         RTL_CONSTASCII_USTRINGPARAM(
             "\x00\x01\x02\x03\x04\x05\x06\x07"
             "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"
@@ -123,7 +123,7 @@ void Test::test_Uri() {
                 rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8));
     }
 
-    aText1 = rtl::OUString(
+    aText1 = OUString(
         ("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"
          "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"
          "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2A\x2B\x2C\x2D\x2E\x2F"
@@ -338,12 +338,12 @@ void Test::test_Uri() {
 
     for (std::size_t i = 0; i < SAL_N_ELEMENTS(aRelToAbsTest); ++i)
     {
-        rtl::OUString aAbs;
+        OUString aAbs;
         bool bMalformed = false;
         try {
             aAbs = rtl::Uri::convertRelToAbs(
-                rtl::OUString::createFromAscii(aRelToAbsTest[i].pBase),
-                rtl::OUString::createFromAscii(aRelToAbsTest[i].pRel));
+                OUString::createFromAscii(aRelToAbsTest[i].pBase),
+                OUString::createFromAscii(aRelToAbsTest[i].pRel));
         } catch (const rtl::MalformedUriException &) {
             bMalformed = true;
         }
@@ -357,7 +357,7 @@ void Test::test_Uri() {
                 aRelToAbsTest[i].pBase, aRelToAbsTest[i].pRel,
                 (bMalformed
                  ? "<MALFORMED>"
-                 : rtl::OUStringToOString(
+                 : OUStringToOString(
                      aAbs, RTL_TEXTENCODING_UTF8).getStr()),
                 (aRelToAbsTest[i].pAbs == nullptr
                  ? "<MALFORMED>" : aRelToAbsTest[i].pAbs));
@@ -369,7 +369,7 @@ void Test::test_Uri() {
 
     {
         sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x045F, 0 };
-        aText1 = rtl::OUString(aText1U);
+        aText1 = OUString(aText1U);
         aText2 = "%20!%A1%FF";
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 20",
@@ -385,10 +385,10 @@ void Test::test_Uri() {
     }
     {
         sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x0700, 0x045F, 0 };
-        aText1 = rtl::OUString(aText1U);
+        aText1 = OUString(aText1U);
         sal_Unicode const aText2U[] = {
             '%', '2', '0', '!', '%', 'A', '1', 0x0700, '%', 'F', 'F', 0 };
-        aText2 = rtl::OUString(aText2U);
+        aText2 = OUString(aText2U);
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 21",
             aText2,
@@ -404,7 +404,7 @@ void Test::test_Uri() {
 #if WITH_LOCALE_ALL || WITH_LOCALE_zh
     {
         sal_Unicode const aText1U[] = { ' ', '!', 0x028A, 0xD849, 0xDD13, 0 };
-        aText1 = rtl::OUString(aText1U);
+        aText1 = OUString(aText1U);
         aText2 = "%20!%81%30%B1%33%95%39%C5%37";
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 22",
@@ -423,8 +423,8 @@ void Test::test_Uri() {
 
     {
         sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x0700, 0x045F, 0 };
-        aText1 = rtl::OUString(aText1U);
-        aText2 = rtl::OUString();
+        aText1 = OUString(aText1U);
+        aText2 = OUString();
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 23",
             aText2,
@@ -434,7 +434,7 @@ void Test::test_Uri() {
     }
     {
         aText1 = "%20%C4%80%FF";
-        aText2 = rtl::OUString();
+        aText2 = OUString();
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 24",
             aText2,
@@ -444,7 +444,7 @@ void Test::test_Uri() {
 #if WITH_LOCALE_ALL || WITH_LOCALE_zh
     {
         aText1 = "%81 ";
-        aText2 = rtl::OUString();
+        aText2 = OUString();
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 25",
             aText2,
@@ -453,7 +453,7 @@ void Test::test_Uri() {
     }
     {
         aText1 = "%81%20";
-        aText2 = rtl::OUString();
+        aText2 = OUString();
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 26",
             aText2,
@@ -463,7 +463,7 @@ void Test::test_Uri() {
     {
         aText1 = "%81%30%B1%33";
         sal_Unicode const aText2U[] = { 0x028A, 0 };
-        aText2 = rtl::OUString(aText2U);
+        aText2 = OUString(aText2U);
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 27",
             aText2,
@@ -473,7 +473,7 @@ void Test::test_Uri() {
     {
         aText1 = "%810%B13";
         sal_Unicode const aText2U[] = { 0x028A, 0 };
-        aText2 = rtl::OUString(aText2U);
+        aText2 = OUString(aText2U);
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 28",
             aText2,
@@ -495,7 +495,7 @@ void Test::test_Uri() {
     }
     {
         sal_Unicode const aText1U[] = { 0x00EA, 0 };
-        aText1 = rtl::OUString(aText1U);
+        aText1 = OUString(aText1U);
         aText2 = "%C3%AA";
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 30",
@@ -506,8 +506,8 @@ void Test::test_Uri() {
     }
     {
         sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x0700, 0x045F, 0 };
-        aText1 = rtl::OUString(aText1U);
-        aText2 = rtl::OUString();
+        aText1 = OUString(aText1U);
+        aText2 = OUString();
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             "failure 23",
             aText2,
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index b63557375fe5..5e0769c99630 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -55,10 +55,6 @@
 using osl::DirectoryItem;
 using osl::FileStatus;
 
-using rtl::OString;
-using rtl::OUString;
-using rtl::OUStringToOString;
-
 struct Bootstrap_Impl;
 
 namespace
@@ -66,12 +62,12 @@ namespace
 
 static char const VND_SUN_STAR_PATHNAME[] = "vnd.sun.star.pathname:";
 
-bool isPathnameUrl(rtl::OUString const & url)
+bool isPathnameUrl(OUString const & url)
 {
     return url.matchIgnoreAsciiCase(VND_SUN_STAR_PATHNAME);
 }
 
-bool resolvePathnameUrl(rtl::OUString * url)
+bool resolvePathnameUrl(OUString * url)
 {
     OSL_ASSERT(url);
     if (!isPathnameUrl(*url) ||
@@ -81,7 +77,7 @@ bool resolvePathnameUrl(rtl::OUString * url)
     {
         return true;
     }
-    *url = rtl::OUString();
+    *url = OUString();
     return false;
 }
 
@@ -92,23 +88,23 @@ enum LookupMode {
 struct ExpandRequestLink {
     ExpandRequestLink const * next;
     Bootstrap_Impl const * file;
-    rtl::OUString const key;
+    OUString const key;
 };
 
-rtl::OUString expandMacros(
-    Bootstrap_Impl const * file, rtl::OUString const & text, LookupMode mode,
+OUString expandMacros(
+    Bootstrap_Impl const * file, OUString const & text, LookupMode mode,
     ExpandRequestLink const * requestStack);
 
-rtl::OUString recursivelyExpandMacros(
-    Bootstrap_Impl const * file, rtl::OUString const & text, LookupMode mode,
-    Bootstrap_Impl const * requestFile, rtl::OUString const & requestKey,
+OUString recursivelyExpandMacros(
+    Bootstrap_Impl const * file, OUString const & text, LookupMode mode,
+    Bootstrap_Impl const * requestFile, OUString const & requestKey,
     ExpandRequestLink const * requestStack)
 {
     for (; requestStack; requestStack = requestStack->next) {
         if (requestStack->file == requestFile &&
             requestStack->key == requestKey)
         {
-            return rtl::OUString("***RECURSION DETECTED***");
+            return OUString("***RECURSION DETECTED***");
         }
     }
     ExpandRequestLink link = { requestStack, requestFile, requestKey };
@@ -133,8 +129,8 @@ struct rtl_bootstrap_NameValue
 typedef std::vector<rtl_bootstrap_NameValue> NameValueVector;
 
 static bool find(
-    NameValueVector const & vector, rtl::OUString const & key,
-    rtl::OUString * value)
+    NameValueVector const & vector, OUString const & key,
+    OUString * value)
 {
     OSL_ASSERT(value);
     for (NameValueVector::const_iterator i(vector.begin()); i != vector.end(); ++i)
@@ -155,7 +151,7 @@ namespace
 }
 
 static bool getFromCommandLineArgs(
-    rtl::OUString const & key, rtl::OUString * value )
+    OUString const & key, OUString * value )
 {
     OSL_ASSERT(value);
 
@@ -243,13 +239,13 @@ static OUString & getIniFileName_Impl()
         // possibility to have several "applications" in the same
         // installation location with different inifiles.
         const char *inifile = [[@"vnd.sun.star.pathname:" stringByAppendingString: [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"rc"]] UTF8String];
-        fileName = rtl::OUString(inifile, strlen(inifile), RTL_TEXTENCODING_UTF8);
+        fileName = OUString(inifile, strlen(inifile), RTL_TEXTENCODING_UTF8);
         resolvePathnameUrl(&fileName);
 #elif defined ANDROID
         // Apps are self-contained on Android, too, can as well hardcode
         // it as "rc" in the "/assets" directory, i.e.  inside the app's
         // .apk (zip) archive as the /assets/rc file.
-        fileName = rtl::OUString("vnd.sun.star.pathname:/assets/rc");
+        fileName = OUString("vnd.sun.star.pathname:/assets/rc");
         resolvePathnameUrl(&fileName);
 #else
         if (getFromCommandLineArgs("INIFILENAME", &fileName))
@@ -300,7 +296,7 @@ static OUString & getIniFileName_Impl()
 
 // ensure the given file url has no final slash
 
-static void EnsureNoFinalSlash (rtl::OUString & url)
+static void EnsureNoFinalSlash (OUString & url)
 {
     sal_Int32 i = url.getLength();
 
@@ -325,18 +321,18 @@ struct Bootstrap_Impl
         { free (p); }
 
     bool getValue(
-        rtl::OUString const & key, rtl_uString ** value,
+        OUString const & key, rtl_uString ** value,
         rtl_uString * defaultValue, LookupMode mode, bool override,
         ExpandRequestLink const * requestStack) const;
     bool getDirectValue(
-        rtl::OUString const & key, rtl_uString ** value, LookupMode mode,
+        OUString const & key, rtl_uString ** value, LookupMode mode,
         ExpandRequestLink const * requestStack) const;
     bool getAmbienceValue(
-        rtl::OUString const & key, rtl_uString ** value, LookupMode mode,
+        OUString const & key, rtl_uString ** value, LookupMode mode,
         ExpandRequestLink const * requestStack) const;
     void expandValue(
-        rtl_uString ** value, rtl::OUString const & text, LookupMode mode,
-        Bootstrap_Impl const * requestFile, rtl::OUString const & requestKey,
+        rtl_uString ** value, OUString const & text, LookupMode mode,
+        Bootstrap_Impl const * requestFile, OUString const & requestKey,
         ExpandRequestLink const * requestStack) const;
 };
 
@@ -443,7 +439,7 @@ struct FundamentalIni: public rtl::Static< FundamentalIniData, FundamentalIni >
 }
 
 bool Bootstrap_Impl::getValue(
-    rtl::OUString const & key, rtl_uString ** value, rtl_uString * defaultValue,
+    OUString const & key, rtl_uString ** value, rtl_uString * defaultValue,
     LookupMode mode, bool override, ExpandRequestLink const * requestStack)
     const
 {
@@ -456,14 +452,14 @@ bool Bootstrap_Impl::getValue(
     if (key == "_OS")
     {
         rtl_uString_assign(
-            value, rtl::OUString(RTL_OS).pData);
+            value, OUString(RTL_OS).pData);
         return true;
     }
 
     if (key == "_ARCH")
     {
         rtl_uString_assign(
-            value, rtl::OUString(RTL_ARCH).pData);
+            value, OUString(RTL_ARCH).pData);
         return true;
     }
 
@@ -471,7 +467,7 @@ bool Bootstrap_Impl::getValue(
     {
         rtl_uString_assign(
             value,
-            (rtl::OUString(
+            (OUString(
                 SAL_STRINGIFY(CPPU_ENV)).
              pData));
         return true;
@@ -482,7 +478,7 @@ bool Bootstrap_Impl::getValue(
     {
         const char *app_data_dir = lo_get_app_data_dir();
         rtl_uString_assign(
-            value, rtl::OUString(app_data_dir, strlen(app_data_dir), RTL_TEXTENCODING_UTF8).pData);
+            value, OUString(app_data_dir, strlen(app_data_dir), RTL_TEXTENCODING_UTF8).pData);
         return true;
     }
 #endif
@@ -492,7 +488,7 @@ bool Bootstrap_Impl::getValue(
     {
         const char *app_data_dir = [[[[NSBundle mainBundle] bundlePath] stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLPathAllowedCharacterSet]] UTF8String];
         rtl_uString_assign(
-            value, rtl::OUString(app_data_dir, strlen(app_data_dir), RTL_TEXTENCODING_UTF8).pData);
+            value, OUString(app_data_dir, strlen(app_data_dir), RTL_TEXTENCODING_UTF8).pData);
         return true;
     }
 #endif
@@ -511,7 +507,7 @@ bool Bootstrap_Impl::getValue(
 
     if (key == "SYSUSERCONFIG")
     {
-        rtl::OUString v;
+        OUString v;
         bool b = osl::Security().getConfigDir(v);
         EnsureNoFinalSlash(v);
         rtl_uString_assign(value, v.pData);
@@ -520,7 +516,7 @@ bool Bootstrap_Impl::getValue(
 
     if (key == "SYSUSERHOME")
     {
-        rtl::OUString v;
+        OUString v;
         bool b = osl::Security().getHomeDir(v);
         EnsureNoFinalSlash(v);
         rtl_uString_assign(value, v.pData);
@@ -558,10 +554,10 @@ bool Bootstrap_Impl::getValue(
 }
 
 bool Bootstrap_Impl::getDirectValue(
-    rtl::OUString const & key, rtl_uString ** value, LookupMode mode,
+    OUString const & key, rtl_uString ** value, LookupMode mode,
     ExpandRequestLink const * requestStack) const
 {
-    rtl::OUString v;
+    OUString v;
     if (find(_nameValueVector, key, &v))
     {
         expandValue(value, v, mode, this, key, requestStack);
@@ -572,10 +568,10 @@ bool Bootstrap_Impl::getDirectValue(
 }
 
 bool Bootstrap_Impl::getAmbienceValue(
-    rtl::OUString const & key, rtl_uString ** value, LookupMode mode,
+    OUString const & key, rtl_uString ** value, LookupMode mode,
     ExpandRequestLink const * requestStack) const
 {
-    rtl::OUString v;
+    OUString v;
     bool f;
 
     {
@@ -594,8 +590,8 @@ bool Bootstrap_Impl::getAmbienceValue(
 }
 
 void Bootstrap_Impl::expandValue(
-    rtl_uString ** value, rtl::OUString const & text, LookupMode mode,
-    Bootstrap_Impl const * requestFile, rtl::OUString const & requestKey,
+    rtl_uString ** value, OUString const & text, LookupMode mode,
+    Bootstrap_Impl const * requestFile, OUString const & requestKey,
     ExpandRequestLink const * requestStack) const
 {
     rtl_uString_assign(
@@ -613,7 +609,7 @@ namespace {
 
 struct bootstrap_map {
     typedef std::unordered_map<
-        rtl::OUString, Bootstrap_Impl * > t;
+        OUString, Bootstrap_Impl * > t;
 
     bootstrap_map(const bootstrap_map&) = delete;
     bootstrap_map& operator=(const bootstrap_map&) = delete;
@@ -830,7 +826,7 @@ void SAL_CALL rtl_bootstrap_expandMacros(rtl_uString ** macro)
 void rtl_bootstrap_encode(rtl_uString const * value, rtl_uString ** encoded)
 {
     OSL_ASSERT(value);
-    rtl::OUStringBuffer b;
+    OUStringBuffer b;
     for (sal_Int32 i = 0; i < value->length; ++i)
     {
         sal_Unicode c = value->buffer[i];
@@ -853,7 +849,7 @@ int hex(sal_Unicode c)
         c >= 'a' && c <= 'f' ? c - 'a' + 10 : -1;
 }
 
-sal_Unicode read(rtl::OUString const & text, sal_Int32 * pos, bool * escaped)
+sal_Unicode read(OUString const & text, sal_Int32 * pos, bool * escaped)
 {
     OSL_ASSERT(pos && *pos >= 0 && *pos < text.getLength() && escaped);
     sal_Unicode c = text[(*pos)++];
@@ -883,22 +879,22 @@ sal_Unicode read(rtl::OUString const & text, sal_Int32 * pos, bool * escaped)
     return c;
 }
 
-rtl::OUString lookup(
+OUString lookup(
     Bootstrap_Impl const * file, LookupMode mode, bool override,
-    rtl::OUString const & key, ExpandRequestLink const * requestStack)
+    OUString const & key, ExpandRequestLink const * requestStack)
 {
-    rtl::OUString v;
+    OUString v;
     (file == nullptr ? get_static_bootstrap_handle() : file)->getValue(
         key, &v.pData, nullptr, mode, override, requestStack);
     return v;
 }
 
-rtl::OUString expandMacros(
-    Bootstrap_Impl const * file, rtl::OUString const & text, LookupMode mode,
+OUString expandMacros(
+    Bootstrap_Impl const * file, OUString const & text, LookupMode mode,
     ExpandRequestLink const * requestStack)
 {
     SAL_INFO("sal.bootstrap", "expandMacros called with: " << text);
-    rtl::OUStringBuffer buf;
+    OUStringBuffer buf;
 
     for (sal_Int32 i = 0; i < text.getLength();)
     {
@@ -915,7 +911,7 @@ rtl::OUString expandMacros(
                 ++i;
                 sal_Int32 p = i;
                 sal_Int32 nesting = 0;
-                rtl::OUString seg[3];
+                OUString seg[3];
                 int n = 0;
 
                 while (i < text.getLength())
@@ -992,20 +988,20 @@ rtl::OUString expandMacros(
                         // replacement text (and if it did, it would fail to
                         // detect cycles that pass through here):
                         buf.append(
-                            rtl::OStringToOUString(
+                            OStringToOUString(
                                 osl::Profile(seg[0]).readString(
-                                    rtl::OUStringToOString(
+                                    OUStringToOString(
                                         seg[1], RTL_TEXTENCODING_UTF8),
-                                    rtl::OUStringToOString(
+                                    OUStringToOString(
                                         seg[2], RTL_TEXTENCODING_UTF8),
-                                    rtl::OString()),
+                                    OString()),
                                 RTL_TEXTENCODING_UTF8));
                     }
                 }
             }
             else
             {
-                rtl::OUStringBuffer kbuf;
+                OUStringBuffer kbuf;
                 for (; i < text.getLength();)
                 {
                     sal_Int32 j = i;
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index 70f1e2e82c20..3bf0e1d34c2f 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -145,7 +145,7 @@ sal_uInt32 readUcs4(sal_Unicode const ** pBegin, sal_Unicode const * pEnd,
         }
         else
         {
-            rtl::OStringBuffer aBuf;
+            OStringBuffer aBuf;
             aBuf.append(static_cast< char >(nChar));
             rtl_TextToUnicodeConverter aConverter
                 = rtl_createTextToUnicodeConverter(eCharset);
@@ -425,7 +425,7 @@ void parseUriRef(rtl_uString const * pUriRef, Components * pComponents)
 }
 
 void appendPath(
-    rtl::OUStringBuffer & buffer, sal_Int32 bufferStart, bool precedingSlash,
+    OUStringBuffer & buffer, sal_Int32 bufferStart, bool precedingSlash,
     sal_Unicode const * pathBegin, sal_Unicode const * pathEnd)
 {
     while (precedingSlash || pathBegin != pathEnd)
@@ -755,7 +755,7 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
 {
     // Use the strict parser algorithm from RFC 3986, section 5.2, to turn the
     // relative URI into an absolute one:
-    rtl::OUStringBuffer aBuffer;
+    OUStringBuffer aBuffer;
     Components aRelComponents;
     parseUriRef(pRelUriRef, &aRelComponents);
 
@@ -788,8 +788,8 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
         {
             rtl_uString_assign(
                 pException,
-                (rtl::OUString(
-                    "<" + rtl::OUString(pBaseUriRef)
+                (OUString(
+                    "<" + OUString(pBaseUriRef)
                     + "> does not start with a scheme component")
                  .pData));
             return false;
author	Noel Grandin <noel.grandin@collabora.co.uk>	2018-10-23 12:06:00 +0200
committer	Noel Grandin <noel.grandin@collabora.co.uk>	2018-10-24 14:43:34 +0200
commit	6f50961e69406a17d6ec998956a6b33208b1001b (patch)
tree	413c83df969e73c5cba1e11ef3740afc748ee1f5 /sal
parent	4e729de73f2947155248f8df5897380611b87917 (diff)