From c3e84d4c74847271f88e1f83369d0b55b2fd6037 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 16 Apr 2014 22:42:40 +0200
Subject: sal/log.hxx functionality also includes the equivalent of
OSL_LOG_PREFIX
Change-Id: I1bb0115a378003b5cc5b1cfc59c474a1f100d894
---
binaryurp/source/incomingrequest.cxx | 9 ++++-----
binaryurp/source/writer.cxx | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
(limited to 'binaryurp/source')
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index 1ac6e10ef24b..ff30a8e142e9 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -101,16 +101,16 @@ void IncomingRequest::execute() const {
return;
} catch (const css::uno::RuntimeException & e) {
OSL_TRACE(
- OSL_LOG_PREFIX "caught UNO runtime exception '%s'",
+ "caught UNO runtime exception '%s'",
(OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).
getStr()));
} catch (const std::exception & e) {
- OSL_TRACE(OSL_LOG_PREFIX "caught C++ exception '%s'", e.what());
+ OSL_TRACE("caught C++ exception '%s'", e.what());
}
bridge_->terminate(false);
} else {
if (isExc) {
- OSL_TRACE(OSL_LOG_PREFIX "oneway method raised exception");
+ OSL_TRACE("oneway method raised exception");
}
bridge_->decrementCalls();
}
@@ -148,8 +148,7 @@ bool IncomingRequest::execute_throw(
ifc = prov->getInstance(oid_);
} catch (const css::container::NoSuchElementException & e) {
OSL_TRACE(
- (OSL_LOG_PREFIX "initial element '%s':"
- " NoSuchElementException '%s'"),
+ "initial element '%s': NoSuchElementException '%s'",
OUStringToOString(oid_, RTL_TEXTENCODING_UTF8).getStr(),
(OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).
getStr()));
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index edcb0f5090ce..46198b96a56a 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -171,10 +171,10 @@ void Writer::execute() {
}
} catch (const css::uno::Exception & e) {
OSL_TRACE(
- OSL_LOG_PREFIX "caught UNO exception '%s'",
+ "caught UNO exception '%s'",
OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
} catch (const std::exception & e) {
- OSL_TRACE(OSL_LOG_PREFIX "caught C++ exception '%s'", e.what());
+ OSL_TRACE("caught C++ exception '%s'", e.what());
}
bridge_->terminate(false);
bridge_.clear();
--
cgit