From fe5527f1c6dc259af464a0593e86a2da2983b7ed Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Mon, 22 Dec 2014 10:33:50 +0100
Subject: [PATCH] desktop, sysui: let --convert-to imply --headless

It's easy to forget --headless before --convert-to, and it's hard to
image that would be intentional ever.

Change-Id: I18b85837239d9450743f05d94bb2673c7d13246d
---
 desktop/source/app/cmdlineargs.cxx | 2 ++
 desktop/source/app/cmdlinehelp.cxx | 2 +-
 sysui/desktop/man/libreoffice.1    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 6f2c1a637e67..e776ed17937a 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -465,6 +465,8 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
                 bOpenEvent = false;
                 bConversionEvent = true;
                 bConversionParamsEvent = true;
+                // It doesn't make sense to use convert-to without headless.
+                setHeadless();
             }
             else if ( oArg == "print-to-file" )
             {
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 614fa5a99a89..15db1176b1bc 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -79,7 +79,7 @@ namespace desktop
         "don't show startup screen.\n"\
         "don't check for remote instances using the installation\n"\
         "don't start with an empty document\n"\
-        "like invisible but no userinteraction at all.\n"\
+        "like invisible but no user interaction at all (implies --headless).\n"\
         "show this message and exit.\n"\
         "display the version information.\n"\
         "create new text document.\n"\
diff --git a/sysui/desktop/man/libreoffice.1 b/sysui/desktop/man/libreoffice.1
index 8847d535700f..f91101b7d346 100644
--- a/sysui/desktop/man/libreoffice.1
+++ b/sysui/desktop/man/libreoffice.1
@@ -63,7 +63,7 @@ Starts with a new Calc document.
 \fB\-\-convert\-to\fR output_file_extension[:output_filter_name] [\-\-outdir output_dir] \fIfile\fR...
 Batch converts files.
 If \fI\-\-outdir\fR is not specified then the current working directory is used as the output directory
-for the converted files.
+for the converted files. It implies \fI\-\-headless\fR.
 
 Examples: