diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-02-26 22:36:05 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-26 23:48:54 +0200 |
| commit | 0774c9f3038047dc2b196bbd131e1039936246bb (patch) | |
| tree | 452f45c4df691aef3fe6d8854475cac4fb2828ff /desktop | |
| parent | d2a640d69e73f30fb55e119168e47d66dd0a1a41 (diff) | |
Bypass the crack pipe on Android and iOS
Change-Id: I679794e72381226ccc3b2f743ab9e31a9fdaa3a6
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 6d0822661fc1..f4428e5e3de5 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -442,6 +442,7 @@ void OfficeIPCThread::RequestsCompleted( int nCount ) OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() { +#if !defined(ANDROID) && !defined(IOS) ::osl::MutexGuard aGuard( GetMutex() ); if( pGlobalOfficeIPCThread.is() ) @@ -595,12 +596,15 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() return IPC_STATUS_2ND_OFFICE; } - +#else + pGlobalOfficeIPCThread = rtl::Reference< OfficeIPCThread >(new OfficeIPCThread); +#endif return IPC_STATUS_OK; } void OfficeIPCThread::DisableOfficeIPCThread(bool join) { +#if !defined(ANDROID) && !defined(IOS) osl::ClearableMutexGuard aMutex( GetMutex() ); if( pGlobalOfficeIPCThread.is() ) @@ -623,6 +627,9 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join) pOfficeIPCThread->join(); } } +#else + (void) join; +#endif } OfficeIPCThread::OfficeIPCThread() : @@ -657,6 +664,7 @@ void OfficeIPCThread::SetReady( void OfficeIPCThread::execute() { +#if !defined(ANDROID) && !defined(IOS) do { osl::StreamPipe aStreamPipe; @@ -934,6 +942,7 @@ void OfficeIPCThread::execute() salhelper::Thread::wait( tval ); } } while( schedule() ); +#endif } static void AddToDispatchList( |