12 files changed, 32 insertions, 32 deletions
diff --git a/test/inc/test/beans/xpropertyset.hxx b/test/inc/test/beans/xpropertyset.hxx
index 03839ea91073..d309c7d02bf7 100644
--- a/test/inc/test/beans/xpropertyset.hxx
+++ b/test/inc/test/beans/xpropertyset.hxx
@@ -57,19 +57,19 @@ public:
     void testRemoveVetoableChangeListener();
 
 protected:
-    virtual bool isPropertyValueChangeable(const rtl::OUString& rName);
+    virtual bool isPropertyValueChangeable(const OUString& rName);
 
 private:
     void fillPropsToTest(const uno::Reference<beans::XPropertySetInfo>& xPropInfo);
     static bool getSinglePropertyValue(
-        const uno::Reference<beans::XPropertySet>& xPropSet, const rtl::OUString& rName);
+        const uno::Reference<beans::XPropertySet>& xPropSet, const OUString& rName);
 
     struct OOO_DLLPUBLIC_TEST PropsToTest
     {
-        std::vector<rtl::OUString> constrained;
-        std::vector<rtl::OUString> bound;
-        std::vector<rtl::OUString> normal;
-        std::vector<rtl::OUString> readonly;
+        std::vector<OUString> constrained;
+        std::vector<OUString> bound;
+        std::vector<OUString> normal;
+        std::vector<OUString> readonly;
 
         bool initialized;
 
diff --git a/test/inc/test/container/xnamecontainer.hxx b/test/inc/test/container/xnamecontainer.hxx
index 152edca8fa5a..f8261f99d649 100644
--- a/test/inc/test/container/xnamecontainer.hxx
+++ b/test/inc/test/container/xnamecontainer.hxx
@@ -40,7 +40,7 @@ public:
     // removes default entry
     XNameContainer();
     // removes given entry
-    XNameContainer(const rtl::OUString& rName);
+    XNameContainer(const OUString& rName);
 
     virtual uno::Reference< uno::XInterface > init() = 0;
 
@@ -49,7 +49,7 @@ public:
     virtual ~XNameContainer() {}
 
 private:
-    rtl::OUString maNameToRemove;
+    OUString maNameToRemove;
 };
 
 }
