summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChr. Rossmanith <ChrRossmanith@gmx.de>2013-03-07 16:51:40 +0100
committerChr. Rossmanith <ChrRossmanith@gmx.de>2013-03-10 07:52:58 +0100
commitccce843ab6aa255243485919aefb5336d2c48546 (patch)
tree1f76ac54122da0dcd64bdbee2b5c4e610019445f
parenta20d634b61c023ae4a08b4eb574d4ce4397c6e10 (diff)
Removed RTL_CONSTASCII_USTRINGPARAM in xmlhelp/ure
Change-Id: Ibaf83366e79292bbb6756045e4c82f2650958150
-rw-r--r--ure/source/uretest/cppserver.cc14
-rw-r--r--ure/source/uretest/cpptest.cc15
-rw-r--r--xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx2
3 files changed, 14 insertions, 17 deletions
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index 70dfa142bef7..0b5e98b1cfe1 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -48,8 +48,7 @@ public:
virtual ::test::types::Data SAL_CALL getData()
throw (::css::uno::RuntimeException)
{
- return ::test::types::Data(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hello")), 42);
+ return ::test::types::Data(OUString("Hello"), 42);
}
private:
@@ -69,18 +68,17 @@ namespace CppServer {
return static_cast< ::cppu::OWeakObject * >(new Service);
} catch (::std::bad_alloc &) {
throw ::css::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")),
+ OUString("std::bad_alloc"),
::css::uno::Reference< ::css::uno::XInterface >());
}
}
-::rtl::OUString getImplementationName() {
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("test.cpp.cppserver.Component"));
+OUString getImplementationName() {
+ return OUString("test.cpp.cppserver.Component");
}
-::css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() {
- return ::css::uno::Sequence< ::rtl::OUString >();
+::css::uno::Sequence< OUString > getSupportedServiceNames() {
+ return ::css::uno::Sequence< OUString >();
}
}
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index 30950ec8483e..9fe83e45daeb 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -47,7 +47,7 @@ public:
throw (test::types::TestException, css::uno::RuntimeException)
{
throw test::types::TestException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")),
+ OUString("test"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -68,19 +68,18 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Service);
} catch (std::bad_alloc &) {
throw css::uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")),
+ OUString("std::bad_alloc"),
css::uno::Reference< css::uno::XInterface >());
}
}
-rtl::OUString getImplementationName() {
- return rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("test.cpp.cpptest.Component"));
+OUString getImplementationName() {
+ return OUString("test.cpp.cpptest.Component");
}
-css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
- rtl::OUString s(RTL_CONSTASCII_USTRINGPARAM("test.types.CppTest"));
- return css::uno::Sequence< rtl::OUString >(&s, 1);
+css::uno::Sequence< OUString > getSupportedServiceNames() {
+ OUString s("test.types.CppTest");
+ return css::uno::Sequence< OUString >(&s, 1);
}
}
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
index f678a4ecf866..b07314968fd7 100644
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
@@ -103,7 +103,7 @@ namespace xmlsearch {
{
if( arrayL_ <= index_ )
throw xmlsearch::excep::XmlSearchException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ByteArrayDecompressor->getNextByte()" )) );
+ OUString( "ByteArrayDecompressor->getNextByte()" ) );
return array_[index_++] & 0xFF;
}