summaryrefslogtreecommitdiff
path: root/cppuhelper
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 /cppuhelper
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 'cppuhelper')
-rw-r--r--cppuhelper/source/component.cxx2
-rw-r--r--cppuhelper/source/component_context.cxx4
-rw-r--r--cppuhelper/source/implbase.cxx4
-rw-r--r--cppuhelper/source/propshlp.cxx6
-rw-r--r--cppuhelper/source/servicemanager.cxx5
-rw-r--r--cppuhelper/source/tdmgr.cxx4
-rw-r--r--cppuhelper/source/weak.cxx2
7 files changed, 12 insertions, 15 deletions
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 7b974ec76586..d906243bfddb 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -92,7 +92,7 @@ void OComponentHelper::release() throw()
catch (css::uno::RuntimeException & exc)
{
// release should not throw exceptions
- SAL_WARN( "cppuhelper", exc.Message );
+ SAL_WARN( "cppuhelper", exc );
}
// only the alive ref holds the object
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 8555feaef4c9..7d9ecd97b3c6 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -341,7 +341,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
SAL_WARN(
"cppuhelper",
"exception occurred raising singleton \"" << rName << "\": "
- << exc.Message);
+ << exc);
}
SAL_WARN_IF(!xInstance.is(),
@@ -573,7 +573,7 @@ extern "C" { static void s_createComponentContext_v(va_list * pParam)
}
catch (Exception & exc)
{
- SAL_WARN( "cppuhelper", exc.Message );
+ SAL_WARN( "cppuhelper", exc );
xContext.clear();
}
}
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index a64418ffaccd..b8bc91b769b1 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -77,7 +77,7 @@ void WeakComponentImplHelperBase::release()
dispose();
}
catch (RuntimeException const& exc) { // don't break throw ()
- SAL_WARN( "cppuhelper", exc.Message );
+ SAL_WARN( "cppuhelper", exc );
}
OSL_ASSERT( rBHelper.bDisposed );
}
@@ -201,7 +201,7 @@ void WeakAggComponentImplHelperBase::release()
dispose();
}
catch (RuntimeException const& exc) { // don't break throw ()
- SAL_WARN( "cppuhelper", exc.Message );
+ SAL_WARN( "cppuhelper", exc );
}
OSL_ASSERT( rBHelper.bDisposed );
}
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 91e777249f4a..eea33d133aaf 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -693,7 +693,7 @@ void OPropertySetHelper::fire
}
catch (RuntimeException & exc)
{
- SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc.Message);
+ SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc);
if (! bIgnoreRuntimeExceptionsWhileFiring)
throw;
}
@@ -745,7 +745,7 @@ void OPropertySetHelper::fire
}
catch (RuntimeException & exc)
{
- SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc.Message);
+ SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc);
if (! bIgnoreRuntimeExceptionsWhileFiring)
throw;
}
@@ -790,7 +790,7 @@ void OPropertySetHelper::fire
}
catch (RuntimeException & exc)
{
- SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc.Message);
+ SAL_INFO("cppuhelper", "caught RuntimeException while firing listeners: " << exc);
if (! bIgnoreRuntimeExceptionsWhileFiring)
throw;
}
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 7e6c178c4e7c..1478010d3434 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -890,10 +890,7 @@ void cppuhelper::ServiceManager::disposing() {
try {
(*i)->dispose();
} catch (css::uno::RuntimeException & e) {
- SAL_WARN(
- "cppuhelper",
- "Ignoring RuntimeException \"" << e.Message
- << "\" while disposing singleton");
+ SAL_WARN("cppuhelper", "Ignoring " << e << " while disposing singleton");
}
}
for (std::vector<
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 02da05163732..f86dca136753 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -591,11 +591,11 @@ static void SAL_CALL typelib_callback(
}
catch (const container::NoSuchElementException & exc)
{
- SAL_INFO("cppuhelper", "typelibrary type not available: " << exc.Message );
+ SAL_INFO("cppuhelper", "typelibrary type not available: " << exc );
}
catch (const Exception & exc)
{
- SAL_INFO("cppuhelper", exc.Message );
+ SAL_INFO("cppuhelper", exc );
}
}
}
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 81de170130a9..acbbb94a4551 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -243,7 +243,7 @@ void OWeakObject::disposeWeakConnectionPoint()
p->dispose();
}
catch (RuntimeException const& exc) {
- SAL_WARN( "cppuhelper", exc.Message );
+ SAL_WARN( "cppuhelper", exc );
}
p->release();
}