summaryrefslogtreecommitdiff
path: root/binaryurp
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-29 16:21:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-10-04 15:18:00 +0200
commit2c05d758b2b62c9df413e2514fb3cd233d0f3ec7 (patch)
treee0a23d3da6fb17ae97d18957fc14f4a4a8de2d3f /binaryurp
parenta3088b1e72ef17babe3d3664c610afd02cfe0891 (diff)
add << operator for css::uno::Exception
Change-Id: Ia23dafd07133779144965682df3b7125a3214235 Reviewed-on: https://gerrit.libreoffice.org/43046 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'binaryurp')
-rw-r--r--binaryurp/source/bridge.cxx11
-rw-r--r--binaryurp/source/bridgefactory.cxx4
-rw-r--r--binaryurp/source/incomingrequest.cxx7
-rw-r--r--binaryurp/source/reader.cxx2
-rw-r--r--binaryurp/source/writer.cxx2
5 files changed, 10 insertions, 16 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 9a02085b3182..a31722418864 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -296,7 +296,7 @@ void Bridge::terminate(bool final) {
try {
connection_->close();
} catch (const css::io::IOException & e) {
- SAL_INFO("binaryurp", "caught IO exception '" << e.Message << '\'');
+ SAL_INFO("binaryurp", "caught IO exception '" << e << '\'');
}
assert(w.is());
w->stop();
@@ -331,9 +331,7 @@ void Bridge::terminate(bool final) {
css::lang::EventObject(
static_cast< cppu::OWeakObject * >(this)));
} catch (const css::uno::RuntimeException & e) {
- SAL_WARN(
- "binaryurp",
- "caught runtime exception '" << e.Message << '\'');
+ SAL_WARN("binaryurp", "caught " << e);
}
}
}
@@ -532,7 +530,7 @@ void Bridge::freeProxy(Proxy & proxy) {
makeReleaseCall(proxy.getOid(), proxy.getType());
} catch (const css::uno::RuntimeException & e) {
SAL_INFO(
- "binaryurp", "caught runtime exception '" << e.Message << '\'');
+ "binaryurp", "caught runtime exception '" << e << '\'');
} catch (const std::exception & e) {
SAL_WARN("binaryurp", "caught C++ exception '" << e.what() << '\'');
}
@@ -642,8 +640,7 @@ void Bridge::handleRequestChangeReply(
}
SAL_WARN(
"binaryurp",
- "requestChange caught RuntimeException \'" << e.Message
- << "' in state 'requested'");
+ "requestChange caught " << e << " in state 'requested'");
mode_ = MODE_NORMAL;
getWriter()->unblock();
decrementCalls();
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index fdf80873ac2b..b531910403e7 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -183,7 +183,7 @@ void BridgeFactory::disposing() {
css::uno::Reference<css::lang::XComponent>(
*i, css::uno::UNO_QUERY_THROW)->dispose();
} catch (css::uno::Exception & e) {
- SAL_WARN("binaryurp", "ignoring Exception " << e.Message);
+ SAL_WARN("binaryurp", "ignoring " << e);
}
}
for (BridgeMap::iterator i(l2.begin()); i != l2.end(); ++i) {
@@ -191,7 +191,7 @@ void BridgeFactory::disposing() {
css::uno::Reference<css::lang::XComponent>(
i->second, css::uno::UNO_QUERY_THROW)->dispose();
} catch (css::uno::Exception & e) {
- SAL_WARN("binaryurp", "ignoring Exception " << e.Message);
+ SAL_WARN("binaryurp", "ignoring " << e);
}
}
}
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index 9043b22daadf..2a94ed2c7611 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -102,7 +102,7 @@ void IncomingRequest::execute() const {
tid_, member_, setter_, isExc, ret, outArgs, false);
return;
} catch (const css::uno::RuntimeException & e) {
- SAL_INFO("binaryurp", "caught UNO runtime exception " << e.Message);
+ SAL_INFO("binaryurp", "caught " << e);
} catch (const std::exception & e) {
SAL_INFO("binaryurp", "caught C++ exception " << e.what());
}
@@ -146,10 +146,7 @@ bool IncomingRequest::execute_throw(
try {
ifc = prov->getInstance(oid_);
} catch (const css::container::NoSuchElementException & e) {
- SAL_INFO(
- "binaryurp",
- "initial element " << oid_
- << ": NoSuchElementException " << e.Message);
+ SAL_INFO("binaryurp", "initial element " << oid_ << ": " << e);
}
}
if (ifc.is()) {
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 75c3a1f7d467..b50d3d50c187 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -120,7 +120,7 @@ void Reader::execute() {
block.done();
}
} catch (const css::uno::Exception & e) {
- SAL_WARN("binaryurp", "caught UNO exception '" << e.Message << '\'');
+ SAL_WARN("binaryurp", "caught UNO exception '" << e << '\'');
} catch (const std::exception & e) {
SAL_WARN("binaryurp", "caught C++ exception '" << e.what() << '\'');
}
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index ba79ee096d55..9c71763c738d 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -180,7 +180,7 @@ void Writer::execute() {
}
}
} catch (const css::uno::Exception & e) {
- SAL_INFO("binaryurp", "caught UNO exception " << e.Message);
+ SAL_INFO("binaryurp", "caught " << e);
} catch (const std::exception & e) {
SAL_INFO("binaryurp", "caught C++ exception " << e.what());
}