test: clean up namespacing

Change-Id: I7df07176bdbd15fdfdf8f9a7cdb26d4bee12997d

29 files changed, 59 insertions, 29 deletions

diff --git a/test/source/container/xelementaccess.cxx b/test/source/container/xelementaccess.cxx
index e955d082e4c2..c1281feaa796 100644
--- a/test/source/container/xelementaccess.cxx
+++ b/test/source/container/xelementaccess.cxx
@@ -11,7 +11,8 @@
 #include <com/sun/star/container/XElementAccess.hpp>
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/container/xindexaccess.cxx b/test/source/container/xindexaccess.cxx
index 47dd19fb3d43..773366ab5ee2 100644
--- a/test/source/container/xindexaccess.cxx
+++ b/test/source/container/xindexaccess.cxx
@@ -11,7 +11,8 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/container/xnamecontainer.cxx b/test/source/container/xnamecontainer.cxx
index 9afa09a22727..98fdf85c6857 100644
--- a/test/source/container/xnamecontainer.cxx
+++ b/test/source/container/xnamecontainer.cxx
@@ -14,7 +14,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include <iostream>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx
index 74ebaad4dd21..6b28bf4d3af6 100644
--- a/test/source/container/xnamed.cxx
+++ b/test/source/container/xnamed.cxx
@@ -11,7 +11,8 @@
 #include <test/container/xnamed.hxx>
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/container/xnamereplace.cxx b/test/source/container/xnamereplace.cxx
index 505e42bbe570..8af5e7cce45c 100644
--- a/test/source/container/xnamereplace.cxx
+++ b/test/source/container/xnamereplace.cxx
@@ -11,7 +11,8 @@
 #include <com/sun/star/container/XNameReplace.hpp>
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/cellproperties.cxx b/test/source/sheet/cellproperties.cxx
index 069466fb8fae..c5a52367f34b 100644
--- a/test/source/sheet/cellproperties.cxx
+++ b/test/source/sheet/cellproperties.cxx
@@ -15,7 +15,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include <iostream>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx
index fe7cb1a174c7..8a3399c145ad 100644
--- a/test/source/sheet/datapilotfield.cxx
+++ b/test/source/sheet/datapilotfield.cxx
@@ -26,7 +26,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include <iostream>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xcellrangedata.cxx b/test/source/sheet/xcellrangedata.cxx
index 01be27075fd1..f297af531196 100644
--- a/test/source/sheet/xcellrangedata.cxx
+++ b/test/source/sheet/xcellrangedata.cxx
@@ -12,7 +12,8 @@
 
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xcellrangereferrer.cxx b/test/source/sheet/xcellrangereferrer.cxx
index 531d11890c2b..6b4f52442971 100644
--- a/test/source/sheet/xcellrangereferrer.cxx
+++ b/test/source/sheet/xcellrangereferrer.cxx
@@ -13,7 +13,8 @@
 #include <com/sun/star/sheet/XCellRangeReferrer.hpp>
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx
index 6a572c30d214..21487efcd7e0 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -27,7 +27,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include <iostream>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xdatapilotdescriptor.cxx b/test/source/sheet/xdatapilotdescriptor.cxx
index 4e316eb2f72d..1e2c67ac167c 100644
--- a/test/source/sheet/xdatapilotdescriptor.cxx
+++ b/test/source/sheet/xdatapilotdescriptor.cxx
@@ -18,7 +18,8 @@
 
 #include <rtl/ustring.hxx>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xdatapilotfieldgrouping.cxx b/test/source/sheet/xdatapilotfieldgrouping.cxx
index cdbd080ec63a..fdfdfd5655c2 100644
--- a/test/source/sheet/xdatapilotfieldgrouping.cxx
+++ b/test/source/sheet/xdatapilotfieldgrouping.cxx
@@ -14,7 +14,8 @@
 
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xdatapilottable.cxx b/test/source/sheet/xdatapilottable.cxx
index 72d9734037ff..cef1550dc9d1 100644
--- a/test/source/sheet/xdatapilottable.cxx
+++ b/test/source/sheet/xdatapilottable.cxx
@@ -20,7 +20,8 @@
 
 #include <rtl/ustring.hxx>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest
 {
diff --git a/test/source/sheet/xdatapilottable2.cxx b/test/source/sheet/xdatapilottable2.cxx
index 42a5911eed7a..ce78ccc82b3e 100644
--- a/test/source/sheet/xdatapilottable2.cxx
+++ b/test/source/sheet/xdatapilottable2.cxx
@@ -23,7 +23,8 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xgoalseek.cxx b/test/source/sheet/xgoalseek.cxx
index 6bdcfbbc5c84..745614ea2aee 100644
--- a/test/source/sheet/xgoalseek.cxx
+++ b/test/source/sheet/xgoalseek.cxx
@@ -14,7 +14,8 @@
 
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx
index 0f431dd736da..c0a837fc1420 100644
--- a/test/source/sheet/xnamedrange.cxx
+++ b/test/source/sheet/xnamedrange.cxx
@@ -47,7 +47,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include <rtl/ustring.hxx>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx
index cf91ef5647a6..015ad5cc7132 100644
--- a/test/source/sheet/xnamedranges.cxx
+++ b/test/source/sheet/xnamedranges.cxx
@@ -49,7 +49,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include <iostream>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xprintareas.cxx b/test/source/sheet/xprintareas.cxx
index 6a993095b44c..094e5419ddbc 100644
--- a/test/source/sheet/xprintareas.cxx
+++ b/test/source/sheet/xprintareas.cxx
@@ -32,7 +32,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include <rtl/ustring.hxx>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx
index 1475798558fd..42f8b53c781a 100644
--- a/test/source/sheet/xsheetannotation.cxx
+++ b/test/source/sheet/xsheetannotation.cxx
@@ -33,7 +33,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include <rtl/ustring.hxx>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xsheetannotations.cxx b/test/source/sheet/xsheetannotations.cxx
index 637e88838220..b41bd06d324b 100644
--- a/test/source/sheet/xsheetannotations.cxx
+++ b/test/source/sheet/xsheetannotations.cxx
@@ -36,7 +36,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include <rtl/ustring.hxx>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xsheetoutline.cxx b/test/source/sheet/xsheetoutline.cxx
index c902e65d1fc5..11d1acc4eb63 100644
--- a/test/source/sheet/xsheetoutline.cxx
+++ b/test/source/sheet/xsheetoutline.cxx
@@ -41,7 +41,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include <rtl/ustring.hxx>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xspreadsheetdocument.cxx b/test/source/sheet/xspreadsheetdocument.cxx
index f6e0ca6922d2..31477643cf31 100644
--- a/test/source/sheet/xspreadsheetdocument.cxx
+++ b/test/source/sheet/xspreadsheetdocument.cxx
@@ -13,7 +13,8 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx
index b4d734072119..13f25bdb8871 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -53,7 +53,8 @@
 #include <rtl/ustring.hxx>
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/text/xtext.cxx b/test/source/text/xtext.cxx
index 4648eccdf40c..1ca6012f417a 100644
--- a/test/source/text/xtext.cxx
+++ b/test/source/text/xtext.cxx
@@ -12,7 +12,8 @@
 
 #include "test/text/xtext.hxx"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/text/xtextcontent.cxx b/test/source/text/xtextcontent.cxx
index 3c8488c50a92..6f6b00ff87c1 100644
--- a/test/source/text/xtextcontent.cxx
+++ b/test/source/text/xtextcontent.cxx
@@ -13,7 +13,8 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/text/xtextfield.cxx b/test/source/text/xtextfield.cxx
index c799a624356b..4261d17c617f 100644
--- a/test/source/text/xtextfield.cxx
+++ b/test/source/text/xtextfield.cxx
@@ -7,12 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-
 #include "test/text/xtextfield.hxx"
 #include <com/sun/star/text/XTextField.hpp>
 #include "cppunit/extensions/HelperMacros.h"
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest
 {
diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx
index ac4eab6c4e12..caa3552dd221 100644
--- a/test/source/unoapi_test.cxx
+++ b/test/source/unoapi_test.cxx
@@ -13,6 +13,9 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <comphelper/processfactory.hxx>
 
+using namespace css;
+using namespace css::uno;
+
 UnoApiTest::UnoApiTest(const OUString& path)
       : m_aBaseString(path)
 {
diff --git a/test/source/util/xreplaceable.cxx b/test/source/util/xreplaceable.cxx
index 553d38c6d41a..42a31102a649 100644
--- a/test/source/util/xreplaceable.cxx
+++ b/test/source/util/xreplaceable.cxx
@@ -16,7 +16,8 @@
 
 #include <iostream>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {
 
diff --git a/test/source/util/xsearchable.cxx b/test/source/util/xsearchable.cxx
index 9117e7e204ca..91006e18118a 100644
--- a/test/source/util/xsearchable.cxx
+++ b/test/source/util/xsearchable.cxx
@@ -14,7 +14,8 @@
 
 #include <test/util/xsearchable.hxx>
 
-using namespace com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
 
 namespace apitest {