summaryrefslogtreecommitdiff
path: root/ure/source
diff options
context:
space:
mode:
authorChr. Rossmanith <ChrRossmanith@gmx.de>2013-02-24 20:13:06 +0100
committerBjörn Michaelsen <bjoern.michaelsen@canonical.com>2013-02-24 21:16:12 +0000
commited383ebfbae4c79c870389868762767b16f444ee (patch)
treef84635927434981df9d5d6fc4b19bd2d65205daf /ure/source
parentc064fa5048b09eb50fc90cef4364986ec58bd3eb (diff)
remove RTL_CONSTASCII_(U)STRINGPARAM
Change-Id: Ica4dc859229c2ba0dc052a97ff23178895c25580 Reviewed-on: https://gerrit.libreoffice.org/2368 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Diffstat (limited to 'ure/source')
-rw-r--r--ure/source/uretest/cppmain.cc21
1 files changed, 9 insertions, 12 deletions
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index 41fc255eb7e4..86ca2b5fdb95 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -137,8 +137,7 @@ private:
throw;
} catch (::css::uno::Exception &) {
throw ::css::uno::RuntimeException(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("error creating instance")),
+ ::rtl::OUString("error creating instance"),
static_cast< ::cppu::OWeakObject * >(this));
}
if (!instance.is()) {
@@ -152,18 +151,18 @@ private:
for (::std::size_t i = 0; i < SAL_N_ELEMENTS(singletons); ++i)
{
::rtl::OUStringBuffer b;
- b.appendAscii(RTL_CONSTASCII_STRINGPARAM("/singletons/"));
- b.appendAscii(singletons[i]);
+ b.append("/singletons/");
+ b.append(singletons[i]);
::css::uno::Reference< ::css::uno::XInterface > instance(
context_->getValueByName(b.makeStringAndClear()),
::css::uno::UNO_QUERY_THROW);
}
test(
::test::types::CppTest::create(context_),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test.types.CppTest")));
+ ::rtl::OUString("test.types.CppTest"));
test(
::test::types::JavaTest::create(context_),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test.types.JavaTest")));
+ ::rtl::OUString("test.types.JavaTest"));
return 0;
}
@@ -180,8 +179,7 @@ void Service::test(
if (!ok) {
throw ::css::uno::RuntimeException(
(name
- + ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".throwException failed"))),
+ + ::rtl::OUString(".throwException failed")),
static_cast< ::cppu::OWeakObject * >(this));
}
}
@@ -196,14 +194,13 @@ namespace CppMain {
return static_cast< ::cppu::OWeakObject * >(new Service(context));
} catch (::std::bad_alloc &) {
throw ::css::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")),
+ ::rtl::OUString("std::bad_alloc"),
::css::uno::Reference< ::css::uno::XInterface >());
}
}
-::rtl::OUString getImplementationName() {
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("test.cpp.cppmain.Component"));
+OUString getImplementationName() {
+ return OUString("test.cpp.cppmain.Component");
}
::css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() {