[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - desktop/source vcl/source

[Tor Lillqvist (via logerrit)]

 desktop/source/app/app.cxx          |    4 ++++
 vcl/source/app/salusereventlist.cxx |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit b4e4a5ca8ed52a57d39b06ae7183fd4586e980eb
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue May 5 19:15:52 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri May 8 12:07:13 2020 +0200

    On iOS, avoid catching exceptions to just immediately exit or abort anyway
    
    It is better to let the exception be uncaught and then catch that in
    the debugger. (Maybe even inspect its backtrace from a crash dump
    automatically sent from an end-user device.)
    
    Change-Id: Ice02d5cbd7f4a59eae7ce8a9fac47dec8b234a5e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93505
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93601
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93646

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3a4322933b25..e5d0939b2e93 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1595,7 +1595,9 @@ int Desktop::Main()
         }
 
         // call Application::Execute to process messages in vcl message loop
+#ifndef IOS
         try
+#endif
         {
 #if HAVE_FEATURE_JAVA
             // The JavaContext contains an interaction handler which is used when
@@ -1615,6 +1617,7 @@ int Desktop::Main()
                 Execute();
             }
         }
+#ifndef IOS
         catch(const css::document::CorruptedFilterConfigurationException& exFilterCfg)
         {
             RequestHandler::SetDowning();
@@ -1640,6 +1643,7 @@ int Desktop::Main()
             RequestHandler::SetDowning();
             FatalError( "Caught Unknown Exception: Aborting!");
         }
+#endif
     }
     else
     {
diff --git a/vcl/source/app/salusereventlist.cxx b/vcl/source/app/salusereventlist.cxx
index cb9104d7a5c1..088bc141f5a6 100644
--- a/vcl/source/app/salusereventlist.cxx
+++ b/vcl/source/app/salusereventlist.cxx
@@ -103,10 +103,13 @@ bool SalUserEventList::DispatchUserEvents( bool bHandleAllCurrentEvents )
                 continue;
             }
 
+#ifndef IOS
             try
+#endif
             {
                 ProcessEvent( aEvent );
             }
+#ifndef IOS
             catch (css::uno::Exception&)
             {
                 TOOLS_WARN_EXCEPTION("vcl", "Uncaught");
@@ -122,6 +125,7 @@ bool SalUserEventList::DispatchUserEvents( bool bHandleAllCurrentEvents )
                 SAL_WARN("vcl", "Uncaught exception during DispatchUserEvents!");
                 std::abort();
             }
+#endif
             aResettableListGuard.reset();
             if (!bHandleAllCurrentEvents)
                 break;