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

[Stephan Bergmann]

 desktop/source/lib/init.cxx   |4 ++--
 vcl/unx/generic/plugadapt/salplug.cxx |3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 68e2dd0dfbd7f1cec1771f68e65f46045365cf1f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 10 18:28:11 2014 +0100

Make IsHeadlessModeRequested hack work for LOK

Change-Id: I30bf474fc44b122c8b7218e187c822a8784783fd

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5a410e4..282cb99 100644
--- a/desktop/source/lib/init.cxx
+++ b/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);
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index e2870f3..80b5acf 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/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;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 desktop/source/app/app.cxx  |4 
 vcl/unx/gtk/app/gtkinst.cxx |1 -
 2 files changed, 5 deletions(-)

New commits:
commit 1a4bcd1b0d05f7dcafd7aebeaa0e0e91f6b102ea
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Feb 22 12:58:07 2013 +

these stray fprintfs drive people demented

Change-Id: Ifee5c39423957bcc4708a7933c760d9467e2ac27

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5f544ef..a07f2bb 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -562,8 +562,6 @@ Desktop::~Desktop()
 
 void Desktop::Init()
 {
-fprintf (stderr, Desktop::Init()\n);
-
 RTL_LOGFILE_CONTEXT( aLog, desktop (cd13) ::Desktop::Init );
 SetBootstrapStatus(BS_OK);
 
@@ -595,8 +593,6 @@ void Desktop::Init()
 }
 }
 
-fprintf( stderr, OfficeIPCThread %d ...\n, m_aBootstrapError == BE_OK );
-
 if ( 1 )
 {
 const CommandLineArgs rCmdLineArgs = GetCommandLineArgs();
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 294fd1a..cc69ccb 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -341,7 +341,6 @@ SalPrinter* GtkInstance::CreatePrinter( SalInfoPrinter* 
pInfoPrinter )
 {
 #if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
 mbPrinterInit = true;
-fprintf(stderr, gtk printer\n);
 return new GtkSalPrinter( pInfoPrinter );
 #else
 return Superclass_t::CreatePrinter( pInfoPrinter );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits