Check osl::LibreOfficeKit::isActive(), not Application::IsConsoleOnly()

Console-only is really orthogonal to other things; it has one specific meaning
that is relevant on OS X only, see svapp.hxx. Let's not overload it for
LibreOfficeKit things.

Change-Id: I8b94c3a4e6f938ad70f1555a12dac8596819e031

2 files changed, 8 insertions, 8 deletions

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index aec9b3c0f279..8c0ac218d6e7 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -26,6 +26,7 @@
 #include "dispatchwatcher.hxx"
 #include <boost/scoped_ptr.hpp>
 #include <stdio.h>
+#include <osl/lok.hxx>
 #include <osl/process.h>
 #include <unotools/bootstrap.hxx>
 #include <vcl/svapp.hxx>
@@ -460,13 +461,13 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
 
 #ifndef ANDROID // On Android it might be that we still for some reason need the pipe?
 
-    // When console-only (which includes in LibreOfficeKit-based programs) we want to be totally
-    // independent from any other LibreOffice instance or LOKit-using program. Certainly no need for
-    // any IPC pipes by definition, as we don't have any reason to do any IPC. Why we even call this
-    // EnableOfficeIPCThread function from LibreOfficeKit's lo_initialize() I am not completely
-    // sure, but that code, and this, is such horrible crack that I don't want to change it too much.
+    // In LibreOfficeKit-based programs we want to be totally independent from any other LibreOffice
+    // instance or LOKit-using program. Certainly no need for any IPC pipes by definition, as we
+    // don't have any reason to do any IPC. Why we even call this EnableOfficeIPCThread function
+    // from LibreOfficeKit's lo_initialize() I am not completely sure, but that code, and this, is
+    // such horrible crack that I don't want to change it too much.
 
-    if (Application::IsConsoleOnly())
+    if (osl::LibreOfficeKit::isActive())
     {
         // Setting nPipeMode to PIPEMODE_CREATED causes the trivial path to be taken below, starting
         // the listeing thread. (Which will immediately finish, see the execute() function, but what
@@ -706,7 +707,7 @@ void OfficeIPCThread::execute()
 #if HAVE_FEATURE_DESKTOP || defined(ANDROID)
 
 #ifndef ANDROID
-    if (Application::IsConsoleOnly())
+    if (osl::LibreOfficeKit::isActive())
         return;
 #endif
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f6aa90f2d246..339e3fd17ad9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -891,7 +891,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath)
         desktop::Desktop::GetCommandLineArgs().setHeadless();
 
         Application::EnableHeadlessMode(true);
-        Application::EnableConsoleOnly();
 
         // This is horrible crack. I really would want to go back to simply just call
         // InitVCL() here. The OfficeIPCThread thing is just horrible.