summaryrefslogtreecommitdiff
path: root/framework
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 /framework
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 'framework')
-rw-r--r--framework/source/dispatch/servicehandler.cxx3
-rw-r--r--framework/source/fwi/jobs/configaccess.cxx2
-rw-r--r--framework/source/jobs/job.cxx2
-rw-r--r--framework/source/services/sessionlistener.cxx6
-rw-r--r--framework/source/uielement/popuptoolbarcontroller.cxx4
5 files changed, 8 insertions, 9 deletions
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 83c7535cadf1..a6588bad7ec9 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -217,8 +217,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
// because it contains syntax errors, which was detected at runtime...
catch(const css::uno::Exception& e)
{
- SAL_WARN(
- "fwk.dispatch", "ignored UNO Exception \"" << e.Message << '"');
+ SAL_WARN("fwk.dispatch", "ignored " << e);
xService.clear();
}
diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index 13d3118d1a4a..7ce56e433e38 100644
--- a/framework/source/fwi/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
@@ -128,7 +128,7 @@ void ConfigAccess::open( /*IN*/ EOpenMode eMode )
}
catch(const css::uno::Exception& ex)
{
- SAL_INFO("fwk", "open config: " << ex.Message);
+ SAL_INFO("fwk", "open config: " << ex);
}
m_eMode = E_CLOSED;
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 0f8741f8c377..f7b18482dfa0 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -216,7 +216,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD
#if OSL_DEBUG_LEVEL > 0
catch(const css::uno::Exception& ex)
{
- SAL_INFO("fwk", "Job::execute(): Got exception during job execution. Original Message was: \"" << ex.Message << "\"");
+ SAL_INFO("fwk", "Job::execute(): Got exception during job execution. Original Message was: \"" << ex << "\"");
}
#else
catch(const css::uno::Exception&)
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index ec26813e814e..e47dae89135d 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -188,7 +188,7 @@ void SessionListener::StoreSession( bool bAsync )
args[0] = PropertyValue("DispatchAsynchron",-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
} catch (const css::uno::Exception& e) {
- SAL_WARN("fwk.session",e.Message);
+ SAL_WARN("fwk.session",e);
// save failed, but tell manager to go on if we haven't yet dispatched the request
// in case of synchronous saving the notification is done by the caller
if ( bAsync && m_rSessionManager.is() )
@@ -216,7 +216,7 @@ void SessionListener::QuitSessionQuietly()
args[0] = PropertyValue("DispatchAsynchron",-1,makeAny(false),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
} catch (const css::uno::Exception& e) {
- SAL_WARN("fwk.session",e.Message);
+ SAL_WARN("fwk.session",e);
}
}
@@ -304,7 +304,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
m_bRestored = true;
} catch (const css::uno::Exception& e) {
- SAL_WARN("fwk.session",e.Message);
+ SAL_WARN("fwk.session",e);
}
return m_bRestored;
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 202f3fa85dc8..4d0ea6821b81 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -142,7 +142,7 @@ void SAL_CALL PopupMenuToolbarController::initialize(
}
catch (const css::uno::Exception& e)
{
- SAL_INFO( "fwk.uielement", "Caught an exception: " << e.Message );
+ SAL_INFO( "fwk.uielement", e );
}
SolarMutexGuard aSolarLock;
@@ -250,7 +250,7 @@ void PopupMenuToolbarController::createPopupMenuController()
catch ( const css::uno::Exception &e )
{
m_xPopupMenu.clear();
- SAL_INFO( "fwk.uielement", "Caught an exception: " << e.Message );
+ SAL_INFO( "fwk.uielement", e );
}
}
}