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, 27 insertions, 27 deletions

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: */