summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-01 11:17:58 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-01 11:17:58 +0200
commitc752f6644c38f4bc6af731d8539b9ad523ee7d13 (patch)
treef58d02f60ee7d06a64a23e47b42acf11233279c2 /desktop
parent3c43a4810f505c071bcc99aeda47162a4b7b1681 (diff)
No need to #if this code
...it's enough to conditionally set ipc = false in RequestHandler::Enable. Change-Id: Ie64b476d6ad5a5fbedb7542c5dab69daadf17f1e
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/officeipcthread.cxx10
1 files changed, 0 insertions, 10 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 55f6c64ff1db..d03bce0f1abe 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -52,8 +52,6 @@ using namespace ::com::sun::star::frame;
namespace {
-#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
-
static char const ARGUMENT_PREFIX[] = "InternalIPC::Arguments";
static char const SEND_ARGUMENTS[] = "InternalIPC::SendArguments";
static char const PROCESSING_DONE[] = "InternalIPC::ProcessingDone";
@@ -82,8 +80,6 @@ OString readStringFromPipe(osl::StreamPipe & pipe) {
}
}
-#endif
-
}
// Type of pipe we use
@@ -99,8 +95,6 @@ namespace desktop
namespace {
-#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
-
class Parser: public CommandLineArgs::Supplier {
public:
explicit Parser(OString const & input): m_input(input) {
@@ -236,8 +230,6 @@ bool addArgument(OStringBuffer &rArguments, char prefix,
return true;
}
-#endif
-
}
rtl::Reference< RequestHandler > RequestHandler::pGlobal;
@@ -641,7 +633,6 @@ void RequestHandler::WaitForReady()
void PipeReaderThread::execute()
{
-#if HAVE_FEATURE_DESKTOP
do
{
osl::StreamPipe aStreamPipe;
@@ -915,7 +906,6 @@ void PipeReaderThread::execute()
salhelper::Thread::wait( tval );
}
} while( schedule() );
-#endif
}
static void AddToDispatchList(