diff options
| author | Andrzej Hunt <andrzej@ahunt.org> | 2014-09-25 10:08:54 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-12-04 12:23:03 +0100 |
| commit | 4bf156f6523567517d9abd4df5941066d83d5a4e (patch) | |
| tree | 78e4cd0b79507e833d6f5fd7a4341e055133e5bf /desktop | |
| parent | 17b0cc20a8559fcd2adb625c816448cf685ab074 (diff) | |
TEMPORARY: We need OfficeIPCThread for LOK on Android for now.
LOK uses the OfficeIPCThread to know that soffice_main is ready --
we should have some form of separate condition instead since I don't
think we need any of the actual functionality here for Android.
Change-Id: I27030383aae4d7895725c2161c53617f896a5f83
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 df00bdb33ccd..cc3014106a84 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 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 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 ::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 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 do { osl::StreamPipe aStreamPipe; @@ -967,7 +967,7 @@ void OfficeIPCThread::execute() salhelper::Thread::wait( tval ); } } while( schedule() ); -#endif +//#endif } static void AddToDispatchList( |