diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-02-24 13:57:59 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-02-24 13:57:59 +0100 |
| commit | 5e0ac176cf025f7e070d882f4bba169f6242efa7 (patch) | |
| tree | e28c89d96004e26e9d83978c0f6e5e6e5d62c048 /desktop | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
#i117013# Check restart state earlier in startup process to better support extensions with changed configuration settings
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index a2f602082fe4..57adbfdad775 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1729,8 +1729,17 @@ void Desktop::Main() bool bAbort = CheckExtensionDependencies(); if ( bAbort ) return; + + { + ::comphelper::ComponentContext aContext( xSMgr ); + xRestartManager.set( aContext.getSingleton( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.OfficeRestartManager" ) ) ), UNO_QUERY ); + } + + // check whether the shutdown is caused by restart + pExecGlobals->bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) ); + // First Start Wizard allowed ? - if ( ! pCmdLineArgs->IsNoFirstStartWizard()) + if ( ! pCmdLineArgs->IsNoFirstStartWizard() && !pExecGlobals->bRestartRequested ) { RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ FirstStartWizard" ); @@ -1782,14 +1791,6 @@ void Desktop::Main() impl_checkRecoveryState(bCrashed, bExistsRecoveryData, bExistsSessionData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "} impl_checkRecoveryState" ); - { - ::comphelper::ComponentContext aContext( xSMgr ); - xRestartManager.set( aContext.getSingleton( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.OfficeRestartManager" ) ) ), UNO_QUERY ); - } - - // check whether the shutdown is caused by restart - pExecGlobals->bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) ); - if ( pCmdLineArgs->IsHeadless() ) { // Ensure that we use not the system file dialogs as |