diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-12-03 17:40:14 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-12-04 12:23:04 +0100 |
| commit | b5937b71cbf2cdec6379b9caf5376ac2a1ad79df (patch) | |
| tree | f742b37f4dd6ffe95d4e22a0cc226b6966bc0f82 /desktop | |
| parent | 4bf156f6523567517d9abd4df5941066d83d5a4e (diff) | |
Enable OfficeIPCThread for LOK on Android in a safer way
Change-Id: Ie4227bba37500ca755207b64a928a19f46419ff0
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index cc3014106a84..39e9034600ea 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -57,7 +57,7 @@ const int OfficeIPCThread::sc_nShSeqLength = 5; namespace { -//#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_DESKTOP || defined(ANDROID) static char const ARGUMENT_PREFIX[] = "InternalIPC::Arguments"; static char const SEND_ARGUMENTS[] = "InternalIPC::SendArguments"; @@ -87,7 +87,7 @@ OString readStringFromPipe(osl::StreamPipe & pipe) { } } -//#endif +#endif } @@ -104,7 +104,7 @@ namespace desktop namespace { -//#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_DESKTOP || defined(ANDROID) class Parser: public CommandLineArgs::Supplier { public: @@ -241,7 +241,7 @@ bool addArgument(OStringBuffer &rArguments, char prefix, return true; } -//#endif +#endif } @@ -449,7 +449,7 @@ void OfficeIPCThread::RequestsCompleted( int nCount ) OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() { -//#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_DESKTOP || defined(ANDROID) ::osl::MutexGuard aGuard( GetMutex() ); if( pGlobalOfficeIPCThread.is() ) @@ -604,15 +604,15 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() return IPC_STATUS_2ND_OFFICE; } -// #else -// pGlobalOfficeIPCThread = rtl::Reference< OfficeIPCThread >(new OfficeIPCThread); -// #endif +#else + pGlobalOfficeIPCThread = rtl::Reference< OfficeIPCThread >(new OfficeIPCThread); +#endif return IPC_STATUS_OK; } void OfficeIPCThread::DisableOfficeIPCThread(bool join) { -//#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_DESKTOP || defined(ANDROID) osl::ClearableMutexGuard aMutex( GetMutex() ); if( pGlobalOfficeIPCThread.is() ) @@ -635,9 +635,9 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join) pOfficeIPCThread->join(); } } -//#else -// (void) join; -// #endif +#else + (void) join; +#endif } OfficeIPCThread::OfficeIPCThread() : @@ -689,7 +689,7 @@ bool OfficeIPCThread::IsEnabled() void OfficeIPCThread::execute() { -//#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_DESKTOP || defined(ANDROID) do { osl::StreamPipe aStreamPipe; @@ -967,7 +967,7 @@ void OfficeIPCThread::execute() salhelper::Thread::wait( tval ); } } while( schedule() ); -//#endif +#endif } static void AddToDispatchList( |