automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings

Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

8 files changed, 64 insertions, 73 deletions

diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index 5c57a641df4b..f29c5eaab96f 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -487,8 +487,7 @@ void Test::testBigStruct() {
 void Test::testPolyStruct() {
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "test.codemaker.cppumaker.Struct<char,short>")),
+                "test.codemaker.cppumaker.Struct<char,short>"),
         (com::sun::star::uno::makeAny(
             test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
          getValueType().getTypeName()));
@@ -507,7 +506,7 @@ void Test::testExceptions() {
         aEmptySequence;
 
     test::codemaker::cppumaker::TestException1 e11(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
+        rtl::OUString("abc"), 0, 1,
         com::sun::star::uno::makeAny(123.0),
         test::codemaker::cppumaker::HelperEnum_ONE,
         test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
@@ -517,7 +516,7 @@ void Test::testExceptions() {
     e13 = e11;
     CPPUNIT_ASSERT_EQUAL(e11, e13);
     test::codemaker::cppumaker::TestException2 e21(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
+        rtl::OUString("abc"), 0, 1,
         com::sun::star::uno::makeAny(123.0),
         test::codemaker::cppumaker::HelperEnum_ONE,
         test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index d53f0e2aa7e7..aadc1b35338c 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -301,7 +301,7 @@ void Test::testVoid() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -399,7 +399,7 @@ void Test::testBoolean() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -498,7 +498,7 @@ void Test::testByte() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -597,7 +597,7 @@ void Test::testShort() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -698,7 +698,7 @@ void Test::testUnsignedShort() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -793,7 +793,7 @@ void Test::testLong() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -888,7 +888,7 @@ void Test::testUnsignedLong() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -983,7 +983,7 @@ void Test::testHyper() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -1078,7 +1078,7 @@ void Test::testUnsignedHyper() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -1173,7 +1173,7 @@ void Test::testFloat() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -1268,7 +1268,7 @@ void Test::testDouble() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -1368,7 +1368,7 @@ void Test::testChar() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -1398,7 +1398,7 @@ void Test::testChar() {
 }
 
 void Test::testString() {
-    css::uno::Any a(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")));
+    css::uno::Any a(rtl::OUString("1"));
     CPPUNIT_ASSERT(a.getValueType() == getCppuType< rtl::OUString >());
     {
         bool b = true;
@@ -1463,7 +1463,7 @@ void Test::testString() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -1557,7 +1557,7 @@ void Test::testType() {
             "css::uno::Type", (a >>= b) && b == getCppuType< sal_Int32 >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -1654,7 +1654,7 @@ void Test::testSequence() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -1755,7 +1755,7 @@ void Test::testEnum() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -1854,7 +1854,7 @@ void Test::testStruct() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -1974,7 +1974,7 @@ void Test::testException() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -2090,7 +2090,7 @@ void Test::testInterface() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
@@ -2204,7 +2204,7 @@ void Test::testNull() {
             !(a >>= b) && b == getCppuType< rtl::OUString >());
     }
     {
-        css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+        css::uno::Any b(rtl::OUString("2"));
         CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
     }
     {
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 527cac596205..06f6763f580c 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -87,76 +87,76 @@ void Test::testUnoType() {
     t = ::cppu::UnoType< ::cppu::UnoVoidType >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_VOID, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")), t.getTypeName());
+        ::rtl::OUString("void"), t.getTypeName());
     t = ::cppu::UnoType< bool >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BOOLEAN, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")),
+        ::rtl::OUString("boolean"),
         t.getTypeName());
     CPPUNIT_ASSERT(::cppu::UnoType< ::sal_Bool >::get() == t);
     t = ::cppu::UnoType< ::sal_Int8 >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BYTE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("byte")), t.getTypeName());
+        ::rtl::OUString("byte"), t.getTypeName());
     t = ::cppu::UnoType< ::sal_Int16 >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SHORT, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("short")), t.getTypeName());
+        ::rtl::OUString("short"), t.getTypeName());
     t = ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get();
     CPPUNIT_ASSERT_EQUAL(
         +css::uno::TypeClass_UNSIGNED_SHORT, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")),
+        ::rtl::OUString("unsigned short"),
         t.getTypeName());
     t = ::cppu::UnoType< ::sal_Int32 >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_LONG, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("long")), t.getTypeName());
