diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-07-15 18:11:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-07-15 18:15:07 +0200 |
| commit | 08960441558743f222280637985690bb8b41b861 (patch) | |
| tree | 91e0608078dd63b58eb517d6acbd504815aa6c9d | |
| parent | 24d0a0549d068e9a1c111ec1d574b478642b80ef (diff) | |
Related tdf#37531: Handle conversion args sent over pipe
However:
* "soffice --convert-to pdf foo.odt" creates foo.pdf in the called soffice's
CWD, not the caller's.
* "soffice --cat foo.odt" prints to the called soffice's stdout, not the
caller's (though this will unlikely ever be fixed), and then also terminates
the called soffice.
Change-Id: I2f4420881b2bee00b0476c76f739966c13101be4
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 99d4994cfd32..5da15848dda0 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -1048,6 +1048,12 @@ bool IpcThread::process(OString const & arguments, bool * waitProcessed) { pRequest->aPrintToList = aCmdLineArgs->GetPrintToList(); pRequest->aPrinterName = aCmdLineArgs->GetPrinterName(); bDocRequestSent |= !( pRequest->aPrintToList.empty() || pRequest->aPrinterName.isEmpty() ); + pRequest->aConversionList = aCmdLineArgs->GetConversionList(); + pRequest->aConversionParams = aCmdLineArgs->GetConversionParams(); + pRequest->aConversionOut = aCmdLineArgs->GetConversionOut(); + pRequest->aInFilter = aCmdLineArgs->GetInFilter(); + pRequest->bTextCat = aCmdLineArgs->IsTextCat(); + bDocRequestSent |= !pRequest->aConversionList.empty(); if ( !rCurrentCmdLineArgs.IsInvisible() ) { |