Make IsHeadlessModeRequested hack work for LOK

Change-Id: I30bf474fc44b122c8b7218e187c822a8784783fd

desktop/source/lib/init.cxx

@@ -740,6 +740,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath)
         // CommandLineArgs):
         desktop::Desktop::GetCommandLineArgs().setHeadless();
 
+        Application::EnableHeadlessMode(true);
+
         // We could use InitVCL() here -- and used to before using soffice_main,
         // however that now deals with the initialisation for us (and it's not
         // possible to try to set up VCL twice.
@@ -773,8 +775,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath)
             return false;
         }
 
-        Application::EnableHeadlessMode(true);
-
         ErrorHandler::RegisterDisplay(aBasicErrorFunc);
 
         SAL_INFO("lok", "LOK Initialized");

vcl/unx/generic/plugadapt/salplug.cxx

@@ -43,6 +43,9 @@ namespace {
 // Application::EnableHeadlessMode has potentially been called:
 bool IsHeadlessModeRequested()
 {
+    if (Application::IsHeadlessModeEnabled()) {
+        return true;
+    }
     sal_uInt32 n = rtl_getAppCommandArgCount();
     for (sal_uInt32 i = 0; i < n; ++i) {
         OUString arg;