+        ::rtl::OUString("long"), t.getTypeName());
     t = ::cppu::UnoType< ::sal_uInt32 >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_UNSIGNED_LONG, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")),
+        ::rtl::OUString("unsigned long"),
         t.getTypeName());
     t = ::cppu::UnoType< ::sal_Int64 >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_HYPER, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hyper")), t.getTypeName());
+        ::rtl::OUString("hyper"), t.getTypeName());
     t = ::cppu::UnoType< ::sal_uInt64 >::get();
     CPPUNIT_ASSERT_EQUAL(
         +css::uno::TypeClass_UNSIGNED_HYPER, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned hyper")),
+        ::rtl::OUString("unsigned hyper"),
         t.getTypeName());
     t = ::cppu::UnoType< float >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_FLOAT, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("float")), t.getTypeName());
+        ::rtl::OUString("float"), t.getTypeName());
     t = ::cppu::UnoType< double >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_DOUBLE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("double")),
+        ::rtl::OUString("double"),
         t.getTypeName());
     t = ::cppu::UnoType< ::cppu::UnoCharType >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_CHAR, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("char")), t.getTypeName());
+        ::rtl::OUString("char"), t.getTypeName());
     t = ::cppu::UnoType< ::rtl::OUString >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRING, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("string")),
+        ::rtl::OUString("string"),
         t.getTypeName());
     t = ::cppu::UnoType< css::uno::Type >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_TYPE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("type")), t.getTypeName());
+        ::rtl::OUString("type"), t.getTypeName());
     t = ::cppu::UnoType< css::uno::Any >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_ANY, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")), t.getTypeName());
+        ::rtl::OUString("any"), t.getTypeName());
     t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_Int8 > >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]byte")),
+        ::rtl::OUString("[]byte"),
         t.getTypeName());
     CPPUNIT_ASSERT(
         ::cppu::UnoType< css::uno::Sequence< ::sal_Int8 > >::get() == t);
@@ -164,19 +164,19 @@ void Test::testUnoType() {
         ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]unsigned short")),
+        ::rtl::OUString("[]unsigned short"),
         t.getTypeName());
     t = ::cppu::UnoType<
         ::cppu::UnoSequenceType< ::cppu::UnoCharType > >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]char")),
+        ::rtl::OUString("[]char"),
         t.getTypeName());
     t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::sal_Int8 > > >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]byte")),
+        ::rtl::OUString("[][]byte"),
         t.getTypeName());
     CPPUNIT_ASSERT(
         ::cppu::UnoType<
@@ -185,33 +185,30 @@ void Test::testUnoType() {
         ::cppu::UnoUnsignedShortType > > >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]unsigned short")),
+        ::rtl::OUString("[][]unsigned short"),
         t.getTypeName());
     t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::cppu::UnoCharType > > >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]char")),
+        ::rtl::OUString("[][]char"),
         t.getTypeName());
     t = ::cppu::UnoType< css::uno::TypeClass >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_ENUM, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.TypeClass")),
+        ::rtl::OUString("com.sun.star.uno.TypeClass"),
         t.getTypeName());
     t = ::cppu::UnoType< css::lang::EventObject >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.EventObject")),
+        ::rtl::OUString("com.sun.star.lang.EventObject"),
         t.getTypeName());
     CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct1 >::get() == t);
     t = ::cppu::UnoType< css::beans::PropertyChangeEvent >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
         ::rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.beans.PropertyChangeEvent")),
+                "com.sun.star.beans.PropertyChangeEvent"),
         t.getTypeName());
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity stated
     CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct2 >::get() == t);
@@ -219,21 +216,18 @@ void Test::testUnoType() {
     t = ::cppu::UnoType< css::beans::Optional< ::sal_Int8 > >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Optional<byte>")),
+        ::rtl::OUString("com.sun.star.beans.Optional<byte>"),
         t.getTypeName());
     t = ::cppu::UnoType< css::uno::Exception >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_EXCEPTION, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")),
