diff options
| author | Andre Fischer <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com> | 2010-11-05 10:17:51 +0100 |
|---|---|---|
| committer | Andre Fischer <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com> | 2010-11-05 10:17:51 +0100 |
| commit | 34c72d32a6fe0960291ebe61820defcda5cacd8e (patch) | |
| tree | fc6367c37c653d019e3250153896c57257184a63 /comphelper/source/misc/officerestartmanager.cxx | |
| parent | a7b3942c0f04f24455ab85ec0c0a8c2a0014da0f (diff) | |
| parent | 95f71183414a50d12cd4bbacf47d711672e63268 (diff) | |
impress195: merge with DEV300_m92
Diffstat (limited to 'comphelper/source/misc/officerestartmanager.cxx')
| -rw-r--r-- | comphelper/source/misc/officerestartmanager.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index 974b8d65e7ae..1a98ddfce8da 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -87,9 +87,9 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task: // if the restart already running there is no need to trigger it again if ( m_bRestartRequested ) return; -#ifndef MACOSX + m_bRestartRequested = sal_True; -#endif + // the office is still not initialized, no need to terminate, changing the state is enough if ( !m_bOfficeInitialized ) return; |