diff --git a/test/inc/test/container/xnamed.hxx b/test/inc/test/container/xnamed.hxx
index d878c311696c..db9609441a00 100644
--- a/test/inc/test/container/xnamed.hxx
+++ b/test/inc/test/container/xnamed.hxx
@@ -37,7 +37,7 @@ namespace apitest {
 class OOO_DLLPUBLIC_TEST XNamed
 {
 public:
-    XNamed(const rtl::OUString& rName): maName(rName) {}
+    XNamed(const OUString& rName): maName(rName) {}
     virtual ~XNamed();
 
     void testGetName();
@@ -45,7 +45,7 @@ public:
 
     virtual uno::Reference< uno::XInterface > init() = 0;
 private:
-    rtl::OUString maName;
+    OUString maName;
 
 };
 
diff --git a/test/inc/test/container/xnamereplace.hxx b/test/inc/test/container/xnamereplace.hxx
index 71000c718df3..46f43d25830f 100644
--- a/test/inc/test/container/xnamereplace.hxx
+++ b/test/inc/test/container/xnamereplace.hxx
@@ -38,7 +38,7 @@ namespace apitest {
 class OOO_DLLPUBLIC_TEST XNameReplace
 {
 public:
-    XNameReplace(const rtl::OUString& rName): maName(rName) {}
+    XNameReplace(const OUString& rName): maName(rName) {}
 
     virtual uno::Reference< uno::XInterface > init() = 0;
 
@@ -49,7 +49,7 @@ public:
     virtual ~XNameReplace() {}
 
 private:
-    rtl::OUString maName;
+    OUString maName;
 
 };
 
diff --git a/test/inc/test/sheet/xdatabaserange.hxx b/test/inc/test/sheet/xdatabaserange.hxx
index 0c3263821619..9bb70ea19e49 100644
--- a/test/inc/test/sheet/xdatabaserange.hxx
+++ b/test/inc/test/sheet/xdatabaserange.hxx
@@ -38,7 +38,7 @@ namespace apitest {
 class OOO_DLLPUBLIC_TEST XDatabaseRange
 {
 public:
-    virtual uno::Reference< uno::XInterface > init(const rtl::OUString& rDBName) = 0;
+    virtual uno::Reference< uno::XInterface > init(const OUString& rDBName) = 0;
 
     void testDataArea();
     void testGetSortDescriptor();
diff --git a/test/inc/test/sheet/xdatapilotdescriptor.hxx b/test/inc/test/sheet/xdatapilotdescriptor.hxx
index 16b4e735683e..b84ec1327974 100644
--- a/test/inc/test/sheet/xdatapilotdescriptor.hxx
+++ b/test/inc/test/sheet/xdatapilotdescriptor.hxx
@@ -61,7 +61,7 @@ private:
     void testGetDataPilotFields_Impl( uno::Reference< sheet::XDataPilotDescriptor > xDescr );
 
     void checkName( uno::Reference< container::XIndexAccess > xIndex, sal_Int32 nIndex );
-    static std::vector<rtl::OUString> maFieldNames;
+    static std::vector<OUString> maFieldNames;
 };
 
 }
diff --git a/test/inc/test/sheet/xnamedrange.hxx b/test/inc/test/sheet/xnamedrange.hxx
index b21e0c89cf4b..97a6afdf4926 100644
--- a/test/inc/test/sheet/xnamedrange.hxx
+++ b/test/inc/test/sheet/xnamedrange.hxx
@@ -49,7 +49,7 @@ public:
 protected:
     ~XNamedRange() {}
 
-    virtual uno::Reference< sheet::XNamedRange> getNamedRange(const rtl::OUString&) = 0;
+    virtual uno::Reference< sheet::XNamedRange> getNamedRange(const OUString&) = 0;
 
 };
 
diff --git a/test/inc/test/sheet/xnamedranges.hxx b/test/inc/test/sheet/xnamedranges.hxx
index b2a60120911f..d0d2eeedb66f 100644
--- a/test/inc/test/sheet/xnamedranges.hxx
+++ b/test/inc/test/sheet/xnamedranges.hxx
@@ -41,7 +41,7 @@ public:
     // remove default entry
     XNamedRanges();
     // removes given entry
-    XNamedRanges(const rtl::OUString& rNameToRemove);
+    XNamedRanges(const OUString& rNameToRemove);
 
     virtual ~XNamedRanges();
 
@@ -57,7 +57,7 @@ protected:
     uno::Reference< sheet::XSpreadsheet > xSheet;
 
 private:
-    rtl::OUString maNameToRemove;
+    OUString maNameToRemove;
 };
 
 }
diff --git a/test/inc/test/sheet/xspreadsheets2.hxx b/test/inc/test/sheet/xspreadsheets2.hxx
index dc9da86b5bed..83b9eddd15e7 100644
--- a/test/inc/test/sheet/xspreadsheets2.hxx
+++ b/test/inc/test/sheet/xspreadsheets2.hxx
@@ -59,24 +59,24 @@ public:
 
     virtual uno::Reference< lang::XComponent > getComponent() = 0;
     virtual uno::Reference< uno::XInterface > init() = 0;
-    virtual uno::Reference< lang::XComponent > loadFromDesktop(const rtl::OUString&) = 0;
-    virtual void createFileURL(const rtl::OUString&, rtl::OUString&) = 0;
+    virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString&) = 0;
+    virtual void createFileURL(const OUString&, OUString&) = 0;
 
 protected:
     uno::Reference< sheet::XSpreadsheetDocument> xDocument;
 
 private:
-    uno::Reference< sheet::XSpreadsheetDocument> getDoc(const rtl::OUString&, uno::Reference< lang::XComponent >&);
+    uno::Reference< sheet::XSpreadsheetDocument> getDoc(const OUString&, uno::Reference< lang::XComponent >&);
     uno::Reference< sheet::XNamedRanges> getNamedRanges(uno::Reference< sheet::XSpreadsheetDocument >);
     void importSheetToCopy();
