mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

19 files changed, 137 insertions, 139 deletions

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 5190e48ec484..d78809ea4b42 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -77,14 +77,14 @@ private:
 void ScMacrosTest::testStarBasic()
 {
     const OUString aFileNameBase("StarBasic.ods");
-    rtl::OUString aFileName;
+    OUString aFileName;
     createFileURL(aFileNameBase, aFileName);
     std::cout << "StarBasic test" << std::endl;
     uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
 
     CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is());
 
-    rtl::OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document");
+    OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document");
     String sUrl = aURL;
     Any aRet;
     Sequence< sal_Int16 > aOutParamIndex;
@@ -109,97 +109,97 @@ void ScMacrosTest::testVba()
 {
     TestMacroInfo testInfo[] = {
         {
-            rtl::OUString("TestAddress."),
-            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
+            OUString("TestAddress."),
+            OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString("vba."),
-            rtl::OUString("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document"),
+            OUString("vba."),
+            OUString("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document"),
         },
         {
-            rtl::OUString("MiscRangeTests."),
-            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
+            OUString("MiscRangeTests."),
+            OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
         {
-            rtl::OUString("bytearraystring."),
-            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document")
+            OUString("bytearraystring."),
+            OUString("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document")
         },
         {
-            rtl::OUString("AutoFilter."),
-            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
+            OUString("AutoFilter."),
+            OUString("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")
+            OUString("CalcFont."),
+            OUString("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")
+            OUString("TestIntersection."),
+            OUString("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")
+            OUString("TestUnion."),
+            OUString("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")
+            OUString("range-4."),
+            OUString("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")
+            OUString("Ranges-3."),
+            OUString("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")
+            OUString("TestCalc_Rangetest."),
+            OUString("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")
+            OUString("TestCalc_Rangetest2."),
+            OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
 #if defined 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("Ranges-2."),
-            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
+            OUString("Ranges-2."),
+            OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
 #endif
         {
-            rtl::OUString("pagesetup."),
-            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
+            OUString("pagesetup."),
+            OUString("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")
+            OUString("Window."),
+            OUString("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")
+            OUString("window2."),
+            OUString("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")
+            OUString("PageBreaks."),
+            OUString("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")
+            OUString("Shapes."),
+            OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
 #if defined VBA_TEST_WORKING
         {
-            rtl::OUString("Ranges."),
-            rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
+            OUString("Ranges."),
+            OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
         },
 #endif
     };
 
     for ( sal_uInt32  i=0; i<SAL_N_ELEMENTS( testInfo ); ++i )
     {
-        rtl::OUString aFileName;
+        OUString aFileName;
         createFileURL(testInfo[i].sFileBaseName + "xls", aFileName);
         uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
-        rtl::OUString sMsg( "Failed to load " + aFileName );
-        CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
+        OUString sMsg( "Failed to load " + aFileName );
+        CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
 
         String sUrl = testInfo[i].sMacroUrl;
         Any aRet;
@@ -210,12 +210,12 @@ void ScMacrosTest::testVba()
         SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent);
 
         CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
-        std::cout << "about to invoke vba test in " << rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl;
+        std::cout << "about to invoke vba test in " << OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl;
 
         pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam);
-        rtl::OUString aStringRes;
+        OUString aStringRes;
         aRet >>= aStringRes;
-        std::cout << "value of Ret " << rtl::OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl;
+        std::cout << "value of Ret " << OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl;
         CPPUNIT_ASSERT_MESSAGE( "script reported failure",aStringRes == "OK" );
         pFoundShell->DoClose();
     }
diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx
index 771f7e33296b..1114840479a9 100644
--- a/sc/qa/extras/regression-test.cxx
+++ b/sc/qa/extras/regression-test.cxx
@@ -65,14 +65,14 @@ using namespace ::com::sun::star::uno;
 
 namespace {
 
-bool checkDumpAgainstFile( const rtl::OUString& rDump, const rtl::OUString aFilePath, const rtl::OUString& rToleranceFile)
+bool checkDumpAgainstFile( const OUString& rDump, const OUString aFilePath, const OUString& rToleranceFile)
 {
-    rtl::OString aOFile = rtl::OUStringToOString(aFilePath, RTL_TEXTENCODING_UTF8);
-    rtl::OString aToleranceFile = rtl::OUStringToOString(rToleranceFile, RTL_TEXTENCODING_UTF8);
+    OString aOFile = OUStringToOString(aFilePath, RTL_TEXTENCODING_UTF8);
+    OString aToleranceFile = OUStringToOString(rToleranceFile, RTL_TEXTENCODING_UTF8);
 
     CPPUNIT_ASSERT_MESSAGE("dump is empty", !rDump.isEmpty());
 
-    rtl::OString aDump = rtl::OUStringToOString(rDump, RTL_TEXTENCODING_UTF8);
+    OString aDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8);
     return doXMLDiff(aOFile.getStr(), aDump.getStr(),
             static_cast<int>(rDump.getLength()), aToleranceFile.getStr());
 }
@@ -84,7 +84,7 @@ class ScChartRegressionTest : public test::BootstrapFixture, public unotest::Mac
 public:
     ScChartRegressionTest();
 
-    void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath);
+    void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath);
 
     virtual void setUp();
     virtual void tearDown();
