diff options
| author | Andrzej Hunt <andrzej@ahunt.org> | 2014-09-25 10:08:54 +0100 |
|---|---|---|
| committer | Andrzej Hunt <andrzej@ahunt.org> | 2014-09-25 10:10:29 +0100 |
| commit | 35cecf52d34cbcc54eb7b3b2297635b4cc227ede (patch) | |
| tree | 727435cf99ed8496a4874d719102626ab1844414 | |
| parent | 3a69e64571c55b5566467e7c30d0ab701406d5f5 (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
| -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 15c64ae937f8..8e9e3d7f83de 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -56,7 +56,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"; @@ -86,7 +86,7 @@ OString readStringFromPipe(osl::StreamPipe & pipe) { } } -#endif +//#endif } @@ -103,7 +103,7 @@ namespace desktop namespace { -#if HAVE_FEATURE_DESKTOP +//#if HAVE_FEATURE_DESKTOP class Parser: public CommandLineArgs::Supplier { public: @@ -240,7 +240,7 @@ bool addArgument(OStringBuffer &rArguments, char prefix, return true; } -#endif +//#endif } @@ -448,7 +448,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() ) @@ -603,15 +603,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() ) @@ -634,9 +634,9 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join) pOfficeIPCThread->join(); } } -#else - (void) join; -#endif +//#else +// (void) join; +// #endif } OfficeIPCThread::OfficeIPCThread() : @@ -688,7 +688,7 @@ bool OfficeIPCThread::IsEnabled() void OfficeIPCThread::execute() { -#if HAVE_FEATURE_DESKTOP +//#if HAVE_FEATURE_DESKTOP do { osl::StreamPipe aStreamPipe; @@ -966,7 +966,7 @@ void OfficeIPCThread::execute() salhelper::Thread::wait( tval ); } } while( schedule() ); -#endif +//#endif } static void AddToDispatchList( |