com::sun::star->css in testtools/

Change-Id: I9a44e44b2478b007fba7f86eefcf4fa04d77b37b
Reviewed-on: https://gerrit.libreoffice.org/19852Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

test/source/unoapi_test.cxx

@@ -25,7 +25,7 @@ void UnoApiTest::setUp()
 {
     test::BootstrapFixture::setUp();
 
-    mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
+    mxDesktop = css::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
     CPPUNIT_ASSERT_MESSAGE("no desktop!", mxDesktop.is());
 }
 

testtools/source/bridgetest/bridgetest.cxx

@@ -189,8 +189,8 @@ static void assign( TestElement & rData,
                     sal_Int64 nHyper, sal_uInt64 nUHyper,
                     float fFloat, double fDouble,
                     TestEnum eEnum, const OUString& rStr,
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
-                    const ::com::sun::star::uno::Any& rAny )
+                    const css::uno::Reference< css::uno::XInterface >& xTest,
+                    const css::uno::Any& rAny )
 {
     rData.Bool = bBool;
     rData.Char = cChar;
@@ -311,9 +311,9 @@ private:
 
 public:
     void SAL_CALL callRecursivly(
-        const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall,
+        const css::uno::Reference< XRecursiveCall >& xCall,
         sal_Int32 nToCall )
-        throw(::com::sun::star::uno::RuntimeException, std::exception) override
+        throw(css::uno::RuntimeException, std::exception) override
         {
             MutexGuard guard( m_mutex );
             if( nToCall )

testtools/source/bridgetest/constructors.cxx

@@ -212,13 +212,13 @@ private:
 
     //XMultiBase1
     virtual double SAL_CALL getatt1()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setatt1( double _att1 )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL fn11( ::sal_Int32 arg )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL fn12( const OUString& arg )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 
     double m_attr1;
@@ -411,24 +411,24 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
 
 //XMultiBase1
 double Impl2::getatt1()
-        throw (::com::sun::star::uno::RuntimeException, std::exception)
+        throw (css::uno::RuntimeException, std::exception)
 {
     return m_attr1;
 }
 
-void Impl2::setatt1( double _att1 )throw (::com::sun::star::uno::RuntimeException, std::exception)
+void Impl2::setatt1( double _att1 )throw (css::uno::RuntimeException, std::exception)
 {
     m_attr1 = _att1;
 }
 
 ::sal_Int32 Impl2::fn11( ::sal_Int32 arg )
-        throw (::com::sun::star::uno::RuntimeException, std::exception)
+        throw (css::uno::RuntimeException, std::exception)
 {
     return 11 * arg;
 }
 
 OUString Impl2::fn12( const OUString& arg )
-        throw (::com::sun::star::uno::RuntimeException, std::exception)
+        throw (css::uno::RuntimeException, std::exception)
 {
     return "12" + arg;
 }

testtools/source/bridgetest/currentcontextchecker.hxx

@@ -41,20 +41,16 @@ public:
     virtual ~CurrentContextChecker();
 
     virtual sal_Bool SAL_CALL perform(
-        ::com::sun::star::uno::Reference<
-            ::test::testtools::bridgetest::XCurrentContextChecker > const &
-            other,
+        css::uno::Reference< ::test::testtools::bridgetest::XCurrentContextChecker > const & other,
         ::sal_Int32 setSteps, ::sal_Int32 checkSteps)
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     CurrentContextChecker(CurrentContextChecker &) = delete;
     void operator =(CurrentContextChecker &) = delete;
 
     bool performCheck(
-        ::com::sun::star::uno::Reference<
-            ::test::testtools::bridgetest::XCurrentContextChecker > const &
-            other,
+        css::uno::Reference< ::test::testtools::bridgetest::XCurrentContextChecker > const & other,
         ::sal_Int32 setSteps, ::sal_Int32 checkSteps);
 };
 

testtools/source/bridgetest/multi.cxx

@@ -56,9 +56,7 @@ template< typename T > void checkEqual(T const & value, T const & argument) {
 
 namespace testtools { namespace bridgetest {
 
-OUString testMulti(
-    com::sun::star::uno::Reference< test::testtools::bridgetest::XMulti >
-    const & multi)
+OUString testMulti(  css::uno::Reference< test::testtools::bridgetest::XMulti >  const & multi )
 {
     try {
         checkEqual(

testtools/source/bridgetest/multi.hxx

@@ -37,71 +37,71 @@ public:
     Multi(): m_attribute1(0.0), m_attribute3(0.0) {}
 
     virtual double SAL_CALL getatt1()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return m_attribute1; }
 
     virtual void SAL_CALL setatt1(double value)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { m_attribute1 = value; }
 
     virtual sal_Int32 SAL_CALL fn11(sal_Int32 arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return 11 * arg; }
 
     virtual OUString SAL_CALL fn12(OUString const & arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return "12" + arg; }
 
     virtual sal_Int32 SAL_CALL fn21(sal_Int32 arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return 21 * arg; }
 
     virtual OUString SAL_CALL fn22(OUString const & arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return "22" + arg; }
 
     virtual double SAL_CALL getatt3()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return m_attribute3; }
 
     virtual void SAL_CALL setatt3(double value)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { m_attribute3 = value; }
 
     virtual sal_Int32 SAL_CALL fn31(sal_Int32 arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return 31 * arg; }
 
     virtual OUString SAL_CALL fn32(OUString const & arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return "32" + arg; }
 
     virtual sal_Int32 SAL_CALL fn33()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return 33; }
 
     virtual sal_Int32 SAL_CALL fn41(sal_Int32 arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return 41 * arg; }
 
     virtual sal_Int32 SAL_CALL fn61(sal_Int32 arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return 61 * arg; }
 
     virtual OUString SAL_CALL fn62(OUString const & arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return "62" + arg; }
 
     virtual sal_Int32 SAL_CALL fn71(sal_Int32 arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return 71 * arg; }
 
     virtual OUString SAL_CALL fn72(OUString const & arg)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return "72" + arg; }
 
     virtual sal_Int32 SAL_CALL fn73()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override
+        throw (css::uno::RuntimeException, std::exception) override
     { return 73; }
 
 private:
@@ -109,9 +109,7 @@ private:
     double m_attribute3;
 };
 
-OUString testMulti(
-    com::sun::star::uno::Reference< test::testtools::bridgetest::XMulti >
-    const & multi);
+OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMulti >  const & multi);
 
 } }