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>

4 files changed, 108 insertions, 108 deletions

diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 2a4bc64ab703..5df856146063 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -209,7 +209,7 @@ namespace cppu_ifcontainer
                 ::cppu::UnoType< ::sal_uInt32 >::get(),
                 ::cppu::UnoType< ::sal_Int32 >::get(),
                 ::cppu::UnoType< ::sal_Int16 >::get(),
-                ::cppu::UnoType< ::rtl::OUString >::get(),
+                ::cppu::UnoType< OUString >::get(),
                 ::cppu::UnoType< ::sal_Int8 >::get()
             };
             doContainerTest< cppu::OMultiTypeInterfaceContainerHelper,
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index 5e8ce06b7ef0..2447c816522f 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -63,7 +63,7 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & context):
         cppu::PropertySetMixin< css::lang::XComponent >(
             context, static_cast< Implements >(0),
-            css::uno::Sequence< rtl::OUString >())
+            css::uno::Sequence< OUString >())
     {}
 
     virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
@@ -121,7 +121,7 @@ public:
             static_cast< Implements >(
                 IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET
                 | IMPLEMENTS_PROPERTY_ACCESS),
-            css::uno::Sequence< rtl::OUString >())
+            css::uno::Sequence< OUString >())
     {}
 
     virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
@@ -167,8 +167,8 @@ css::uno::Any Empty2::queryInterface(css::uno::Type const & type)
             type);
 }
 
-css::uno::Sequence< rtl::OUString > sequenceThird() {
-    css::uno::Sequence<OUString> s { rtl::OUString("Third") };
+css::uno::Sequence< OUString > sequenceThird() {
+    css::uno::Sequence<OUString> s { OUString("Third") };
     return s;
 }
 
@@ -273,7 +273,7 @@ sal_Int32 Full::getFirst() throw (css::uno::RuntimeException) {
 
 void Full::setFirst(sal_Int32 value) throw (css::uno::RuntimeException) {
     prepareSet(
-        rtl::OUString("First"), css::uno::Any(),
+        OUString("First"), css::uno::Any(),
         css::uno::Any(), 0);
     osl::MutexGuard g(m_mutex);
     m_a1 = value;
@@ -302,7 +302,7 @@ void Full::setSecond(
     }
     BoundListeners l;
     prepareSet(
-        rtl::OUString("Second"), css::uno::Any(),
+        OUString("Second"), css::uno::Any(),
         v, &l);
     {
         osl::MutexGuard g(m_mutex);
@@ -315,7 +315,7 @@ sal_Int32 Full::getThird()
     throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     throw css::beans::UnknownPropertyException(
-        rtl::OUString("Third"),
+        OUString("Third"),
         static_cast< cppu::OWeakObject * >(this));
 }
 
@@ -323,7 +323,7 @@ void Full::setThird(sal_Int32)
     throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     throw css::beans::UnknownPropertyException(
-        rtl::OUString("Third"),
+        OUString("Third"),
         static_cast< cppu::OWeakObject * >(this));
 }
 
@@ -331,7 +331,7 @@ sal_Int32 Full::getFourth()
     throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     throw css::beans::UnknownPropertyException(
-        rtl::OUString("Fourth"),
+        OUString("Fourth"),
         static_cast< cppu::OWeakObject * >(this));
 }
 
@@ -339,7 +339,7 @@ void Full::setFourth(sal_Int32)
     throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     throw css::beans::UnknownPropertyException(
-        rtl::OUString("Fourth"),
+        OUString("Fourth"),
         static_cast< cppu::OWeakObject * >(this));
 }
 
@@ -379,14 +379,14 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
     return static_cast< cppu::OWeakObject * >(new Supplier(context));
 }
 
-rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString(
+OUString SAL_CALL getImplementationName() {
+    return OUString(
             "test.cppuhelper.propertysetmixin.comp.CppSupplier");
 }
 
-css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
 {
-    css::uno::Sequence< rtl::OUString > s { "test.cppuhelper.propertysetmixin.CppSupplier") };
+    css::uno::Sequence< OUString > s { "test.cppuhelper.propertysetmixin.CppSupplier") };
     return s;
 }
 
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index 5fa8cd1794ce..cff87436ce2c 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -68,8 +68,8 @@ namespace com { namespace sun { namespace star {
 
 namespace {
 
-std::ostream & operator <<(std::ostream & out, rtl::OUString const & value) {
-    return out << rtl::OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr();
+std::ostream & operator <<(std::ostream & out, OUString const & value) {
+    return out << OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr();
 }
 
 std::ostream & operator <<(std::ostream & out, css::uno::Type const & value) {
@@ -254,34 +254,34 @@ void Test::testEmpty2(
         static_cast< sal_Int32 >(0), info->getProperties().getLength());
     try {
         info->getPropertyByName(
-            rtl::OUString("any"));
+            OUString("any"));
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     CPPUNIT_ASSERT(
         !info->hasPropertyByName(
-            rtl::OUString("any")));
+            OUString("any")));
     try {
         empty2p->setPropertyValue(
-            rtl::OUString("any"), css::uno::Any());
+            OUString("any"), css::uno::Any());
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     try {
         empty2p->getPropertyValue(
-            rtl::OUString("any"));
+            OUString("any"));
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     rtl::Reference< BoundListener > boundListener1(new BoundListener);
-    empty2p->addPropertyChangeListener(rtl::OUString(), boundListener1.get());
-    empty2p->addPropertyChangeListener(rtl::OUString(), boundListener1.get());
+    empty2p->addPropertyChangeListener(OUString(), boundListener1.get());
+    empty2p->addPropertyChangeListener(OUString(), boundListener1.get());
     rtl::Reference< BoundListener > boundListener2(new BoundListener);
     empty2p->removePropertyChangeListener(
-        rtl::OUString(), boundListener2.get());
+        OUString(), boundListener2.get());
     rtl::Reference< VetoListener > vetoListener1(new VetoListener);
-    empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener1.get());
-    empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener1.get());
+    empty2p->addVetoableChangeListener(OUString(), vetoListener1.get());
+    empty2p->addVetoableChangeListener(OUString(), vetoListener1.get());
     rtl::Reference< VetoListener > vetoListener2(new VetoListener);
-    empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener2.get());
-    empty2p->removeVetoableChangeListener(rtl::OUString(), vetoListener2.get());
+    empty2p->addVetoableChangeListener(OUString(), vetoListener2.get());
+    empty2p->removeVetoableChangeListener(OUString(), vetoListener2.get());
     css::uno::Reference< css::beans::XFastPropertySet > empty2f(
         empty2, css::uno::UNO_QUERY);
     CPPUNIT_ASSERT(empty2f.is());
@@ -309,10 +309,10 @@ void Test::testEmpty2(
     empty2a->setPropertyValues(
         css::uno::Sequence< css::beans::PropertyValue >());
     css::uno::Sequence< css::beans::PropertyValue > vs(2);
-    vs[0].Name = rtl::OUString("any1");
+    vs[0].Name = OUString("any1");
     vs[0].Handle = -1;
     vs[0].State = css::beans::PropertyState_DIRECT_VALUE;
-    vs[0].Name = rtl::OUString("any2");
+    vs[0].Name = OUString("any2");
     vs[0].Handle = -1;
     vs[0].State = css::beans::PropertyState_DIRECT_VALUE;
     try {
@@ -329,23 +329,23 @@ void Test::testEmpty2(
     CPPUNIT_ASSERT_EQUAL(2, vetoListener1->count());
     CPPUNIT_ASSERT_EQUAL(0, vetoListener2->count());
     empty2p->removePropertyChangeListener(
-        rtl::OUString(), boundListener1.get());
+        OUString(), boundListener1.get());
     empty2p->removePropertyChangeListener(
-        rtl::OUString(), boundListener2.get());
-    empty2p->removeVetoableChangeListener(rtl::OUString(), vetoListener1.get());
-    empty2p->removeVetoableChangeListener(rtl::OUString(), vetoListener2.get());
-    empty2p->addPropertyChangeListener(rtl::OUString(), boundListener1.get());
-    empty2p->addPropertyChangeListener(rtl::OUString(), boundListener2.get());
-    empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener1.get());
-    empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener2.get());
+        OUString(), boundListener2.get());
+    empty2p->removeVetoableChangeListener(OUString(), vetoListener1.get());
+    empty2p->removeVetoableChangeListener(OUString(), vetoListener2.get());
+    empty2p->addPropertyChangeListener(OUString(), boundListener1.get());
+    empty2p->addPropertyChangeListener(OUString(), boundListener2.get());
+    empty2p->addVetoableChangeListener(OUString(), vetoListener1.get());
+    empty2p->addVetoableChangeListener(OUString(), vetoListener2.get());
     try {
         empty2p->addPropertyChangeListener(
-            rtl::OUString(),
+            OUString(),
             css::uno::Reference< css::beans::XPropertyChangeListener >());
     } catch (css::uno::RuntimeException &) {}
     try {
         empty2p->addVetoableChangeListener(
-            rtl::OUString(),
+            OUString(),
             css::uno::Reference< css::beans::XVetoableChangeListener >());
     } catch (css::uno::RuntimeException &) {}
     CPPUNIT_ASSERT_EQUAL(3, boundListener1->count());
