From 1b191d8cb9c0412c17d00323fcca66552372e888 Mon Sep 17 00:00:00 2001 From: sb Date: Thu, 1 Jul 2010 13:01:22 +0200 Subject: jl154: #i112673# ensure that client-facing PID remains the same across internal OOo restart on Mac OS X --- comphelper/source/misc/officerestartmanager.cxx | 4 ++-- 1 file 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; -- cgit