diff options
| author | obo <obo@openoffice.org> | 2010-06-25 09:18:05 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-25 09:18:05 +0200 |
| commit | 8a629e8660951674a7c0bba36f507819359583a4 (patch) | |
| tree | c15626f030029e76f4496c09955af283910dff27 /comphelper/source/misc/officerestartmanager.cxx | |
| parent | eaa2d3539a80b3834124d865ae0cc7669e369cdd (diff) | |
masterfix: #i10000#,#i112674# prevent restarting on Mac
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 1a98ddfce8da..974b8d65e7ae 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; |