summaryrefslogtreecommitdiff
path: root/desktop/source/app
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 /desktop/source/app
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 'desktop/source/app')
-rw-r--r--desktop/source/app/app.cxx12
-rw-r--r--desktop/source/app/appinit.cxx2
-rw-r--r--desktop/source/app/check_ext_deps.cxx2
-rw-r--r--desktop/source/app/dispatchwatcher.cxx7
-rw-r--r--desktop/source/app/langselect.cxx7
-rw-r--r--desktop/source/app/opencl.cxx2
-rw-r--r--desktop/source/app/userinstall.cxx2
7 files changed, 15 insertions, 19 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 7c194f890db9..cae1d3ce8b22 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -306,7 +306,7 @@ void SetRestartState() {
officecfg::Setup::Office::OfficeRestartInProgress::set(true, batch);
batch->commit();
} catch (css::uno::Exception & e) {
- SAL_WARN("desktop.app", "ignoring Exception \"" << e.Message << "\"");
+ SAL_WARN("desktop.app", "ignoring " << e);
}
}
@@ -325,7 +325,7 @@ void DoRestartActionsIfNecessary(bool quickstart) {
}
} catch (css::uno::Exception & e) {
SAL_WARN(
- "desktop.app", "ignoring Exception \"" << e.Message << "\"");
+ "desktop.app", "ignoring " << e);
}
}
}
@@ -2087,7 +2087,7 @@ void Desktop::OpenClients()
}
catch(const css::uno::Exception& e)
{
- SAL_WARN( "desktop.app", "Could not disable AutoRecovery." << e.Message);
+ SAL_WARN( "desktop.app", "Could not disable AutoRecovery." << e);
}
}
else
@@ -2114,7 +2114,7 @@ void Desktop::OpenClients()
}
catch(const css::uno::Exception& e)
{
- SAL_WARN( "desktop.app", "Error during recovery" << e.Message);
+ SAL_WARN( "desktop.app", "Error during recovery" << e);
}
}
else if (bExistsRecoveryData && bDisableRecovery && !rArgs.HasModuleParam())
@@ -2131,7 +2131,7 @@ void Desktop::OpenClients()
}
catch(const css::uno::Exception& e)
{
- SAL_WARN( "desktop.app", "Registration of session listener failed" << e.Message);
+ SAL_WARN( "desktop.app", "Registration of session listener failed" << e);
}
if ( !bExistsRecoveryData && xSessionListener.is() )
@@ -2143,7 +2143,7 @@ void Desktop::OpenClients()
}
catch(const css::uno::Exception& e)
{
- SAL_WARN( "desktop.app", "Error in session management" << e.Message);
+ SAL_WARN( "desktop.app", "Error in session management" << e);
}
}
}
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 7512b31d0dbb..b21b98349b7f 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -157,7 +157,7 @@ void Desktop::createAcceptor(const OUString& aAcceptString)
{
// no error handling needed...
// acceptor just won't come up
- SAL_WARN( "desktop.app", "Acceptor could not be created: " << e.Message);
+ SAL_WARN( "desktop.app", "Acceptor could not be created: " << e);
}
}
else
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 788686c5528a..86f6385cf4ab 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -290,7 +290,7 @@ static bool impl_checkDependencies( const uno::Reference< uno::XComponentContext
}
catch ( const uno::RuntimeException & ) { throw; }
catch (const uno::Exception & exc) {
- SAL_WARN( "desktop.app", "" << exc.Message );
+ SAL_WARN( "desktop.app", exc );
}
if ( bRegistered )
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 6cd75c0d5f4d..466e6eeeae11 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -473,8 +473,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
SAL_WARN(
"desktop.app",
"Desktop::OpenDefault() ignoring Exception while"
- " calling XNotifyingDispatch: \"" << e.Message
- << "\"");
+ " calling XNotifyingDispatch: " << e);
}
}
}
@@ -546,14 +545,14 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
SAL_WARN(
"desktop.app",
"Dispatchwatcher IllegalArgumentException while calling"
- " loadComponentFromURL: \"" << iae.Message << "\"");
+ " loadComponentFromURL: " << iae);
}
catch (const css::io::IOException& ioe)
{
SAL_WARN(
"desktop.app",
"Dispatchwatcher IOException while calling"
- " loadComponentFromURL: \"" << ioe.Message << "\"");
+ " loadComponentFromURL: " << ioe);
}
if ( aDispatchRequest.aRequestType == REQUEST_OPEN ||
aDispatchRequest.aRequestType == REQUEST_VIEW ||
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 3af3652de083..8d826ab3674e 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -90,9 +90,7 @@ bool prepareLocale() {
"", batch);
batch->commit();
} catch (css::uno::Exception & e) {
- SAL_WARN(
- "desktop.app",
- "ignoring Exception \"" << e.Message << "\"");
+ SAL_WARN("desktop.app", "ignoring " << e);
}
}
}
@@ -125,8 +123,7 @@ bool prepareLocale() {
officecfg::Setup::L10N::ooLocale::set(locale, batch);
batch->commit();
} catch (css::uno::Exception & e) {
- SAL_WARN(
- "desktop.app", "ignoring Exception \"" << e.Message << "\"");
+ SAL_WARN("desktop.app", "ignoring " << e);
}
}
MsLangId::setConfiguredSystemUILanguage(tag.getLanguageType(false));
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 1dfc338b51d3..9f17673ed5e5 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -96,7 +96,7 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r
}
catch (const css::uno::Exception &e)
{
- SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e.Message);
+ SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e);
}
if (nKernelFailures != openclwrapper::kernelFailures)
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 86ca552355e9..ad55d6848f7a 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -140,7 +140,7 @@ bool isCreated() {
try {
return officecfg::Setup::Office::ooSetupInstCompleted::get();
} catch (css::uno::Exception & e) {
- SAL_WARN("desktop.app", "ignoring Exception \"" << e.Message << "\"");
+ SAL_WARN("desktop.app", "ignoring " << e);
return false;
}
}