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>

14 files changed, 61 insertions, 62 deletions

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index da29b141f94e..85d4801519b7 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -109,86 +109,86 @@ void ScMacrosTest::testVba()
 {
     TestMacroInfo testInfo[] = {
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestAddress.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("TestAddress."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vba.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document")),
+            rtl::OUString("vba."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document"),
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MiscRangeTests.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("MiscRangeTests."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bytearraystring.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document"))
+            rtl::OUString("bytearraystring."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoFilter.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("AutoFilter."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CalcFont.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("CalcFont."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestIntersection.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("TestIntersection."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestUnion.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("TestUnion."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("range-4.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("range-4."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-3.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("Ranges-3."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("TestCalc_Rangetest."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest2.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("TestCalc_Rangetest2."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
 #if FIXRANGEADDRESSING
 //ScVbaRange::getRangeForName()/getScRangeListForAddress() seems to get confused
 //about the addressing mode of the document vs the addressing mode of a named
 //range ( need to fix that )
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-2.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("Ranges-2."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
 #endif
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pagesetup.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("pagesetup."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Window.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("Window."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("window2.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("window2."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageBreaks.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("PageBreaks."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shapes.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("Shapes."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
 #if VBA_TEST_WORKING
         {
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges.")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+            rtl::OUString("Ranges."),
+            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
 #endif
     };
diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx
index 174debde8160..d404d335c97c 100644
--- a/sc/qa/extras/regression-test.cxx
+++ b/sc/qa/extras/regression-test.cxx
@@ -164,8 +164,7 @@ void ScChartRegressionTest::setUp()
     // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure,
     // which is a private symbol to us, gets called
     m_xCalcComponent =
-        getMultiServiceFactory()->createInstance(rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument")));
+        getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Calc.SpreadsheetDocument"));
     CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
     mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
 }
diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index fdbd7486eef6..d5971c0033a2 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -98,7 +98,7 @@ uno::Reference< uno::XInterface > ScAnnontationObj::init()
 
     // get the test file
     rtl::OUString aFileURL;
-    createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAnnotationObj.ods")), aFileURL);
+    createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL);
     CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is());
diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx
index 2c3694aa520a..62d662672352 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -87,7 +87,7 @@ uno::Reference< uno::XInterface > ScAnnontationsObj::init()
 {
     // get the test file
     rtl::OUString aFileURL;
-    createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAnnotationObj.ods")), aFileURL);
+    createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL);
     CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is());
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 97366dec287f..a65a04878b9a 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -80,8 +80,8 @@ uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent;
 
 ScCellRangeObj::ScCellRangeObj():
         UnoApiTest("/sc/qa/extras/testdocuments"),
-        apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), 1),
-        apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("35")))
+        apitest::XSearchable(rtl::OUString("15"), 1),
+        apitest::XReplaceable(rtl::OUString("15"), rtl::OUString("35"))
 {
 }
 
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx
index c122e4fac742..a54716720883 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -80,7 +80,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString&
 
     uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW);
     uno::Reference< beans::XPropertySet > xPropSet(xDoc, UNO_QUERY_THROW);
-    uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges"))), UNO_QUERY_THROW);
+    uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(rtl::OUString("DatabaseRanges")), UNO_QUERY_THROW);
     uno::Reference< sheet::XDatabaseRange > xDBRange( xNameAccess->getByName(rDBName), UNO_QUERY_THROW);
     CPPUNIT_ASSERT(xDBRange.is());
     return xDBRange;
diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx
index ccc7417638da..c52952eeff4f 100644
--- a/sc/qa/extras/scdatapilotfieldobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldobj.cxx
@@ -76,7 +76,7 @@ ScDataPilotFieldObj::ScDataPilotFieldObj()
 uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
 {
     rtl::OUString aFileURL;
-    createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("scdatapilotfieldobj.ods")), aFileURL);
+    createFileURL(rtl::OUString("scdatapilotfieldobj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     CPPUNIT_ASSERT(mxComponent.is());
@@ -92,7 +92,7 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
     CPPUNIT_ASSERT(xDPT.is());
     uno::Sequence<rtl::OUString> aElementNames = xDPT->getElementNames();
 
-    uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilot1"))),UNO_QUERY_THROW);
+    uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString("DataPilot1")),UNO_QUERY_THROW);
     CPPUNIT_ASSERT(xDPDsc.is());
     uno::Reference< container::XIndexAccess > xIA( xDPDsc->getDataPilotFields(), UNO_QUERY_THROW);
     uno::Reference< uno::XInterface > xReturnValue( xIA->getByIndex(0), UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx
index 1e9f2a873bad..05a7572d411c 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -84,7 +84,7 @@ uno::Reference< lang::XComponent > ScDataPilotTableObj::mxComponent;
 
 ScDataPilotTableObj::ScDataPilotTableObj()
     : UnoApiTest("/sc/qa/extras/testdocuments"),
-      apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable")))
+      apitest::XNamed(rtl::OUString("DataPilotTable"))
 {
 }
 
@@ -112,7 +112,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::init()
     uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables();
     CPPUNIT_ASSERT(xDPT.is());
 
-    uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable"))),UNO_QUERY_THROW);
+    uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable")),UNO_QUERY_THROW);
 
     CPPUNIT_ASSERT(xDPTable.is());
     return xDPTable;
@@ -128,7 +128,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::getSheets()
 uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2()
 {
     rtl::OUString aFileURL;
-    createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScDataPilotTableObj.ods")), aFileURL);
+    createFileURL(rtl::OUString("ScDataPilotTableObj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     CPPUNIT_ASSERT(mxComponent.is());
@@ -149,7 +149,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2()
     uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables();
     CPPUNIT_ASSERT(xDPT.is());
 
-    uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable2"))),UNO_QUERY_THROW);
+    uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable2")),UNO_QUERY_THROW);
 
     CPPUNIT_ASSERT(xDPTable.is());
     return xDPTable;
diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx
index 167e3b290045..13384e83bd39 100644
--- a/sc/qa/extras/scmodelobj.cxx
+++ b/sc/qa/extras/scmodelobj.cxx
@@ -44,7 +44,7 @@ uno::Reference< lang::XComponent > ScModelObj::mxComponent;
 uno::Reference< uno::XInterface > ScModelObj::init()
 {
     rtl::OUString aFileURL;
-    createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScModelObj.ods")), aFileURL);
+    createFileURL(rtl::OUString("ScModelObj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     CPPUNIT_ASSERT(mxComponent.is());
diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx
index 95e2b0f75e25..8403c051b076 100644
--- a/sc/qa/extras/scnamedrangeobj.cxx
+++ b/sc/qa/extras/scnamedrangeobj.cxx
@@ -74,7 +74,7 @@ uno::Reference< lang::XComponent > ScNamedRangeObj::mxComponent;
 
 ScNamedRangeObj::ScNamedRangeObj():
         UnoApiTest("/sc/qa/extras/testdocuments"),
-        apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedRange"))),
+        apitest::XNamed(rtl::OUString("NamedRange")),
         apitest::XCellRangeReferrer(table::CellRangeAddress(0,1,7,1,7))
 {
 }
@@ -82,7 +82,7 @@ ScNamedRangeObj::ScNamedRangeObj():
 uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl()
 {
     rtl::OUString aFileURL;
-    createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScNamedRangeObj.ods")), aFileURL);
+    createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     CPPUNIT_ASSERT(mxComponent.is());
@@ -106,7 +106,7 @@ uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const rtl::OU
 
 uno::Reference< uno::XInterface > ScNamedRangeObj::init()
 {
-    return getNamedRange(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedRange")));
+    return getNamedRange(rtl::OUString("NamedRange"));
 }
 
 void ScNamedRangeObj::setUp()
diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx
index d921932c0900..b52962d85115 100644
--- a/sc/qa/extras/scnamedrangesobj.cxx
+++ b/sc/qa/extras/scnamedrangesobj.cxx
@@ -70,7 +70,7 @@ ScNamedRangesObj::ScNamedRangesObj()
 uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet)
 {
     rtl::OUString aFileURL;
-    createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScNamedRangeObj.ods")), aFileURL);
+    createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     CPPUNIT_ASSERT(mxComponent.is());
diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx
index f55178bd1e09..4e7f1540c528 100644
--- a/sc/qa/extras/scoutlineobj.cxx
+++ b/sc/qa/extras/scoutlineobj.cxx
@@ -73,7 +73,7 @@ uno::Reference< uno::XInterface > ScOutlineObj::init()
 {
     // get the test file
     rtl::OUString aFileURL;
-    createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScOutlineObj.ods")), aFileURL);
+    createFileURL(rtl::OUString("ScOutlineObj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL);
     CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is());
diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx
index e10df62997d6..f41d2ac3d83e 100644
--- a/sc/qa/extras/sctablesheetobj.cxx
+++ b/sc/qa/extras/sctablesheetobj.cxx
@@ -65,8 +65,8 @@ uno::Reference< lang::XComponent > ScTableSheetObj::mxComponent;
 
 ScTableSheetObj::ScTableSheetObj():
     UnoApiTest("/sc/qa/extras/testdocuments"),
-    apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")), 4),
-    apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("searchReplaceString")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("replaceReplaceString")))
+    apitest::XSearchable(rtl::OUString("test"), 4),
+    apitest::XReplaceable(rtl::OUString("searchReplaceString"), rtl::OUString("replaceReplaceString"))
 {
 }
 
@@ -74,7 +74,7 @@ ScTableSheetObj::ScTableSheetObj():
 uno::Reference< uno::XInterface > ScTableSheetObj::init()
 {
     rtl::OUString aFileURL;
-    createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScTableSheetObj.ods")), aFileURL);
+    createFileURL(rtl::OUString("ScTableSheetObj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     CPPUNIT_ASSERT(mxComponent.is());
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index a1e97d5a73e8..cfc771c7b0a9 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -75,7 +75,7 @@ sal_Int32 ScTableSheetsObj::nTest = 0;
 
 ScTableSheetsObj::ScTableSheetsObj():
             UnoApiTest("/sc/qa/extras/testdocuments"),
-            apitest::XNameContainer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sheet2")))
+            apitest::XNameContainer(rtl::OUString("Sheet2"))
 {
 
 }
@@ -98,7 +98,7 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const rtl::
 uno::Reference< uno::XInterface > ScTableSheetsObj::init()
 {
     rtl::OUString aFileURL;
-    createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rangenamessrc.ods")), aFileURL);
+    createFileURL(rtl::OUString("rangenamessrc.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL);
     CPPUNIT_ASSERT(mxComponent.is());