@@ -97,14 +97,14 @@ public:
 
 private:
     uno::Reference<uno::XInterface> m_xCalcComponent;
-    rtl::OUString m_aBaseString;
+    OUString m_aBaseString;
 };
 
 
-void ScChartRegressionTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath)
+void ScChartRegressionTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath)
 {
-    rtl::OUString aSep("/");
-    rtl::OUStringBuffer aBuffer( getSrcRootURL() );
+    OUString aSep("/");
+    OUStringBuffer aBuffer( getSrcRootURL() );
     aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
     aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
     rFilePath = aBuffer.makeStringAndClear();
@@ -112,7 +112,7 @@ void ScChartRegressionTest::createFileURL(const rtl::OUString& aFileBase, const
 
 void ScChartRegressionTest::test()
 {
-    rtl::OUString aFileName;
+    OUString aFileName;
     createFileURL( "testChart.", "ods", aFileName);
     uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
 
@@ -146,7 +146,7 @@ void ScChartRegressionTest::test()
     uno::Reference< qa::XDumper > xDumper( xChartDoc, UNO_QUERY_THROW );
     CPPUNIT_ASSERT(xDumper.is());
 
-    rtl::OUString aDump = xDumper->dump();
+    OUString aDump = xDumper->dump();
     std::cout << aDump;
     bool bCompare = checkDumpAgainstFile( aDump, getPathFromSrc("/chart2/qa/unit/data/reference/testChart.xml"), getPathFromSrc("/chart2/qa/unit/data/tolerance.xml") );
     CPPUNIT_ASSERT(bCompare);
@@ -164,7 +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("com.sun.star.comp.Calc.SpreadsheetDocument"));
+        getMultiServiceFactory()->createInstance(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 d5971c0033a2..0f9134ffb6e1 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -97,8 +97,8 @@ uno::Reference< uno::XInterface > ScAnnontationObj::init()
 {
 
     // get the test file
-    rtl::OUString aFileURL;
-    createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL);
+    OUString aFileURL;
+    createFileURL(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 62d662672352..9e137ceb6b8e 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -86,8 +86,8 @@ uno::Reference< sheet::XSheetAnnotations> ScAnnontationsObj::getAnnotations()
 uno::Reference< uno::XInterface > ScAnnontationsObj::init()
 {
     // get the test file
-    rtl::OUString aFileURL;
-    createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL);
+    OUString aFileURL;
+    createFileURL(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 a3e925a17f12..8eb1727d0b4c 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -80,17 +80,17 @@ uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent;
 
 ScCellRangeObj::ScCellRangeObj():
         UnoApiTest("/sc/qa/extras/testdocuments"),
-        apitest::XSearchable(rtl::OUString("15"), 1),
-        apitest::XReplaceable(rtl::OUString("15"), rtl::OUString("35"))
+        apitest::XSearchable(OUString("15"), 1),
+        apitest::XReplaceable(OUString("15"), OUString("35"))
 {
 }
 
 uno::Reference< uno::XInterface > ScCellRangeObj::init()
 {
-    rtl::OUString aFileURL;
-    const rtl::OUString aFileBase("xcellrangesquery.ods");
+    OUString aFileURL;
+    const OUString aFileBase("xcellrangesquery.ods");
     createFileURL(aFileBase, aFileURL);
-    std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+    std::cout << OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
     if( !mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent, UNO_QUERY_THROW);
@@ -107,10 +107,10 @@ uno::Reference< uno::XInterface > ScCellRangeObj::init()
 
 uno::Reference< uno::XInterface > ScCellRangeObj::getXCellRangeData()
 {
-    rtl::OUString aFileURL;
-    const rtl::OUString aFileBase("xcellrangesquery.ods");
+    OUString aFileURL;
+    const OUString aFileBase("xcellrangesquery.ods");
     createFileURL(aFileBase, aFileURL);
-    std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+    std::cout << OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
     if( !mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent, UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx
index a54716720883..b769f78a2499 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -45,7 +45,7 @@ public:
     virtual void setUp();
     virtual void tearDown();
 
-    virtual uno::Reference< uno::XInterface > init( const rtl::OUString& rDBName );
+    virtual uno::Reference< uno::XInterface > init( const OUString& rDBName );
 
     ScDatabaseRangeObj();
 
@@ -70,9 +70,9 @@ ScDatabaseRangeObj::ScDatabaseRangeObj()
 {
 }
 
-uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString& rDBName )
+uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const OUString& rDBName )
 {
-    rtl::OUString aFileURL;
+    OUString aFileURL;
     createFileURL("ScDatabaseRangeObj.ods", aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
@@ -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("DatabaseRanges")), UNO_QUERY_THROW);
+    uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(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 c52952eeff4f..05b2cec35ef9 100644
--- a/sc/qa/extras/scdatapilotfieldobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldobj.cxx
@@ -75,8 +75,8 @@ ScDataPilotFieldObj::ScDataPilotFieldObj()
 
 uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
 {
-    rtl::OUString aFileURL;
-    createFileURL(rtl::OUString("scdatapilotfieldobj.ods"), aFileURL);
+    OUString aFileURL;
+    createFileURL(OUString("scdatapilotfieldobj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     CPPUNIT_ASSERT(mxComponent.is());
@@ -90,9 +90,9 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
     CPPUNIT_ASSERT(xDPTS.is());
     uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables();
     CPPUNIT_ASSERT(xDPT.is());
-    uno::Sequence<rtl::OUString> aElementNames = xDPT->getElementNames();
+    uno::Sequence<OUString> aElementNames = xDPT->getElementNames();
 
-    uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString("DataPilot1")),UNO_QUERY_THROW);
+    uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(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 05a7572d411c..05150db20b3f 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -84,13 +84,13 @@ uno::Reference< lang::XComponent > ScDataPilotTableObj::mxComponent;
 
 ScDataPilotTableObj::ScDataPilotTableObj()
     : UnoApiTest("/sc/qa/extras/testdocuments"),
-      apitest::XNamed(rtl::OUString("DataPilotTable"))
+      apitest::XNamed(OUString("DataPilotTable"))
 {
 }
 
 uno::Reference< uno::XInterface > ScDataPilotTableObj::init()
 {
-    rtl::OUString aFileURL;
+    OUString aFileURL;
     createFileURL("ScDataPilotTableObj.ods", aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
@@ -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("DataPilotTable")),UNO_QUERY_THROW);
+    uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(OUString("DataPilotTable")),UNO_QUERY_THROW);
 
     CPPUNIT_ASSERT(xDPTable.is());
     return xDPTable;
@@ -127,8 +127,8 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::getSheets()
 
 uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2()
 {
-    rtl::OUString aFileURL;
-    createFileURL(rtl::OUString("ScDataPilotTableObj.ods"), aFileURL);
+    OUString aFileURL;
+    createFileURL(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("DataPilotTable2")),UNO_QUERY_THROW);
+    uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(OUString("DataPilotTable2")),UNO_QUERY_THROW);
 
     CPPUNIT_ASSERT(xDPTable.is());
     return xDPTable;
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx
index 78d0ac1e46da..5f08e06630e6 100644
--- a/sc/qa/extras/sceditfieldobj-cell.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -115,8 +115,8 @@ uno::Reference<text::XTextField> getNewField(const uno::Reference<lang::XMultiSe
     uno::Reference<text::XTextField> xField(
         xSM->createInstance("com.sun.star.text.TextField.URL"), UNO_QUERY_THROW);
     uno::Reference<beans::XPropertySet> xPropSet(xField, UNO_QUERY_THROW);
-    xPropSet->setPropertyValue("Representation", uno::makeAny(rtl::OUString("LibreOffice")));
-    xPropSet->setPropertyValue("URL", uno::makeAny(rtl::OUString("http://www.libreoffice.org/")));
+    xPropSet->setPropertyValue("Representation", uno::makeAny(OUString("LibreOffice")));
+    xPropSet->setPropertyValue("URL", uno::makeAny(OUString("http://www.libreoffice.org/")));
     return xField;
 }
 
diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx
index 13384e83bd39..3b8faf493996 100644
--- a/sc/qa/extras/scmodelobj.cxx
+++ b/sc/qa/extras/scmodelobj.cxx
@@ -43,8 +43,8 @@ uno::Reference< lang::XComponent > ScModelObj::mxComponent;
 
 uno::Reference< uno::XInterface > ScModelObj::init()
 {
-    rtl::OUString aFileURL;
-    createFileURL(rtl::OUString("ScModelObj.ods"), aFileURL);
+    OUString aFileURL;
+    createFileURL(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 892db8e1ec64..466e91368255 100644
--- a/sc/qa/extras/scnamedrangeobj.cxx
+++ b/sc/qa/extras/scnamedrangeobj.cxx
@@ -49,7 +49,7 @@ public:
     virtual void tearDown();
 
     virtual uno::Reference< uno::XInterface > init();
-    virtual uno::Reference< sheet::XNamedRange > getNamedRange(const rtl::OUString& rRangeName);
+    virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName);
 
     CPPUNIT_TEST_SUITE(ScNamedRangeObj);
     CPPUNIT_TEST(testGetContent);
@@ -74,28 +74,28 @@ uno::Reference< lang::XComponent > ScNamedRangeObj::mxComponent;
 
 ScNamedRangeObj::ScNamedRangeObj():
         UnoApiTest("/sc/qa/extras/testdocuments"),
-        apitest::XNamed(rtl::OUString("NamedRange")),
+        apitest::XNamed(OUString("NamedRange")),
         apitest::XCellRangeReferrer(table::CellRangeAddress(0,1,7,1,7))
 {
 }
 
 uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl()
 {
-    rtl::OUString aFileURL;
-    createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL);
+    OUString aFileURL;
+    createFileURL(OUString("ScNamedRangeObj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     CPPUNIT_ASSERT(mxComponent.is());
 
     uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW);
-    rtl::OUString aNamedRangesPropertyString("NamedRanges");
+    OUString aNamedRangesPropertyString("NamedRanges");
     uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW);
     CPPUNIT_ASSERT(xNamedRanges.is());
 
     return xNamedRanges;
 }
 
-uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const rtl::OUString& rRangeName)
+uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const OUString& rRangeName)
 {
     uno::Reference< container::XNameAccess > xNamedAccess(init_impl(), UNO_QUERY_THROW);
     uno::Reference< sheet::XNamedRange > xNamedRange(xNamedAccess->getByName(rRangeName), UNO_QUERY_THROW);
@@ -106,7 +106,7 @@ uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const rtl::OU
 
 uno::Reference< uno::XInterface > ScNamedRangeObj::init()
 {
-    return getNamedRange(rtl::OUString("NamedRange"));
+    return getNamedRange(OUString("NamedRange"));
 }
 
 void ScNamedRangeObj::setUp()
diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx
index 05424366c59d..3852a77cfe2a 100644
--- a/sc/qa/extras/scnamedrangesobj.cxx
+++ b/sc/qa/extras/scnamedrangesobj.cxx
@@ -69,14 +69,14 @@ ScNamedRangesObj::ScNamedRangesObj()
 
 uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet)
 {
-    rtl::OUString aFileURL;
-    createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL);
+    OUString aFileURL;
+    createFileURL(OUString("ScNamedRangeObj.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
     CPPUNIT_ASSERT(mxComponent.is());
 
     uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW);
-    rtl::OUString aNamedRangesPropertyString("NamedRanges");
+    OUString aNamedRangesPropertyString("NamedRanges");
     uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW);
 
     //set value from xnamedranges.hxx
diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx
index 4e7f1540c528..b9c80f535ac1 100644
--- a/sc/qa/extras/scoutlineobj.cxx
+++ b/sc/qa/extras/scoutlineobj.cxx
@@ -72,8 +72,8 @@ ScOutlineObj::ScOutlineObj()
 uno::Reference< uno::XInterface > ScOutlineObj::init()
 {
     // get the test file
-    rtl::OUString aFileURL;
-    createFileURL(rtl::OUString("ScOutlineObj.ods"), aFileURL);
+    OUString aFileURL;
+    createFileURL(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 f41d2ac3d83e..3a8164f31f67 100644
--- a/sc/qa/extras/sctablesheetobj.cxx
+++ b/sc/qa/extras/sctablesheetobj.cxx
@@ -65,16 +65,16 @@ uno::Reference< lang::XComponent > ScTableSheetObj::mxComponent;
 
 ScTableSheetObj::ScTableSheetObj():
     UnoApiTest("/sc/qa/extras/testdocuments"),
-    apitest::XSearchable(rtl::OUString("test"), 4),
-    apitest::XReplaceable(rtl::OUString("searchReplaceString"), rtl::OUString("replaceReplaceString"))
+    apitest::XSearchable(OUString("test"), 4),
+    apitest::XReplaceable(OUString("searchReplaceString"), OUString("replaceReplaceString"))
 {
 }
 
 
 uno::Reference< uno::XInterface > ScTableSheetObj::init()
 {
-    rtl::OUString aFileURL;
-    createFileURL(rtl::OUString("ScTableSheetObj.ods"), aFileURL);
+    OUString aFileURL;
+    createFileURL(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 cfc771c7b0a9..4b88077eb05b 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -62,8 +62,8 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
     virtual uno::Reference< lang::XComponent > getComponent();
-    virtual void createFileURL(const rtl::OUString& rFileBase, rtl::OUString& rFileURL);
-    virtual uno::Reference< lang::XComponent > loadFromDesktop(const rtl::OUString& rString);
+    virtual void createFileURL(const OUString& rFileBase, OUString& rFileURL);
+    virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString& rString);
     virtual uno::Reference< uno::XInterface > init();
 protected:
     static uno::Reference< lang::XComponent > mxComponent;
@@ -75,7 +75,7 @@ sal_Int32 ScTableSheetsObj::nTest = 0;
 
 ScTableSheetsObj::ScTableSheetsObj():
             UnoApiTest("/sc/qa/extras/testdocuments"),
-            apitest::XNameContainer(rtl::OUString("Sheet2"))
+            apitest::XNameContainer(OUString("Sheet2"))
 {
 
 }
@@ -85,20 +85,20 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::getComponent()
     return mxComponent;
 }
 
-void ScTableSheetsObj::createFileURL(const rtl::OUString& rFileBase, rtl::OUString& rFileURL)
+void ScTableSheetsObj::createFileURL(const OUString& rFileBase, OUString& rFileURL)
 {
     UnoApiTest::createFileURL(rFileBase, rFileURL);
 }
 
-uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const rtl::OUString& rString)
+uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const OUString& rString)
 {
     return UnoApiTest::loadFromDesktop(rString);
 }
 
 uno::Reference< uno::XInterface > ScTableSheetsObj::init()
 {
-    rtl::OUString aFileURL;
-    createFileURL(rtl::OUString("rangenamessrc.ods"), aFileURL);
+    OUString aFileURL;
+    createFileURL(OUString("rangenamessrc.ods"), aFileURL);
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL);
     CPPUNIT_ASSERT(mxComponent.is());
diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx
index 41589f18310d..35d9139b6bfe 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -40,9 +40,9 @@
 
 namespace {
 
-rtl::OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab)
+OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab)
 {
-    rtl::OUString aString;
+    OUString aString;
     Color* pColor;
     ScRefCellValue aCell;
     aCell.assign(*pDoc, ScAddress(nCol, nRow, nTab));
@@ -57,9 +57,9 @@ rtl::OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRo
     return aString;
 }
 
-rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
+OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
 {
-    rtl::OStringBuffer aString("Error in Table: ");
+    OStringBuffer aString("Error in Table: ");
     aString.append(static_cast<sal_Int32>(nTab));
     aString.append(" Column: ");
     aString.append(static_cast<sal_Int32>(nCol));
@@ -68,20 +68,20 @@ rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
     return aString.makeStringAndClear();
 }
 
-rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const rtl::OUString& rExpectedString, const rtl::OUString& rString)
+OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rExpectedString, const OUString& rString)
 {
-    rtl::OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
+    OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
     aString.append("; Expected: '");
-    aString.append(rtl::OUStringToOString(rExpectedString, RTL_TEXTENCODING_UTF8));
+    aString.append(OUStringToOString(rExpectedString, RTL_TEXTENCODING_UTF8));
     aString.append("' Found: '");
-    aString.append(rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
+    aString.append(OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
     aString.append("'");
     return aString.makeStringAndClear();
 }
 
-rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, double aValue)
+OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, double aValue)
 {
-    rtl::OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
+    OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
     aString.append("; Expected: '");
     aString.append(aExpected);
     aString.append("' Found: '");
@@ -133,12 +133,12 @@ public:
         }
         else if (meStringType == PureString)
         {
-            rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
-            rtl::OUString aString = mpDoc->GetString(mnCol, mnRow, mnTab);
+            OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
+            OUString aString = mpDoc->GetString(mnCol, mnRow, mnTab);
 
 #if DEBUG_CSV_HANDLER
-                std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
-                std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+                std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+                std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
                 std::cout << "result: " << (int)(aCSVString == aString) << std::endl;
 #endif //DEBUG_CSV_HANDLER
 
@@ -151,7 +151,7 @@ public:
             double nValue = strtod(&aStr[0], &pRemainingChars);
             if (*pRemainingChars)
             {
-                rtl::OUString aString;
+                OUString aString;
                 switch (meStringType)
                 {
                     case StringValue:
@@ -163,10 +163,10 @@ public:
                     default:
                         break;
                 }
-                rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
+                OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
 #if DEBUG_CSV_HANDLER
-                std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
-                std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+                std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+                std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
                 std::cout << "result: " << (int)(aCSVString == aString) << std::endl;
 #endif //DEBUG_CSV_HANDLER
 
@@ -222,11 +222,11 @@ public:
 #if DEBUG_CSV_HANDLER
         std::cout << "Col: " << mnCol << " Row: " << mnRow << std::endl;
 #endif //DEBUG_CSV_HANDLER
-        rtl::OUString aString = getConditionalFormatString(mpDoc, mnCol, mnRow, mnTab);
-        rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
+        OUString aString = getConditionalFormatString(mpDoc, mnCol, mnRow, mnTab);
+        OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
 #if DEBUG_CSV_HANDLER
-        std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
-        std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+        std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+        std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
         std::cout << "result: " << (int)(aCSVString == aString) << std::endl;
 #endif //DEBUG_CSV_HANDLER
         CPPUNIT_ASSERT_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab, aCSVString, aString).getStr(), aString == aCSVString );
diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx
index 4de5c9d72599..e54cc43bc8c1 100644
--- a/sc/qa/unit/helper/debughelper.hxx
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -52,8 +52,6 @@
 #include <iostream>
 
 using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 using ::std::cout;
 using ::std::cerr;
 using ::std::endl;
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index b610f5883144..9558691aba86 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -154,7 +154,7 @@ protected:
             SfxItemSet* pSet = pSrcMed->GetItemSet();
             pSet->Put(SfxStringItem(SID_PASSWORD, *pPassword));
         }
-        printf("about to load %s\n", rtl::OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+        printf("about to load %s\n", OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() );
         if (!xDocShRef->DoLoad(pSrcMed))
         {
             xDocShRef->DoClose();
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6416340fdc15..2acc0f4d055f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -785,7 +785,7 @@ void testFuncNUMBERVALUE( ScDocument* pDoc )
 
     SCROW nRows = SAL_N_ELEMENTS(aData);
     for (SCROW i = 0; i < nRows; ++i)
-        pDoc->SetString(0, i, 0, rtl::OUString::createFromAscii(aData[i]));
+        pDoc->SetString(0, i, 0, OUString::createFromAscii(aData[i]));
 
     printRange(pDoc, ScRange(0, 0, 0, 0, nRows - 1, 0), "data range for NUMBERVALUE");
 
@@ -807,14 +807,14 @@ void testFuncNUMBERVALUE( ScDocument* pDoc )
     for (SCROW i = 0; i < nRows; ++i)
     {
         SCROW nRow = 20 + i;
-        pDoc->SetString(0, nRow, 0, rtl::OUString::createFromAscii(aChecks[i].pFormula));
+        pDoc->SetString(0, nRow, 0, OUString::createFromAscii(aChecks[i].pFormula));
     }
     pDoc->CalcAll();
 
     for (SCROW i = 0; i < nRows; ++i)
     {
         SCROW nRow = 20 + i;
-        rtl::OUString aResult = pDoc->GetString(0, nRow, 0);
+        OUString aResult = pDoc->GetString(0, nRow, 0);
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             aChecks[i].pFormula, OUString::createFromAscii( aChecks[i].pResult), aResult);
     }