mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

desktop, sysui: let --convert-to imply --headless

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

Change-Id: I18b85837239d9450743f05d94bb2673c7d13246d
This commit is contained in:
Miklos Vajna
2014-12-22 10:33:50 +01:00
parent 3c40bd24c5
commit fe5527f1c6
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/source/app/cmdlineargs.cxx
View File

@@ -465,6 +465,8 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bOpenEvent = false; bOpenEvent = false;
bConversionEvent = true; bConversionEvent = true;
bConversionParamsEvent = true; bConversionParamsEvent = true;
// It doesn't make sense to use convert-to without headless.
setHeadless();
} }
else if ( oArg == "print-to-file" ) else if ( oArg == "print-to-file" )
{ {

2
desktop/source/app/cmdlinehelp.cxx
View File

@@ -79,7 +79,7 @@ namespace desktop
"don't show startup screen.\n"\ "don't show startup screen.\n"\
"don't check for remote instances using the installation\n"\ "don't check for remote instances using the installation\n"\
"don't start with an empty document\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"\ "show this message and exit.\n"\
"display the version information.\n"\ "display the version information.\n"\
"create new text document.\n"\ "create new text document.\n"\

2
sysui/desktop/man/libreoffice.1
View File

@@ -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... \fB\-\-convert\-to\fR output_file_extension[:output_filter_name] [\-\-outdir output_dir] \fIfile\fR...
Batch converts files. Batch converts files.
If \fI\-\-outdir\fR is not specified then the current working directory is used as the output directory 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: Examples: