summaryrefslogtreecommitdiff
path: root/cppuhelper/test
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-07-28 13:43:24 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-07-29 06:44:57 +0000
commit171990764eedee708ce458be2239466307b2dc6a (patch)
tree2c4821ca3b8a0ad0bbd4478c0a190b8be246c068 /cppuhelper/test
parent62e2fae93e8894f73560a30ae1e752cbd4c001ad (diff)
com::sun::star-css in cppu,cppuhelper
Change-Id: I84a412f587fd66f6c0610f083e61cf0fa079d4d9 Reviewed-on: https://gerrit.libreoffice.org/17384 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cppuhelper/test')
-rw-r--r--cppuhelper/test/cfg_test.cxx10
-rw-r--r--cppuhelper/test/testcmp/TestComponent.cxx4
-rw-r--r--cppuhelper/test/testcontainer.cxx6
-rw-r--r--cppuhelper/test/testhelper.hxx4
-rw-r--r--cppuhelper/test/testpropshlp.cxx2
-rw-r--r--cppuhelper/test/testproptyphlp.cxx4
6 files changed, 15 insertions, 15 deletions
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index 976dd3f99814..17d5d4eb9453 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -129,19 +129,19 @@ void ServiceImpl0::initialize( const Sequence< Any >& rArgs )
// XServiceInfo
OUString ServiceImpl0::getImplementationName()
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
return impl0_getImplementationName();
}
Sequence< OUString > ServiceImpl0::getSupportedServiceNames()
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
return impl0_getSupportedServiceNames();
}
sal_Bool ServiceImpl0::supportsService( const OUString & rServiceName )
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
return cppu::supportsService(this, rServiceName);
}
@@ -161,13 +161,13 @@ public:
};
OUString ServiceImpl1::getImplementationName()
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
return impl1_getImplementationName();
}
Sequence< OUString > ServiceImpl1::getSupportedServiceNames()
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
return impl1_getSupportedServiceNames();
}
diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx
index 64d2b9ff36af..f3922b70c1ed 100644
--- a/cppuhelper/test/testcmp/TestComponent.cxx
+++ b/cppuhelper/test/testcmp/TestComponent.cxx
@@ -71,7 +71,7 @@ public:
explicit TestComponent(uno::Reference<uno::XComponentContext> const & xCtx);
virtual ~TestComponent();
- uno::Any SAL_CALL queryInterface(uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException);
+ uno::Any SAL_CALL queryInterface(uno::Type const & rType ) throw (css::uno::RuntimeException);
void SAL_CALL release() throw ();
void SAL_CALL acquire() throw ();
@@ -136,7 +136,7 @@ void SAL_CALL TestComponent::release() throw ()
cppu::WeakImplHelper1<lang::XServiceInfo>::release();
}
-uno::Any SAL_CALL TestComponent::queryInterface(uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+uno::Any SAL_CALL TestComponent::queryInterface(uno::Type const & rType ) throw (css::uno::RuntimeException)
{
return cppu::WeakImplHelper1<lang::XServiceInfo>::queryInterface(rType);
}
diff --git a/cppuhelper/test/testcontainer.cxx b/cppuhelper/test/testcontainer.cxx
index a2641aacafa5..7533695640d0 100644
--- a/cppuhelper/test/testcontainer.cxx
+++ b/cppuhelper/test/testcontainer.cxx
@@ -35,13 +35,13 @@ class TestListener : public WeakImplHelper1< XVetoableChangeListener >
{
public:
// Methods
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) throw(css::uno::RuntimeException)
{
}
- virtual void SAL_CALL vetoableChange( const ::com::sun::star::beans::PropertyChangeEvent& /*aEvent*/ )
- throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ )
+ throw(css::beans::PropertyVetoException, css::uno::RuntimeException)
{
}
diff --git a/cppuhelper/test/testhelper.hxx b/cppuhelper/test/testhelper.hxx
index 313ad129b13c..dfc4a6fff21c 100644
--- a/cppuhelper/test/testhelper.hxx
+++ b/cppuhelper/test/testhelper.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_CPPUHELPER_TEST_TESTHELPER_HXX
#define INCLUDED_CPPUHELPER_TEST_TESTHELPER_HXX
-void testidlclass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &r);
+void testidlclass( const css::uno::Reference < css::lang::XMultiServiceFactory > &r);
void testPropertyTypeHelper();
void test_PropertySetHelper();
-void test_ImplHelper( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > & xSF );
+void test_ImplHelper( const css::uno::Reference < css::lang::XMultiServiceFactory > & xSF );
void test_interfacecontainer();
#endif // INCLUDED_CPPUHELPER_TEST_TESTHELPER_HXX
diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx
index 64ea895db1b2..8e98f12c57bb 100644
--- a/cppuhelper/test/testpropshlp.cxx
+++ b/cppuhelper/test/testpropshlp.cxx
@@ -353,7 +353,7 @@ public:
}
// XInterface
- Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(RuntimeException)
+ Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(RuntimeException)
{
Any aRet( OPropertySetHelper::queryInterface( rType ) );
return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
diff --git a/cppuhelper/test/testproptyphlp.cxx b/cppuhelper/test/testproptyphlp.cxx
index d52515bff05e..ad67617e7095 100644
--- a/cppuhelper/test/testproptyphlp.cxx
+++ b/cppuhelper/test/testproptyphlp.cxx
@@ -54,7 +54,7 @@ void testPropertyTypeHelper()
convertPropertyValue( f , a );
OSL_ASSERT( 25. == f );
- ::com::sun::star::beans::Property prop;
+ css::beans::Property prop;
prop.Name = rtl::OUString("Huhu");
prop.Handle = 5;
@@ -62,7 +62,7 @@ void testPropertyTypeHelper()
a <<= prop;
- ::com::sun::star::beans::Property prop2;
+ css::beans::Property prop2;
convertPropertyValue( prop2 , a );
OSL_ASSERT( prop.Handle == prop2.Handle && prop.Name == prop2.Name && prop.Attributes == prop2.Attributes );