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>

3 files changed, 101 insertions, 101 deletions

diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx
index d25e719119ed..a41327f5e928 100644
--- a/include/registry/reader.hxx
+++ b/include/registry/reader.hxx
@@ -124,13 +124,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getDocumentation() const {
+    OUString getDocumentation() const {
         rtl_uString * s = nullptr;
         typereg_reader_getDocumentation(m_handle, &s);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -142,13 +142,13 @@ public:
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
        @deprecated
      */
-    rtl::OUString getFileName() const {
+    OUString getFileName() const {
         rtl_uString * s = nullptr;
         typereg_reader_getFileName(m_handle, &s);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -183,13 +183,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getTypeName() const {
+    OUString getTypeName() const {
         rtl_uString * s = nullptr;
         typereg_reader_getTypeName(m_handle, &s);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -212,13 +212,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getSuperTypeName(sal_uInt16 index) const {
+    OUString getSuperTypeName(sal_uInt16 index) const {
         rtl_uString * s = nullptr;
         typereg_reader_getSuperTypeName(m_handle, &s, index);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -240,13 +240,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getFieldDocumentation(sal_uInt16 index) const {
+    OUString getFieldDocumentation(sal_uInt16 index) const {
         rtl_uString * s = nullptr;
         typereg_reader_getFieldDocumentation(m_handle, &s, index);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -259,13 +259,13 @@ public:
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
        @deprecated
      */
-    rtl::OUString getFieldFileName(sal_uInt16 index) const {
+    OUString getFieldFileName(sal_uInt16 index) const {
         rtl_uString * s = nullptr;
         typereg_reader_getFieldFileName(m_handle, &s, index);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -288,13 +288,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getFieldName(sal_uInt16 index) const {
+    OUString getFieldName(sal_uInt16 index) const {
         rtl_uString * s = nullptr;
         typereg_reader_getFieldName(m_handle, &s, index);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -306,13 +306,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getFieldTypeName(sal_uInt16 index) const {
+    OUString getFieldTypeName(sal_uInt16 index) const {
         rtl_uString * s = nullptr;
         typereg_reader_getFieldTypeName(m_handle, &s, index);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -353,13 +353,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getMethodDocumentation(sal_uInt16 index) const {
+    OUString getMethodDocumentation(sal_uInt16 index) const {
         rtl_uString * s = nullptr;
         typereg_reader_getMethodDocumentation(m_handle, &s, index);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -382,13 +382,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getMethodName(sal_uInt16 index) const {
+    OUString getMethodName(sal_uInt16 index) const {
         rtl_uString * s = nullptr;
         typereg_reader_getMethodName(m_handle, &s, index);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -400,13 +400,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getMethodReturnTypeName(sal_uInt16 index) const {
+    OUString getMethodReturnTypeName(sal_uInt16 index) const {
         rtl_uString * s = nullptr;
         typereg_reader_getMethodReturnTypeName(m_handle, &s, index);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -451,7 +451,7 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getMethodParameterName(
+    OUString getMethodParameterName(
         sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const
     {
         rtl_uString * s = nullptr;
@@ -460,7 +460,7 @@ public:
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -476,7 +476,7 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getMethodParameterTypeName(
+    OUString getMethodParameterTypeName(
         sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const
     {
         rtl_uString * s = nullptr;
@@ -485,7 +485,7 @@ public:
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -512,7 +512,7 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getMethodExceptionTypeName(
+    OUString getMethodExceptionTypeName(
         sal_uInt16 methodIndex, sal_uInt16 exceptionIndex) const
     {
         rtl_uString * s = nullptr;
@@ -521,7 +521,7 @@ public:
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -544,13 +544,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getReferenceDocumentation(sal_uInt16 index) const {
+    OUString getReferenceDocumentation(sal_uInt16 index) const {
         rtl_uString * s = nullptr;
         typereg_reader_getReferenceDocumentation(m_handle, &s, index);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
     /**
@@ -587,13 +587,13 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    rtl::OUString getReferenceTypeName(sal_uInt16 index) const {
+    OUString getReferenceTypeName(sal_uInt16 index) const {
         rtl_uString * s = nullptr;
         typereg_reader_getReferenceTypeName(m_handle, &s, index);
         if (s == nullptr) {
             throw std::bad_alloc();
         }
-        return rtl::OUString(s, SAL_NO_ACQUIRE);
+        return OUString(s, SAL_NO_ACQUIRE);
     }
 
 private:
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index 41e86c07c08d..0cd7d576f644 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -125,14 +125,14 @@ public:
     inline RegError openRootKey(RegistryKey& rRootKey);
 
     /// returns the name of the current registry data file.
-    inline rtl::OUString getName();
+    inline OUString getName();
 
     /** creates a new registry with the specified name and creates a root key.
 
         @param  registryName specifies the name of the new registry.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError create(const rtl::OUString& registryName);
+    inline RegError create(const OUString& registryName);
 
     /** opens a registry with the specified name.
 
@@ -141,7 +141,7 @@ public:
         @param  accessMode specifies the access mode for the registry, RegAccessMode::READONLY or RegAccessMode::READWRITE.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError open(const rtl::OUString& registryName,
+    inline RegError open(const OUString& registryName,
                             RegAccessMode accessMode);
 
     /// closes explicitly the current registry data file.
@@ -153,7 +153,7 @@ public:
                             itself will be destroyed.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError destroy(const rtl::OUString& registryName);
+    inline RegError destroy(const OUString& registryName);
 
     /** merges the registry information of the specified key with the registry
         information of the specified file.
@@ -170,8 +170,8 @@ public:
                 restore the state before merging.
     */
     inline RegError mergeKey(RegistryKey& rKey,
-                                const rtl::OUString& keyName,
-                                const rtl::OUString& regFileName,
+                                const OUString& keyName,
+                                const OUString& regFileName,
                                 bool bReport);
 
     friend class RegistryKey;
@@ -241,7 +241,7 @@ public:
     inline ~RegistryKeyNames();
 
     /// returns the name of the key specified by index.
-    inline rtl::OUString getElement(sal_uInt32 index);
+    inline OUString getElement(sal_uInt32 index);
 
     /// returns the length of the array.
     inline sal_uInt32 getLength() const;
@@ -368,7 +368,7 @@ public:
     inline bool     isReadOnly() const;
 
     /// returns the full qualified name of the key beginning with the rootkey.
-    inline rtl::OUString getName();
+    inline OUString getName();
 
     /** creates a new key or opens a key if the specified key already exists.
 
@@ -377,7 +377,7 @@ public:
         @param  rNewKey references a RegistryKey which will be filled with the new or open key.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError createKey(const rtl::OUString& keyName,
+    inline RegError createKey(const OUString& keyName,
                               RegistryKey& rNewKey);
 
     /** opens the specified key.
@@ -387,7 +387,7 @@ public:
         @param  rOpenKey references a RegistryKey which will be filled with the open key.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError openKey(const rtl::OUString& keyName,
+    inline RegError openKey(const OUString& keyName,
                               RegistryKey& rOpenKey);
 
     /** opens all subkeys of the specified key.
@@ -397,7 +397,7 @@ public:
         @param  rSubKeys reference a RegistryKeyArray which will be filled with the open subkeys.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError openSubKeys(const rtl::OUString& keyName,
+    inline RegError openSubKeys(const OUString& keyName,
                                     RegistryKeyArray& rSubKeys);
 
     /** returns an array with the names of all subkeys of the specified key.
@@ -407,7 +407,7 @@ public:
         @param  rSubKeyNames reference a RegistryKeyNames array which will be filled with the subkey names.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError getKeyNames(const rtl::OUString& keyName,
+    inline RegError getKeyNames(const OUString& keyName,
                                     RegistryKeyNames& rSubKeyNames);
 
     /** deletes the specified key.
@@ -415,7 +415,7 @@ public:
         @param  keyName specifies the name of the key which will be deleted.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError deleteKey(const rtl::OUString& keyName);
+    inline RegError deleteKey(const OUString& keyName);
 
     /// closes explicitly the current key
     inline RegError closeKey();
@@ -433,7 +433,7 @@ public:
         @param  valueSize specifies the size of pData in bytes
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError setValue(const rtl::OUString& keyName,
+    inline RegError setValue(const OUString& keyName,
                                 RegValueType valueType,
                                 RegValue pValue,
                                 sal_uInt32 valueSize);
@@ -447,7 +447,7 @@ public:
         @param  len specifies the length of the list (the array referenced by pValueList).
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError setLongListValue(const rtl::OUString& keyName,
+    inline RegError setLongListValue(const OUString& keyName,
                                          sal_Int32 const * pValueList,
                                          sal_uInt32 len);
 
@@ -460,7 +460,7 @@ public:
         @param  len specifies the length of the list (the array referenced by pValueList).
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError setStringListValue(const rtl::OUString& keyName,
+    inline RegError setStringListValue(const OUString& keyName,
                                            sal_Char** pValueList,
                                            sal_uInt32 len);
 
@@ -473,7 +473,7 @@ public:
         @param  len specifies the length of the list (the array referenced by pValueList).
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError setUnicodeListValue(const rtl::OUString& keyName,
+    inline RegError setUnicodeListValue(const OUString& keyName,
                                             sal_Unicode** pValueList,
                                               sal_uInt32 len);
 
@@ -486,7 +486,7 @@ public:
         @param  pValueSize returns the size of the value in bytes or the length of a list value.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError getValueInfo(const rtl::OUString& keyName,
+    inline RegError getValueInfo(const OUString& keyName,
                                     RegValueType* pValueType,
                                     sal_uInt32* pValueSize);
 
@@ -498,7 +498,7 @@ public:
         @param  pValue points to an allocated memory block receiving the data of the value.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError getValue(const rtl::OUString& keyName,
+    inline RegError getValue(const OUString& keyName,
                                 RegValue pValue);
 
     /** gets a long list value of a key.
@@ -509,7 +509,7 @@ public:
         @param  rValueList references a RegistryValueList which will be filled with the long values.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError getLongListValue(const rtl::OUString& keyName,
+    inline RegError getLongListValue(const OUString& keyName,
                                           RegistryValueList<sal_Int32>& rValueList);
 
     /** gets an ascii list value of a key.
@@ -520,7 +520,7 @@ public:
         @param  rValueList references a RegistryValueList which will be filled with the ascii values.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError getStringListValue(const rtl::OUString& keyName,
+    inline RegError getStringListValue(const OUString& keyName,
                                            RegistryValueList<sal_Char*>& rValueList);
 
     /** gets a unicode value of a key.
@@ -531,7 +531,7 @@ public:
         @param  rValueList reference a RegistryValueList which will be filled with the unicode values.
         @return RegError::NO_ERROR if succeeds else an error code.
     */
-    inline RegError getUnicodeListValue(const rtl::OUString& keyName,
+    inline RegError getUnicodeListValue(const OUString& keyName,
                                               RegistryValueList<sal_Unicode*>& rValueList);
 
     /** resolves a keyname.
@@ -541,11 +541,11 @@ public:
         @param[out] rResolvedName the resolved name.
         @return RegError::NO_ERROR if succeeds else an error code.
      */
-    inline RegError getResolvedKeyName(const rtl::OUString& keyName,
-                                           rtl::OUString& rResolvedName) const;
+    inline RegError getResolvedKeyName(const OUString& keyName,
+                                           OUString& rResolvedName) const;
 
     /// returns the name of the registry in which the key is defined.
-    inline rtl::OUString getRegistryName();
+    inline OUString getRegistryName();
 
     friend class Registry;
 public:
@@ -618,13 +618,13 @@ inline RegistryKeyNames::~RegistryKeyNames()
         m_registry.m_pApi->freeKeyNames(m_pKeyNames, m_length);
 }
 
-inline rtl::OUString RegistryKeyNames::getElement(sal_uInt32 index)
+inline OUString RegistryKeyNames::getElement(sal_uInt32 index)
 {
 
     if (m_pKeyNames && index < m_length)
         return m_pKeyNames[index];
     else
-        return rtl::OUString();
+        return OUString();
 }
 
 inline sal_uInt32 RegistryKeyNames::getLength() const
@@ -700,15 +700,15 @@ inline bool RegistryKey::isReadOnly() const
             return false;
     }
 
-inline rtl::OUString RegistryKey::getName()
+inline OUString RegistryKey::getName()
     {
-        rtl::OUString sRet;
+        OUString sRet;
         if (m_registry.isValid())
             m_registry.m_pApi->getKeyName(m_hImpl, &sRet.pData);
         return sRet;
     }
 
-inline RegError RegistryKey::createKey(const rtl::OUString& keyName,
+inline RegError RegistryKey::createKey(const OUString& keyName,
                                           RegistryKey& rNewKey)
     {
         if (rNewKey.isValid()) rNewKey.closeKey();
@@ -721,7 +721,7 @@ inline RegError RegistryKey::createKey(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::openKey(const rtl::OUString& keyName,
+inline RegError RegistryKey::openKey(const OUString& keyName,
                                      RegistryKey& rOpenKey)
     {
         if (rOpenKey.isValid()) rOpenKey.closeKey();
@@ -735,7 +735,7 @@ inline RegError RegistryKey::openKey(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::openSubKeys(const rtl::OUString& keyName,
+inline RegError RegistryKey::openSubKeys(const OUString& keyName,
                                          RegistryKeyArray& rSubKeys)
     {
         if (m_registry.isValid())
@@ -757,7 +757,7 @@ inline RegError RegistryKey::openSubKeys(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::getKeyNames(const rtl::OUString& keyName,
+inline RegError RegistryKey::getKeyNames(const OUString& keyName,
                                              RegistryKeyNames& rSubKeyNames)
     {
         if (m_registry.isValid())
@@ -779,7 +779,7 @@ inline RegError RegistryKey::getKeyNames(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::deleteKey(const rtl::OUString& keyName)
+inline RegError RegistryKey::deleteKey(const OUString& keyName)
     {
         if (m_registry.isValid())
             return m_registry.m_pApi->deleteKey(m_hImpl, keyName.pData);
@@ -811,7 +811,7 @@ inline void RegistryKey::releaseKey()
     }
 }
 
-inline RegError RegistryKey::setValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::setValue(const OUString& keyName,
                                               RegValueType valueType,
                                            RegValue pValue,
                                               sal_uInt32 valueSize)
@@ -823,7 +823,7 @@ inline RegError RegistryKey::setValue(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::setLongListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::setLongListValue(const OUString& keyName,
                                                   sal_Int32 const * pValueList,
                                                   sal_uInt32 len)
     {
@@ -834,7 +834,7 @@ inline RegError RegistryKey::setLongListValue(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::setStringListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::setStringListValue(const OUString& keyName,
                                                    sal_Char** pValueList,
                                                    sal_uInt32 len)
     {
@@ -845,7 +845,7 @@ inline RegError RegistryKey::setStringListValue(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::setUnicodeListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::setUnicodeListValue(const OUString& keyName,
                                                         sal_Unicode** pValueList,
                                                         sal_uInt32 len)
     {
@@ -856,7 +856,7 @@ inline RegError RegistryKey::setUnicodeListValue(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::getValueInfo(const rtl::OUString& keyName,
+inline RegError RegistryKey::getValueInfo(const OUString& keyName,
                                                   RegValueType* pValueType,
                                                   sal_uInt32* pValueSize)
     {
@@ -866,7 +866,7 @@ inline RegError RegistryKey::getValueInfo(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::getValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::getValue(const OUString& keyName,
                                         RegValue pValue)
     {
         if (m_registry.isValid())
@@ -875,7 +875,7 @@ inline RegError RegistryKey::getValue(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::getLongListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::getLongListValue(const OUString& keyName,
                                               RegistryValueList<sal_Int32>& rValueList)
     {
         if (m_registry.isValid())
@@ -898,7 +898,7 @@ inline RegError RegistryKey::getLongListValue(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::getStringListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::getStringListValue(const OUString& keyName,
                                                       RegistryValueList<sal_Char*>& rValueList)
     {
         if (m_registry.isValid())
@@ -921,7 +921,7 @@ inline RegError RegistryKey::getStringListValue(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::getUnicodeListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::getUnicodeListValue(const OUString& keyName,
                                               RegistryValueList<sal_Unicode*>& rValueList)
     {
         if (m_registry.isValid())
@@ -944,8 +944,8 @@ inline RegError RegistryKey::getUnicodeListValue(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline RegError RegistryKey::getResolvedKeyName(const rtl::OUString& keyName,
-                                                      rtl::OUString& rResolvedName) const
+inline RegError RegistryKey::getResolvedKeyName(const OUString& keyName,
+                                                      OUString& rResolvedName) const
     {
         if (m_registry.isValid())
             return m_registry.m_pApi->getResolvedKeyName(m_hImpl,
@@ -956,13 +956,13 @@ inline RegError RegistryKey::getResolvedKeyName(const rtl::OUString& keyName,
             return RegError::INVALID_KEY;
     }
 
-inline rtl::OUString RegistryKey::getRegistryName()
+inline OUString RegistryKey::getRegistryName()
     {
         if (m_registry.isValid())
         {
             return m_registry.getName();
         } else
-            return rtl::OUString();
+            return OUString();
     }
 
 
@@ -1011,21 +1011,21 @@ inline RegError Registry::openRootKey(RegistryKey& rRootKey)
         return m_pApi->openRootKey(m_hImpl, &rRootKey.m_hImpl);
     }
 
-inline rtl::OUString Registry::getName()
+inline OUString Registry::getName()
     {
-        rtl::OUString sRet;
+        OUString sRet;
         m_pApi->getName(m_hImpl, &sRet.pData);
         return sRet;
     }
 
-inline RegError Registry::create(const rtl::OUString& registryName)
+inline RegError Registry::create(const OUString& registryName)
     {
         if (m_hImpl)
             m_pApi->release(m_hImpl);
         return m_pApi->createRegistry(registryName.pData, &m_hImpl);
     }
 
-inline RegError Registry::open(const rtl::OUString& registryName,
+inline RegError Registry::open(const OUString& registryName,
                                   RegAccessMode accessMode)
     {
         if (m_hImpl)
@@ -1041,7 +1041,7 @@ inline RegError Registry::close()
         return ret;
     }
 
-inline RegError Registry::destroy(const rtl::OUString& registryName)
+inline RegError Registry::destroy(const OUString& registryName)
     {
         RegError ret = m_pApi->destroyRegistry(m_hImpl, registryName.pData);
         if ( ret == RegError::NO_ERROR && registryName.isEmpty() )
@@ -1050,8 +1050,8 @@ inline RegError Registry::destroy(const rtl::OUString& registryName)
     }
 
 inline RegError Registry::mergeKey(RegistryKey& rKey,
-                                         const rtl::OUString& keyName,
-                                         const rtl::OUString& regFileName,
+                                         const OUString& keyName,
+                                         const OUString& regFileName,
                                          bool bReport)
     {  return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, false/*bWarnings*/, bReport); }
 
diff --git a/include/registry/writer.hxx b/include/registry/writer.hxx
index 7e3bfbd7e9bc..17d6838bd831 100644
--- a/include/registry/writer.hxx
+++ b/include/registry/writer.hxx
@@ -70,9 +70,9 @@ public:
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
     Writer(
-        typereg_Version version, rtl::OUString const & documentation,
-        rtl::OUString const & fileName, RTTypeClass typeClass, bool published,
-        rtl::OUString const & typeName, sal_uInt16 superTypeCount,
+        typereg_Version version, OUString const & documentation,
+        OUString const & fileName, RTTypeClass typeClass, bool published,
+        OUString const & typeName, sal_uInt16 superTypeCount,
         sal_uInt16 fieldCount, sal_uInt16 methodCount,
         sal_uInt16 referenceCount):
         m_handle(
@@ -103,7 +103,7 @@ public:
 
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
-    void setSuperTypeName(sal_uInt16 index, rtl::OUString const & typeName) {
+    void setSuperTypeName(sal_uInt16 index, OUString const & typeName) {
         if (!typereg_writer_setSuperTypeName(m_handle, index, typeName.pData)) {
             throw std::bad_alloc();
         }
@@ -129,9 +129,9 @@ public:
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
     void setFieldData(
-        sal_uInt16 index, rtl::OUString const & documentation,
-        rtl::OUString const & fileName, RTFieldAccess flags, rtl::OUString const & name,
-        rtl::OUString const & typeName, RTConstValue const & value)
+        sal_uInt16 index, OUString const & documentation,
+        OUString const & fileName, RTFieldAccess flags, OUString const & name,
+        OUString const & typeName, RTConstValue const & value)
     {
         if (!typereg_writer_setFieldData(
                 m_handle, index, documentation.pData, fileName.pData, flags,
@@ -161,9 +161,9 @@ public:
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
     void setMethodData(
-        sal_uInt16 index, rtl::OUString const & documentation,
-        RTMethodMode flags, rtl::OUString const & name,
-        rtl::OUString const & returnTypeName, sal_uInt16 parameterCount,
+        sal_uInt16 index, OUString const & documentation,
+        RTMethodMode flags, OUString const & name,
+        OUString const & returnTypeName, sal_uInt16 parameterCount,
         sal_uInt16 exceptionCount)
     {
         if (!typereg_writer_setMethodData(
@@ -193,8 +193,8 @@ public:
      */
     void setMethodParameterData(
         sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
-        RTParamMode flags, rtl::OUString const & name,
-        rtl::OUString const & typeName) const
+        RTParamMode flags, OUString const & name,
+        OUString const & typeName) const
     {
         if (!typereg_writer_setMethodParameterData(
                 m_handle, methodIndex, parameterIndex, flags, name.pData,
@@ -219,7 +219,7 @@ public:
      */
     void setMethodExceptionTypeName(
         sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
-        rtl::OUString const & typeName)
+        OUString const & typeName)
     {
         if (!typereg_writer_setMethodExceptionTypeName(
                 m_handle, methodIndex, exceptionIndex, typeName.pData))
@@ -245,9 +245,9 @@ public:
        @exception std::bad_alloc is raised if an out-of-memory condition occurs
      */
     void setReferenceData(
-        sal_uInt16 index, rtl::OUString const & documentation,
+        sal_uInt16 index, OUString const & documentation,
         RTReferenceType sort, RTFieldAccess flags,
-        rtl::OUString const & typeName)
+        OUString const & typeName)
     {
         if (!typereg_writer_setReferenceData(
                 m_handle, index, documentation.pData, sort, flags,