diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-07-26 13:41:10 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-07-26 14:14:06 +0300 |
| commit | cca02d9e984d1937f6d8597de0267ebf22ae6916 (patch) | |
| tree | 5f899d6562f2fee98350351e4ccd463af09db035 /desktop | |
| parent | e849f5d84a4bc35a241c2d1231b48c57c43ecce4 (diff) | |
Move OS X sandbox flag to config_features.h
Change-Id: I189fa06d13a78bcaa8e17b32756076473ced3641
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index a6888b5180df..137dbac24979 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -598,7 +598,7 @@ void Desktop::Init() OfficeIPCThread::Status aStatus = OfficeIPCThread::EnableOfficeIPCThread(); if ( aStatus == OfficeIPCThread::IPC_STATUS_PIPE_ERROR ) { -#ifdef MACOSX +#if HAVE_FEATURE_MACOSX_SANDBOX // In a sandboxed LO, on 10.8.2 at least, creating the // Unix domain socket fails. Ignore that as hopefully // people running a sandboxed LO won't attempt starting it @@ -1159,7 +1159,7 @@ namespace { void restartOnMac(bool passArguments) { #if defined MACOSX OfficeIPCThread::DisableOfficeIPCThread(); -#ifdef ENABLE_MACOSX_SANDBOX +#if HAVE_FEATURE_MACOSX_SANDBOX (void) passArguments; // avoid warnings ResMgr *resMgr = Desktop::GetDesktopResManager(); OUString aMessage = OUString( String( ResId( STR_LO_MUST_BE_RESTARTED, *resMgr ))); |