[Libreoffice-commits] core.git: vcl/source

[Tor Lillqvist]

 vcl/source/app/settings.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c79a2668f59dd6cc985dee319081c1d31a5e80ea
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat May 23 12:23:59 2015 +0100

    Set 'pseudo headlesness' also when being used from LibreOfficeKit
    
    Pseudo headlessness, one of the many kinds of headlessness, all
    slightly different and essential. NIH!
    
    Change-Id: I4da86751989bdeedfb009a5966df7226aa806eb6

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 55e4be7..15eca7d 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -32,6 +32,8 @@
 #include "i18nlangtag/mslangid.hxx"
 #include "i18nlangtag/languagetag.hxx"
 
+#include <comphelper/lok.hxx>
+
 #include <vcl/graphicfilter.hxx>
 #include <vcl/IconThemeScanner.hxx>
 #include <vcl/IconThemeSelector.hxx>
@@ -2424,8 +2426,8 @@ ImplMiscData::ImplMiscData()
     mnDisablePrinting           = TRISTATE_INDET;
     static const char* pEnv = getenv("SAL_DECIMALSEP_ENABLED" ); // set default without UI
     mbEnableLocalizedDecimalSep = (pEnv != NULL);
-    pEnv = getenv("VCL_HIDE_WINDOWS"); // do not display any windows
-    mbPseudoHeadless = (pEnv != NULL);
+    // Should we display any windows?
+    mbPseudoHeadless = getenv("VCL_HIDE_WINDOWS") || comphelper::LibreOfficeKit::isActive();
 }
 
 ImplMiscData::ImplMiscData( const ImplMiscData& rData )