@@ -370,16 +370,16 @@ void Test::testFull(
         static_cast< sal_Int32 >(3), info->getProperties().getLength());
     css::beans::Property prop(
         info->getPropertyByName(
-            rtl::OUString("First")));
+            OUString("First")));
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("First"), prop.Name);
+        OUString("First"), prop.Name);
     CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), prop.Handle);
     CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type);
     CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int16 >(0), prop.Attributes);
     prop = info->getPropertyByName(
-        rtl::OUString("Second"));
+        OUString("Second"));
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("Second"), prop.Name);
+        OUString("Second"), prop.Name);
     CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), prop.Handle);
     CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type);
     CPPUNIT_ASSERT_EQUAL(
@@ -393,13 +393,13 @@ void Test::testFull(
         prop.Attributes);
     try {
         info->getPropertyByName(
-            rtl::OUString("Third"));
+            OUString("Third"));
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     prop = info->getPropertyByName(
-        rtl::OUString("Fourth"));
+        OUString("Fourth"));
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("Fourth"), prop.Name);
+        OUString("Fourth"), prop.Name);
     CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(3), prop.Handle);
     CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type);
     CPPUNIT_ASSERT_EQUAL(
@@ -407,93 +407,93 @@ void Test::testFull(
         prop.Attributes);
     try {
         info->getPropertyByName(
-            rtl::OUString("first"));
+            OUString("first"));
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     CPPUNIT_ASSERT(
         info->hasPropertyByName(
-            rtl::OUString("First")));
+            OUString("First")));
     CPPUNIT_ASSERT(
         info->hasPropertyByName(
-            rtl::OUString("Second")));
+            OUString("Second")));
     CPPUNIT_ASSERT(
         !info->hasPropertyByName(
-            rtl::OUString("Third")));
+            OUString("Third")));
     CPPUNIT_ASSERT(
         info->hasPropertyByName(
-            rtl::OUString("Fourth")));
+            OUString("Fourth")));
     CPPUNIT_ASSERT(
         !info->hasPropertyByName(
-            rtl::OUString("first")));
+            OUString("first")));
     CPPUNIT_ASSERT_EQUAL(
         css::uno::Any(static_cast< sal_Int32 >(0)),
         fullp->getPropertyValue(
-            rtl::OUString("First")));
+            OUString("First")));
     fullp->setPropertyValue(
-        rtl::OUString("First"),
+        OUString("First"),
         css::uno::Any(static_cast< sal_Int32 >(-100)));
     CPPUNIT_ASSERT_EQUAL(
         css::uno::Any(static_cast< sal_Int32 >(-100)),
         fullp->getPropertyValue(
-            rtl::OUString("First")));
+            OUString("First")));
     css::uno::Any voidAny;
     CPPUNIT_ASSERT_EQUAL(
         voidAny,
         fullp->getPropertyValue(
-            rtl::OUString("Second")));
+            OUString("Second")));
     fullp->setPropertyValue(
-        rtl::OUString("Second"),
+        OUString("Second"),
         css::uno::Any(static_cast< sal_Int32 >(100)));
     CPPUNIT_ASSERT_EQUAL(
         css::uno::Any(static_cast< sal_Int32 >(100)),
         fullp->getPropertyValue(
-            rtl::OUString("Second")));
+            OUString("Second")));
     CPPUNIT_ASSERT(full->getSecond().Value.Value.IsPresent);
     CPPUNIT_ASSERT_EQUAL(
         static_cast< sal_Int32 >(100), full->getSecond().Value.Value.Value);
     CPPUNIT_ASSERT(!full->getSecond().Value.IsDefaulted);
     CPPUNIT_ASSERT(!full->getSecond().IsAmbiguous);
     fullp->setPropertyValue(
-        rtl::OUString("Second"),
+        OUString("Second"),
         css::uno::Any());
     CPPUNIT_ASSERT_EQUAL(
         voidAny,
         fullp->getPropertyValue(
-            rtl::OUString("Second")));
+            OUString("Second")));
     CPPUNIT_ASSERT(!full->getSecond().Value.Value.IsPresent);
     CPPUNIT_ASSERT(!full->getSecond().Value.IsDefaulted);
     CPPUNIT_ASSERT(!full->getSecond().IsAmbiguous);
     try {
         fullp->setPropertyValue(
-            rtl::OUString("Third"),
+            OUString("Third"),
             css::uno::Any(static_cast< sal_Int32 >(100)));
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     try {
         fullp->getPropertyValue(
-            rtl::OUString("Third"));
+            OUString("Third"));
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     try {
         fullp->setPropertyValue(
-            rtl::OUString("Fourth"),
+            OUString("Fourth"),
             css::uno::Any(static_cast< sal_Int32 >(100)));
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     try {
         fullp->getPropertyValue(
-            rtl::OUString("Fourth"));
+            OUString("Fourth"));
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     try {
         fullp->setPropertyValue(
-            rtl::OUString("first"),
+            OUString("first"),
             css::uno::Any());
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     try {
         fullp->getPropertyValue(
-            rtl::OUString("first"));
+            OUString("first"));
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     css::uno::Reference< css::beans::XFastPropertySet > fullf(
@@ -520,13 +520,13 @@ void Test::testFull(
         fulla->getPropertyValues());
     CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(2), vs.getLength());
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("First"), vs[0].Name);
+        OUString("First"), vs[0].Name);
     CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), vs[0].Handle);
     CPPUNIT_ASSERT_EQUAL(
         css::uno::Any(static_cast< sal_Int32 >(0)), vs[0].Value);
     CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State);
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("Second"), vs[1].Name);
+        OUString("Second"), vs[1].Name);
     CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), vs[1].Handle);
     CPPUNIT_ASSERT_EQUAL(voidAny, vs[1].Value);
     CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[1].State);
