summaryrefslogtreecommitdiff
path: root/ure
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-04-02 09:01:37 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-04-02 09:01:37 +0200
commita808497dbb9e9022bf04c984be19176f99fa3683 (patch)
tree05c57dc31b9c824dacbccd689ef52654fc6b42da /ure
parent83810a61bab4fe079de3539dc3489b008e776eaf (diff)
drop prefix from ::css
as css is already ::com::sun::star Change-Id: I86b43843e4b74f990b6e05dee37184a002072d12
Diffstat (limited to 'ure')
-rw-r--r--ure/source/uretest/cppmain.cc48
-rw-r--r--ure/source/uretest/cppserver.cc16
2 files changed, 32 insertions, 32 deletions
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index 86ca2b5fdb95..b9acbef9c259 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -55,15 +55,15 @@
namespace {
-class Service: public ::cppu::WeakImplHelper1< ::css::lang::XMain > {
+class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > {
public:
explicit Service(
- ::css::uno::Reference< ::css::uno::XComponentContext > const & context):
+ css::uno::Reference< css::uno::XComponentContext > const & context):
context_(context) {}
virtual ::sal_Int32 SAL_CALL run(
- ::css::uno::Sequence< ::rtl::OUString > const &)
- throw (::css::uno::RuntimeException);
+ css::uno::Sequence< ::rtl::OUString > const &)
+ throw (css::uno::RuntimeException);
private:
Service(Service &); // not defined
@@ -72,14 +72,14 @@ private:
virtual ~Service() {}
void test(
- ::css::uno::Reference< test::types::XTest > const & test,
+ css::uno::Reference< test::types::XTest > const & test,
::rtl::OUString const & name);
- ::css::uno::Reference< ::css::uno::XComponentContext > context_;
+ css::uno::Reference< css::uno::XComponentContext > context_;
};
-::sal_Int32 Service::run(::css::uno::Sequence< ::rtl::OUString > const &)
- throw (::css::uno::RuntimeException)
+::sal_Int32 Service::run(css::uno::Sequence< ::rtl::OUString > const &)
+ throw (css::uno::RuntimeException)
{
osl_getThreadIdentifier(0); // check for sal
(new salhelper::SimpleReferenceObject)->release(); // check for salhelper
@@ -129,19 +129,19 @@ private:
};
for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) {
::rtl::OUString name(::rtl::OUString::createFromAscii(services[i]));
- ::css::uno::Reference< ::css::uno::XInterface > instance;
+ css::uno::Reference< css::uno::XInterface > instance;
try {
instance = context_->getServiceManager()->createInstanceWithContext(
name, context_);
- } catch (::css::uno::RuntimeException &) {
+ } catch (css::uno::RuntimeException &) {
throw;
- } catch (::css::uno::Exception &) {
- throw ::css::uno::RuntimeException(
+ } catch (css::uno::Exception &) {
+ throw css::uno::RuntimeException(
::rtl::OUString("error creating instance"),
static_cast< ::cppu::OWeakObject * >(this));
}
if (!instance.is()) {
- throw ::css::uno::RuntimeException(
+ throw css::uno::RuntimeException(
"no instance: " + name,
static_cast< ::cppu::OWeakObject * >(this));
}
@@ -153,9 +153,9 @@ private:
::rtl::OUStringBuffer b;
b.append("/singletons/");
b.append(singletons[i]);
- ::css::uno::Reference< ::css::uno::XInterface > instance(
+ css::uno::Reference< css::uno::XInterface > instance(
context_->getValueByName(b.makeStringAndClear()),
- ::css::uno::UNO_QUERY_THROW);
+ css::uno::UNO_QUERY_THROW);
}
test(
::test::types::CppTest::create(context_),
@@ -167,7 +167,7 @@ private:
}
void Service::test(
- ::css::uno::Reference< test::types::XTest > const & test,
+ css::uno::Reference< test::types::XTest > const & test,
::rtl::OUString const & name)
{
bool ok = false;
@@ -177,7 +177,7 @@ void Service::test(
ok = true;
}
if (!ok) {
- throw ::css::uno::RuntimeException(
+ throw css::uno::RuntimeException(
(name
+ ::rtl::OUString(".throwException failed")),
static_cast< ::cppu::OWeakObject * >(this));
@@ -186,16 +186,16 @@ void Service::test(
namespace CppMain {
-::css::uno::Reference< ::css::uno::XInterface > create(
- ::css::uno::Reference< ::css::uno::XComponentContext > const & context)
- SAL_THROW((::css::uno::Exception))
+css::uno::Reference< css::uno::XInterface > create(
+ css::uno::Reference< css::uno::XComponentContext > const & context)
+ SAL_THROW((css::uno::Exception))
{
try {
return static_cast< ::cppu::OWeakObject * >(new Service(context));
} catch (::std::bad_alloc &) {
- throw ::css::uno::RuntimeException(
+ throw css::uno::RuntimeException(
::rtl::OUString("std::bad_alloc"),
- ::css::uno::Reference< ::css::uno::XInterface >());
+ css::uno::Reference< css::uno::XInterface >());
}
}
@@ -203,8 +203,8 @@ OUString getImplementationName() {
return OUString("test.cpp.cppmain.Component");
}
-::css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() {
- return ::css::uno::Sequence< ::rtl::OUString >();
+css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() {
+ return css::uno::Sequence< ::rtl::OUString >();
}
}
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index 0b5e98b1cfe1..55e094a47652 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -46,7 +46,7 @@ public:
Service() {}
virtual ::test::types::Data SAL_CALL getData()
- throw (::css::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
return ::test::types::Data(OUString("Hello"), 42);
}
@@ -60,16 +60,16 @@ private:
namespace CppServer {
-::css::uno::Reference< ::css::uno::XInterface > create(
- ::css::uno::Reference< ::css::uno::XComponentContext > const &)
- SAL_THROW((::css::uno::Exception))
+css::uno::Reference< css::uno::XInterface > create(
+ css::uno::Reference< css::uno::XComponentContext > const &)
+ SAL_THROW((css::uno::Exception))
{
try {
return static_cast< ::cppu::OWeakObject * >(new Service);
} catch (::std::bad_alloc &) {
- throw ::css::uno::RuntimeException(
+ throw css::uno::RuntimeException(
OUString("std::bad_alloc"),
- ::css::uno::Reference< ::css::uno::XInterface >());
+ css::uno::Reference< css::uno::XInterface >());
}
}
@@ -77,8 +77,8 @@ OUString getImplementationName() {
return OUString("test.cpp.cppserver.Component");
}
-::css::uno::Sequence< OUString > getSupportedServiceNames() {
- return ::css::uno::Sequence< OUString >();
+css::uno::Sequence< OUString > getSupportedServiceNames() {
+ return css::uno::Sequence< OUString >();
}
}