-    bool isExternalReference(const rtl::OUString& aDestContent, const rtl::OUString& aSrcContent );
+    bool isExternalReference(const OUString& aDestContent, const OUString& aSrcContent );
 
     uno::Reference< sheet::XSpreadsheetDocument> xDestDoc;
     uno::Reference< sheet::XSpreadsheet > xDestSheet;
     uno::Reference< sheet::XSpreadsheet > xSrcSheet;
-    rtl::OUString aSrcSheetName;
-    rtl::OUString aSrcFileName;
-    rtl::OUString aDestFileBase;
+    OUString aSrcSheetName;
+    OUString aSrcFileName;
+    OUString aDestFileBase;
 };
 
 }
diff --git a/test/inc/test/unoapi_test.hxx b/test/inc/test/unoapi_test.hxx
index b2ebb37f88f3..78f7f81e7a7a 100644
--- a/test/inc/test/unoapi_test.hxx
+++ b/test/inc/test/unoapi_test.hxx
@@ -43,7 +43,7 @@ class OOO_DLLPUBLIC_TEST UnoApiTest : public test::BootstrapFixture, public unot
 public:
     UnoApiTest(const OUString& path);
 
-    void createFileURL(const rtl::OUString& aFileBase, rtl::OUString& rFilePath);
+    void createFileURL(const OUString& aFileBase, OUString& rFilePath);
 
     virtual void setUp();
     virtual void tearDown();
@@ -54,7 +54,7 @@ protected:
 
 private:
     uno::Reference<uno::XInterface> m_xCalcComponent;
-    rtl::OUString m_aBaseString;
+    OUString m_aBaseString;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/util/xreplaceable.hxx b/test/inc/test/util/xreplaceable.hxx
index 53dc1507678f..05babaa63dad 100644
--- a/test/inc/test/util/xreplaceable.hxx
+++ b/test/inc/test/util/xreplaceable.hxx
@@ -37,8 +37,8 @@ namespace apitest {
 class OOO_DLLPUBLIC_TEST XReplaceable
 {
 public:
-	XReplaceable( const rtl::OUString& rSearchString, const rtl::OUString& rReplaceString):
-				maSearchString(rSearchString), maReplaceString(rReplaceString) {}
+        XReplaceable( const OUString& rSearchString, const OUString& rReplaceString):
+            maSearchString(rSearchString), maReplaceString(rReplaceString) {}
 	virtual uno::Reference< uno::XInterface > init() = 0;
 
 	void testCreateReplaceDescriptor();
@@ -48,8 +48,8 @@ protected:
     ~XReplaceable() {}
 
 private:
-	rtl::OUString maSearchString;
-	rtl::OUString maReplaceString;
+        OUString maSearchString;
+        OUString maReplaceString;
 };
 
 }
diff --git a/test/inc/test/util/xsearchable.hxx b/test/inc/test/util/xsearchable.hxx
index 673ce44f9b13..c894e535e5a8 100644
--- a/test/inc/test/util/xsearchable.hxx
+++ b/test/inc/test/util/xsearchable.hxx
@@ -36,7 +36,7 @@ namespace apitest {
 class OOO_DLLPUBLIC_TEST XSearchable
 {
 public:
-    XSearchable(const rtl::OUString& rString, sal_Int32 nCount) : maSearchString(rString), mnCount(nCount) {}
+    XSearchable(const OUString& rString, sal_Int32 nCount) : maSearchString(rString), mnCount(nCount) {}
     XSearchable() : maSearchString(RTL_CONSTASCII_USTRINGPARAM("SearchString")), mnCount(1) {}
     virtual ~XSearchable();
 
@@ -47,7 +47,7 @@ public:
     virtual uno::Reference< uno::XInterface > init() = 0;
 
 private:
-    rtl::OUString maSearchString;
+    OUString maSearchString;
     sal_Int32 mnCount;
 };