desktop/source/app/app.cxx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 161a72d1bf35413b700bddaf88f1c8b2bc47139b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Aug 14 10:45:19 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 14 13:32:42 2020 +0200
add comments and log some exceptions
Change-Id: I8fab74e92a932fd284a63357e7a20f208af2d20d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100728
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 57f88713cba4..c3baa5392817 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -551,6 +551,7 @@ void Desktop::DeInit()
} catch (const RuntimeException&) {
// someone threw an exception during shutdown
// this will leave some garbage behind...
+ TOOLS_WARN_EXCEPTION("desktop.app", "exception throwing during
shutdown, will leave some garbage behind");
}
}
@@ -2295,7 +2296,8 @@ void Desktop::HandleAppEvent( const ApplicationEvent&
rAppEvent )
}
break;
case ApplicationEvent::Type::ShowDialog:
- // ignore all errors here. It's clicking a menu entry only ...
+ // This is only used on macOS, and only for About or Preferences.
+ // Ignore all errors here. It's clicking a menu entry only ...
// The user will try it again, in case nothing happens .-)
try
{
@@ -2319,7 +2321,9 @@ void Desktop::HandleAppEvent( const ApplicationEvent&
rAppEvent )
}
}
catch(const css::uno::Exception&)
- {}
+ {
+ TOOLS_WARN_EXCEPTION("desktop.app", "exception thrown by dialog");
+ }
break;
case ApplicationEvent::Type::Unaccept:
// try to remove corresponding acceptor
commit 27d9aa3eff7e26c21218bece0310705a0453553f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Aug 14 10:59:32 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 14 13:32:36 2020 +0200
dont catch&abort Desktop::OpenClients_Impl
rather just let the debugger or crashpad handle it
Change-Id: I44e0dd06f2c84a7bf0099093a53032d759c18dea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100729
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 9b9fa3896de5..57f88713cba4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1150,7 +1150,7 @@ void Desktop::Exception(ExceptionCategory nCategory)
{
case ExceptionCategory::ResourceNotLoaded:
{
- Application::Abort( OUString() );
+ Application::Abort( "OS threw signal
OSL_SIGNAL_USER_RESOURCEFAILURE" );
break;
}
@@ -1841,7 +1841,6 @@ class ExitTimer : public Timer
IMPL_LINK_NOARG(Desktop, OpenClients_Impl, void*, void)
{
- try {
// #i114963#
// Enable IPC thread before OpenClients
//
@@ -1869,9 +1868,6 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl, void*, void)
const char *pExitPostStartup = getenv ("OOO_EXIT_POST_STARTUP");
if (pExitPostStartup && *pExitPostStartup)
new ExitTimer();
- } catch (const css::uno::Exception &e) {
- Application::Abort( "UNO exception during client open: " + e.Message );
- }
}
void Desktop::OpenClients()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
