[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 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 a8c8192e3f4ef922465f0f1462fa4e1cd3fe2c8d
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue May 5 19:15:52 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed May 6 07:02:25 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>

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 59d6a0db378f..dda31df281e9 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1618,7 +1618,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
@@ -1638,6 +1640,7 @@ int Desktop::Main()
                 Execute();
             }
         }
+#ifndef IOS
         catch(const css::document::CorruptedFilterConfigurationException& exFilterCfg)
         {
             RequestHandler::SetDowning();
@@ -1663,6 +1666,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 b71b5ed2031a..e8266c316764 100644
--- a/vcl/source/app/salusereventlist.cxx
+++ b/vcl/source/app/salusereventlist.cxx
@@ -106,10 +106,13 @@ bool SalUserEventList::DispatchUserEvents( bool bHandleAllCurrentEvents )
                 continue;
             }
 
+#ifndef IOS
             try
+#endif
             {
                 ProcessEvent( aEvent );
             }
+#ifndef IOS
             catch (css::uno::Exception&)
             {
                 auto const e2 = cppu::getCaughtException();
@@ -126,6 +129,7 @@ bool SalUserEventList::DispatchUserEvents( bool bHandleAllCurrentEvents )
                 SAL_WARN("vcl", "Uncaught exception during DispatchUserEvents!");
                 std::abort();
             }
+#endif
             if (!bHandleAllCurrentEvents)
                 break;
         }