Restart soffice.bin when necessary.

In some cases, like when the migration is in progress, or when new extensions
are registered, soffice.bin dies with a 'restart' me status.  This implements
the correct handling of this state in oosplash.bin.

1 files changed, 7 insertions, 0 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 4bef6e5b3e..9ec6e87883 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1465,7 +1465,11 @@ USHORT Desktop::Exception(USHORT nError)
                 OfficeIPCThread::DisableOfficeIPCThread();
                 if( pSignalHandler )
                     osl_removeSignalHandler( pSignalHandler );
+
                 restartOnMac(false);
+                if ( m_rSplashScreen.is() )
+                    m_rSplashScreen->reset();
+
                 _exit( ExitHelper::E_CRASH_WITH_RESTART );
             }
             else
@@ -1972,6 +1976,9 @@ void Desktop::Main()
     if ( bRestartRequested )
     {
         restartOnMac(true);
+        if ( m_rSplashScreen.is() )
+            m_rSplashScreen->reset();
+
         // wouldn't the solution be more clean if SalMain returns the exit code to the system?
         _exit( ExitHelper::E_NORMAL_RESTART );
     }