test: clean up namespacing

Change-Id: I7df07176bdbd15fdfdf8f9a7cdb26d4bee12997d

5 files changed, 8 insertions, 18 deletions

diff --git a/include/test/container/xelementaccess.hxx b/include/test/container/xelementaccess.hxx
index 71306d345df7..a776d3331376 100644
--- a/include/test/container/xelementaccess.hxx
+++ b/include/test/container/xelementaccess.hxx
@@ -10,24 +10,22 @@
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-using namespace com::sun::star;
-
 namespace apitest {
 
 class XElementAccess
 {
 public:
-    XElementAccess(uno::Type& rType): maType(rType) {}
+    XElementAccess(css::uno::Type& rType): maType(rType) {}
 
     void testGetElementType();
     void testHasElements();
 
-    virtual uno::Reference< uno::XInterface > init() = 0;
+    virtual css::uno::Reference< css::uno::XInterface > init() = 0;
 
     virtual ~XElementAccess() {}
 
 private:
-    uno::Type maType;
+    css::uno::Type maType;
 };
 
 }
diff --git a/include/test/container/xindexaccess.hxx b/include/test/container/xindexaccess.hxx
index 1962f9f6eb13..95401c1cddff 100644
--- a/include/test/container/xindexaccess.hxx
+++ b/include/test/container/xindexaccess.hxx
@@ -9,8 +9,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-using namespace com::sun::star;
-
 namespace apitest {
 
 class XIndexAccess
@@ -18,7 +16,7 @@ class XIndexAccess
 public:
     XIndexAccess(sal_Int32 nItems);
 
-    virtual uno::Reference< uno::XInterface > init() = 0;
+    virtual css::uno::Reference< css::uno::XInterface > init() = 0;
     void testGetCount();
     void testGetByIndex();
     // will throw an exception and should fail if not
diff --git a/include/test/container/xnamecontainer.hxx b/include/test/container/xnamecontainer.hxx
index c231daecc0c9..7a253df829fc 100644
--- a/include/test/container/xnamecontainer.hxx
+++ b/include/test/container/xnamecontainer.hxx
@@ -11,8 +11,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <test/testdllapi.hxx>
 
-using namespace com::sun::star;
-
 namespace apitest {
 
 class OOO_DLLPUBLIC_TEST XNameContainer
@@ -23,7 +21,7 @@ public:
     // removes given entry
     XNameContainer(const OUString& rName);
 
-    virtual uno::Reference< uno::XInterface > init() = 0;
+    virtual css::uno::Reference< css::uno::XInterface > init() = 0;
 
     void testRemoveByName();
 
diff --git a/include/test/container/xnamed.hxx b/include/test/container/xnamed.hxx
index acb367ead4a8..f57457666d91 100644
--- a/include/test/container/xnamed.hxx
+++ b/include/test/container/xnamed.hxx
@@ -11,8 +11,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <test/testdllapi.hxx>
 
-using namespace com::sun::star;
-
 namespace apitest {
 
 class OOO_DLLPUBLIC_TEST XNamed
@@ -24,7 +22,7 @@ public:
     void testGetName();
     void testSetName();
 
-    virtual uno::Reference< uno::XInterface > init() = 0;
+    virtual css::uno::Reference< css::uno::XInterface > init() = 0;
 private:
     OUString maName;
 
diff --git a/include/test/container/xnamereplace.hxx b/include/test/container/xnamereplace.hxx
index 6b616cdec1a8..d9b039f4e6db 100644
--- a/include/test/container/xnamereplace.hxx
+++ b/include/test/container/xnamereplace.hxx
@@ -12,8 +12,6 @@
 #include <test/testdllapi.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
-using namespace com::sun::star;
-
 namespace apitest {
 
 class OOO_DLLPUBLIC_TEST XNameReplace
@@ -21,11 +19,11 @@ class OOO_DLLPUBLIC_TEST XNameReplace
 public:
     XNameReplace(const OUString& rName): maName(rName) {}
 
-    virtual uno::Reference< uno::XInterface > init() = 0;
+    virtual css::uno::Reference< css::uno::XInterface > init() = 0;
 
     void testReplaceByName();
 
-    virtual uno::Any getAnyElementForNameReplace() = 0;
+    virtual css::uno::Any getAnyElementForNameReplace() = 0;
 
     virtual ~XNameReplace() {}