+        ::rtl::OUString("com.sun.star.uno.Exception"),
         t.getTypeName());
     CPPUNIT_ASSERT(::cppu::UnoType< DerivedException1 >::get() == t);
     t = ::cppu::UnoType< css::uno::RuntimeException >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_EXCEPTION, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException")),
+        ::rtl::OUString("com.sun.star.uno.RuntimeException"),
         t.getTypeName());
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity stated
     CPPUNIT_ASSERT(::cppu::UnoType< DerivedException2 >::get() == t);
@@ -241,8 +235,7 @@ void Test::testUnoType() {
     t = ::cppu::UnoType< css::uno::XInterface >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_INTERFACE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")),
+        ::rtl::OUString("com.sun.star.uno.XInterface"),
         t.getTypeName());
     CPPUNIT_ASSERT(
         ::cppu::UnoType< css::uno::Reference< css::uno::XInterface > >::get() ==
@@ -254,8 +247,7 @@ void Test::testUnoType() {
     t = ::cppu::UnoType< css::uno::XComponentContext >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_INTERFACE, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
-        ::rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XComponentContext")),
+        ::rtl::OUString("com.sun.star.uno.XComponentContext"),
         t.getTypeName());
     CPPUNIT_ASSERT(
         ::cppu::UnoType<
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 86d79f1f7564..1495f56adcc2 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -321,18 +321,18 @@ int  AffineBridge::v_isValid(rtl::OUString * pReason)
 {
     int result = m_enterCount > 0;
     if (!result)
-        *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
+        *pReason = rtl::OUString("not entered");
 
     else
     {
         result = m_innerThreadId == osl_getThreadIdentifier(NULL);
 
         if (!result)
-            *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread"));
+            *pReason = rtl::OUString("wrong thread");
     }
 
     if (result)
-        *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
+        *pReason = rtl::OUString("OK");
 
     return result;
 }
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index a1cacf442db8..a7c768fd42ea 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -112,18 +112,18 @@ int LogBridge::v_isValid(rtl::OUString * pReason)
     int result = m_count > 0;
     if (!result)
     {
-        *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
+        *pReason = rtl::OUString("not entered");
     }
     else
     {
         result = m_threadId == osl_getThreadIdentifier(NULL);
 
         if (!result)
-            *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread"));
+            *pReason = rtl::OUString("wrong thread");
     }
 
     if (result)
-        *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
+        *pReason = rtl::OUString("OK");
 
     return result;
 }
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 382ed3e36f7f..6a5f4831f282 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -121,18 +121,18 @@ int UnsafeBridge::v_isValid(rtl::OUString * pReason)
     int result = m_count > 0;
     if (!result)
     {
-        *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
+        *pReason = rtl::OUString("not entered");
     }
     else
     {
         result = m_threadId == osl_getThreadIdentifier(NULL);
 
         if (!result)
-            *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread"));
+            *pReason = rtl::OUString("wrong thread");
     }
 
     if (result)
-        *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
+        *pReason = rtl::OUString("OK");
 
     return result;
 }
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index b1e9cca1388c..d17299aba5af 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -2183,7 +2183,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_getByName(
         {
             // Check for derived interface member type:
             sal_Int32 i1 = name.lastIndexOf(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":@")));
+                rtl::OUString(":@"));
             if (i1 >= 0) {
                 sal_Int32 i2 = i1 + RTL_CONSTASCII_LENGTH(":@");
                 sal_Int32 i3 = name.indexOf(',', i2);
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 1909274c5d2a..93b5bf107562 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1122,7 +1122,7 @@ static uno_Environment * initDefaultEnvironment(
         if (!envPurpose.isEmpty())
         {
             rtl::OUString libStem = envPurpose.copy(envPurpose.lastIndexOf(':') + 1);
-            libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_uno_uno") );
+            libStem += rtl::OUString("_uno_uno");
 
             if(!loadEnv(libStem, pEnv))
             {