@@ -537,12 +537,12 @@ void Test::testFull(
     vs = fulla->getPropertyValues();
     CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(2), vs.getLength());
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("First"), vs[0].Name);
+        OUString("First"), vs[0].Name);
     CPPUNIT_ASSERT_EQUAL(
         css::uno::Any(static_cast< sal_Int32 >(-100)), vs[0].Value);
     CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State);
     CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString("Second"), vs[1].Name);
+        OUString("Second"), vs[1].Name);
     CPPUNIT_ASSERT_EQUAL(
         css::uno::Any(static_cast< sal_Int32 >(100)), vs[1].Value);
     CPPUNIT_ASSERT_EQUAL(
@@ -555,76 +555,76 @@ void Test::testFull(
     css::uno::Reference< css::beans::XPropertyChangeListener > boundListener(
         new BoundListener);
     fullp->addPropertyChangeListener(
-        rtl::OUString("First"), boundListener);
+        OUString("First"), boundListener);
     fullp->removePropertyChangeListener(
-        rtl::OUString("First"), boundListener);
+        OUString("First"), boundListener);
     fullp->addPropertyChangeListener(
-        rtl::OUString("Second"), boundListener);
+        OUString("Second"), boundListener);
     fullp->removePropertyChangeListener(
-        rtl::OUString("Second"), boundListener);
+        OUString("Second"), boundListener);
     try {
         fullp->addPropertyChangeListener(
-            rtl::OUString("Third"),
+            OUString("Third"),
             boundListener);
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     try {
         fullp->removePropertyChangeListener(
-            rtl::OUString("Third"),
+            OUString("Third"),
             boundListener);
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     fullp->addPropertyChangeListener(
-        rtl::OUString("Fourth"), boundListener);
+        OUString("Fourth"), boundListener);
     fullp->removePropertyChangeListener(
-        rtl::OUString("Fourth"), boundListener);
+        OUString("Fourth"), boundListener);
     try {
         fullp->addPropertyChangeListener(
-            rtl::OUString("Fifth"),
+            OUString("Fifth"),
             boundListener);
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     try {
         fullp->removePropertyChangeListener(
-            rtl::OUString("Fifth"),
+            OUString("Fifth"),
             boundListener);
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     css::uno::Reference< css::beans::XVetoableChangeListener > vetoListener(
         new VetoListener);
     fullp->addVetoableChangeListener(
-        rtl::OUString("First"), vetoListener);
+        OUString("First"), vetoListener);
     fullp->removeVetoableChangeListener(
-        rtl::OUString("First"), vetoListener);
+        OUString("First"), vetoListener);
     fullp->addVetoableChangeListener(
-        rtl::OUString("Second"), vetoListener);
+        OUString("Second"), vetoListener);
     fullp->removeVetoableChangeListener(
-        rtl::OUString("Second"), vetoListener);
+        OUString("Second"), vetoListener);
     try {
         fullp->addVetoableChangeListener(
-            rtl::OUString("Third"),
+            OUString("Third"),
             vetoListener);
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     try {
         fullp->removeVetoableChangeListener(
-            rtl::OUString("Third"),
+            OUString("Third"),
             vetoListener);
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     fullp->addVetoableChangeListener(
-        rtl::OUString("Fourth"), vetoListener);
+        OUString("Fourth"), vetoListener);
     fullp->removeVetoableChangeListener(
-        rtl::OUString("Fourth"), vetoListener);
+        OUString("Fourth"), vetoListener);
     try {
         fullp->addVetoableChangeListener(
-            rtl::OUString("Fifth"),
+            OUString("Fifth"),
             vetoListener);
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
     try {
         fullp->removeVetoableChangeListener(
-            rtl::OUString("Fifth"),
+            OUString("Fifth"),
             vetoListener);
         CPPUNIT_FAIL("exception expected");
     } catch (css::beans::UnknownPropertyException &) {}
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index c9883993f37a..90f193620d87 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -75,7 +75,7 @@ namespace cppu_unourl
                 bool bValid = false;
                 try
                 {
-                    cppu::UnoUrlDescriptor aDescriptor(rtl::OUString::createFromAscii(
+                    cppu::UnoUrlDescriptor aDescriptor(OUString::createFromAscii(
                                                            aTests[i].pInput));
                     (void)aDescriptor;
                     bValid = true;
@@ -123,10 +123,10 @@ namespace cppu_unourl
             for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
-                rtl::OUString aDescriptor;
+                OUString aDescriptor;
                 try
                 {
-                    aDescriptor = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii(
+                    aDescriptor = cppu::UnoUrlDescriptor(OUString::createFromAscii(
                                                              aTests[i].pInput)).
                         getDescriptor();
                     bValid = true;
@@ -171,10 +171,10 @@ namespace cppu_unourl
             for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
-                rtl::OUString aName;
+                OUString aName;
                 try
                 {
-                    aName = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii(
+                    aName = cppu::UnoUrlDescriptor(OUString::createFromAscii(
                                                        aTests[i].pInput)).getName();
                     bValid = true;
                 }
@@ -219,9 +219,9 @@ namespace cppu_unourl
                 bool bPresent = false;
                 try
                 {
-                    bPresent = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii(
+                    bPresent = cppu::UnoUrlDescriptor(OUString::createFromAscii(
                                                           aTests[i].pInput)).
-                        hasParameter(rtl::OUString::createFromAscii(aTests[i].pKey));
+                        hasParameter(OUString::createFromAscii(aTests[i].pKey));
                     bValid = true;
                 }
                 catch (rtl::MalformedUriException &)
@@ -286,12 +286,12 @@ namespace cppu_unourl
             for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
-                rtl::OUString aValue;
+                OUString aValue;
                 try
                 {
-                    aValue = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii(
+                    aValue = cppu::UnoUrlDescriptor(OUString::createFromAscii(
                                                         aTests[i].pInput)).
-                        getParameter(rtl::OUString::createFromAscii(aTests[i].pKey));
+                        getParameter(OUString::createFromAscii(aTests[i].pKey));
                     bValid = true;
                 }
                 catch (rtl::MalformedUriException &)
@@ -331,7 +331,7 @@ namespace cppu_unourl
                 bool bValid = false;
                 try
                 {
-                    cppu::UnoUrl aUrl(rtl::OUString::createFromAscii(aTests[i].pInput));
+                    cppu::UnoUrl aUrl(OUString::createFromAscii(aTests[i].pInput));
                     (void)aUrl;
                     bValid = true;
                 }
@@ -367,10 +367,10 @@ namespace cppu_unourl
             for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
-                rtl::OUString aConnection;
+                OUString aConnection;
                 try
                 {
-                    aConnection = cppu::UnoUrl(rtl::OUString::createFromAscii(
+                    aConnection = cppu::UnoUrl(OUString::createFromAscii(
                                                    aTests[i].pInput)).
                         getConnection().getDescriptor();
                     bValid = true;
@@ -401,10 +401,10 @@ namespace cppu_unourl
             for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
-                rtl::OUString aProtocol;
+                OUString aProtocol;
                 try
                 {
-                    aProtocol = cppu::UnoUrl(rtl::OUString::createFromAscii(
+                    aProtocol = cppu::UnoUrl(OUString::createFromAscii(
                                                  aTests[i].pInput)).
                         getProtocol().getDescriptor();
                     bValid = true;
@@ -438,10 +438,10 @@ namespace cppu_unourl
             for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
-                rtl::OUString aObjectName;
+                OUString aObjectName;
                 try
                 {
-                    aObjectName = cppu::UnoUrl(rtl::OUString::createFromAscii(
+                    aObjectName = cppu::UnoUrl(OUString::createFromAscii(
                                                    aTests[i].pInput)).getObjectName();
                     bValid = true;
                 }