diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-07-15 23:20:35 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-07-15 23:20:35 +0200 |
| commit | a2c557d80ac68c06ea59586245a7431e061938f0 (patch) | |
| tree | 996c9fb0b6dac9b098aa5a396e584c04b5ed9e94 | |
| parent | 8d8668be3444560de127274201a3ab68b1dff950 (diff) | |
Related tdf#37531: Make --cat headless/hidden like --convert-to
...which automatically takes care of the open problem from
08960441558743f222280637985690bb8b41b861 "Related tdf#37531: Handle conversion args
sent over pipe" that --cat terminates the called soffice.
Change-Id: Ief8cdf8c1335749dad1504966d635e0519fe92f7
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 9 | ||||
| -rw-r--r-- | desktop/unx/source/args.c | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 8fe553206895..344dd4a69ea3 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -198,6 +198,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) m_conversionparams = "txt:Text"; bOpenEvent = false; bConversionEvent = true; + setHeadless(); } else if ( oArg == "quickstart" ) { diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index bf7ef5931ee7..3bbb191da359 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -209,7 +209,8 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest if ( aDispatchRequest.aRequestType == REQUEST_PRINT || aDispatchRequest.aRequestType == REQUEST_PRINTTO || aDispatchRequest.aRequestType == REQUEST_BATCHPRINT || - aDispatchRequest.aRequestType == REQUEST_CONVERSION) + aDispatchRequest.aRequestType == REQUEST_CONVERSION || + aDispatchRequest.aRequestType == REQUEST_CAT) nCount++; Sequence < PropertyValue > aArgs( nCount ); @@ -221,7 +222,8 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest if ( aDispatchRequest.aRequestType == REQUEST_PRINT || aDispatchRequest.aRequestType == REQUEST_PRINTTO || aDispatchRequest.aRequestType == REQUEST_BATCHPRINT || - aDispatchRequest.aRequestType == REQUEST_CONVERSION) + aDispatchRequest.aRequestType == REQUEST_CONVERSION || + aDispatchRequest.aRequestType == REQUEST_CAT) { aArgs[1].Name = "ReadOnly"; aArgs[2].Name = "OpenNewView"; @@ -257,7 +259,8 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest if ( aDispatchRequest.aRequestType == REQUEST_PRINT || aDispatchRequest.aRequestType == REQUEST_PRINTTO || aDispatchRequest.aRequestType == REQUEST_BATCHPRINT || - aDispatchRequest.aRequestType == REQUEST_CONVERSION) + aDispatchRequest.aRequestType == REQUEST_CONVERSION || + aDispatchRequest.aRequestType == REQUEST_CAT) { // documents opened for printing are opened readonly because they must be opened as a new document and this // document could be open already diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c index 79f28511b108..bc4c960a2583 100644 --- a/desktop/unx/source/args.c +++ b/desktop/unx/source/args.c @@ -39,6 +39,7 @@ static struct { { "quickstart", 1, 0, 0, 0, NULL }, { "minimized", 1, 0, 0, 0, NULL }, { "convert-to", 1, 0, 0, 0, NULL }, + { "cat", 1, 0, 0, 0, NULL }, /* pagein bits */ { "writer", 0, 0, 0, 0, "pagein-writer" }, |