[Libreoffice-commits] core.git: ure/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jun 29 09:53:52 UTC 2021
ure/source/uretest/cppmain.cc | 30 +++++++++++++++---------------
ure/source/uretest/cppserver.cc | 10 +++++-----
ure/source/uretest/cpptest.cc | 12 ++++++------
3 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit f52fe2eb855d1233bacb97baf192a3c07fc1822e
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jun 29 08:33:50 2021 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jun 29 11:53:19 2021 +0200
Revert bogus drop of "rtl::" prefix in external code
partially reverts 6f50961e69406a17d6ec998956a6b33208b1001b "remove more
rtl::OUString and OString prefixes"
Change-Id: Ic97a6029577533e539e99d64ba73a74e3246f03b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118048
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index 1434947030b0..fb957d9f221a 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -83,7 +83,7 @@ public:
context_(context) {}
virtual ::sal_Int32 SAL_CALL run(
- css::uno::Sequence< OUString > const &);
+ css::uno::Sequence< ::rtl::OUString > const &);
private:
Service(Service &); // not defined
@@ -93,17 +93,17 @@ private:
void test(
css::uno::Reference< test::types::XTest > const & test,
- OUString const & name);
+ ::rtl::OUString const & name);
css::uno::Reference< css::uno::XComponentContext > context_;
};
-::sal_Int32 Service::run(css::uno::Sequence< OUString > const &) {
+::sal_Int32 Service::run(css::uno::Sequence< ::rtl::OUString > const &) {
osl_getThreadIdentifier(0); // check for sal
(new salhelper::SimpleReferenceObject)->release(); // check for salhelper
css::uno::getCurrentContext(); // check for cppu
try { // check for cppuhelper
- std::auto_ptr< cppu::UnoUrl > dummy(new cppu::UnoUrl(OUString()));
+ std::auto_ptr< cppu::UnoUrl > dummy(new cppu::UnoUrl(rtl::OUString()));
} catch (rtl::MalformedUriException &) {}
static char const * const services[] = {
"com.sun.star.io.DataInputStream",
@@ -121,7 +121,7 @@ private:
"com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"
};
for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) {
- OUString name(OUString::createFromAscii(services[i]));
+ ::rtl::OUString name(::rtl::OUString::createFromAscii(services[i]));
css::uno::Reference< css::uno::XInterface > instance;
try {
instance = context_->getServiceManager()->createInstanceWithContext(
@@ -130,7 +130,7 @@ private:
throw;
} catch (css::uno::Exception &) {
throw css::uno::RuntimeException(
- OUString("error creating instance"),
+ ::rtl::OUString("error creating instance"),
static_cast< ::cppu::OWeakObject * >(this));
}
if (!instance.is()) {
@@ -168,22 +168,22 @@ private:
for (std::size_t i = 0; i != SAL_N_ELEMENTS(singletons); ++i) {
css::uno::Reference< css::uno::XInterface > instance(
context_->getValueByName(
- "/singletons/" + OUString::createFromAscii(singletons[i])),
+ "/singletons/" + rtl::OUString::createFromAscii(singletons[i])),
css::uno::UNO_QUERY_THROW);
}
css::util::theMacroExpander::get(context_);
test(
::test::types::CppTest::create(context_),
- OUString("test.types.CppTest"));
+ ::rtl::OUString("test.types.CppTest"));
test(
::test::types::JavaTest::create(context_),
- OUString("test.types.JavaTest"));
+ ::rtl::OUString("test.types.JavaTest"));
return 0;
}
void Service::test(
css::uno::Reference< test::types::XTest > const & test,
- OUString const & name)
+ ::rtl::OUString const & name)
{
bool ok = false;
try {
@@ -194,7 +194,7 @@ void Service::test(
if (!ok) {
throw css::uno::RuntimeException(
(name
- + OUString(".throwException failed")),
+ + ::rtl::OUString(".throwException failed")),
static_cast< ::cppu::OWeakObject * >(this));
}
}
@@ -207,12 +207,12 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< ::cppu::OWeakObject * >(new Service(context));
}
-OUString getImplementationName() {
- return OUString("test.cpp.cppmain.Component");
+rtl::OUString getImplementationName() {
+ return rtl::OUString("test.cpp.cppmain.Component");
}
-css::uno::Sequence< OUString > getSupportedServiceNames() {
- return css::uno::Sequence< 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 48f63e0b9284..db42c9fb3f9f 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -42,7 +42,7 @@ public:
Service() {}
virtual ::test::types::Data SAL_CALL getData() {
- return ::test::types::Data(OUString("Hello"), 42);
+ return ::test::types::Data(rtl::OUString("Hello"), 42);
}
private:
@@ -60,12 +60,12 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< ::cppu::OWeakObject * >(new Service);
}
-OUString getImplementationName() {
- return OUString("test.cpp.cppserver.Component");
+rtl::OUString getImplementationName() {
+ return rtl::OUString("test.cpp.cppserver.Component");
}
-css::uno::Sequence< OUString > getSupportedServiceNames() {
- return css::uno::Sequence< OUString >();
+css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
+ return css::uno::Sequence< rtl::OUString >();
}
}
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index 3545a88b5f07..b037fdceebfb 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -43,7 +43,7 @@ public:
virtual void SAL_CALL throwException() {
throw test::types::TestException(
- OUString("test"),
+ rtl::OUString("test"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -62,13 +62,13 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Service);
}
-OUString getImplementationName() {
- return OUString("test.cpp.cpptest.Component");
+rtl::OUString getImplementationName() {
+ return rtl::OUString("test.cpp.cpptest.Component");
}
-css::uno::Sequence< OUString > getSupportedServiceNames() {
- OUString s("test.types.CppTest");
- return css::uno::Sequence< OUString >(&s, 1);
+css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
+ rtl::OUString s("test.types.CppTest");
+ return css::uno::Sequence< rtl::OUString >(&s, 1);
}
}
More information about the Libreoffice-commits
mailing list