diff options
| author | Eike Rathke <erack@redhat.com> | 2021-07-20 23:09:59 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-07-25 15:54:14 +0200 |
| commit | 55f0121dd7ed2d7e84adc597bdd24ca40e0b0ce4 (patch) | |
| tree | 756379e45c4c02260a6d083f08ccd148274d9817 /desktop | |
| parent | 2a265bdda19d86437c6eb4d8deb0057d5b45e97f (diff) | |
Related: tdf#135762 Suppress cout if not command line
Change-Id: I9431221aadf97739bb197871f25fa151ef4c391c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119294
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 0cda081c9aa3b3dcb363f97bac60c845ce9a13e0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119255
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 1c4d878614c5..0e39415d8fab 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -608,15 +608,17 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest else { sal_Int32 nFilterOptionsIndex = aFilter.indexOf(':'); - sal_Int32 nProps = ( 0 < nFilterOptionsIndex ) ? 3 : 2; + sal_Int32 nProps = ( 0 < nFilterOptionsIndex ) ? 4 : 3; if ( !aImgOut.isEmpty() ) nProps +=1; Sequence<PropertyValue> conversionProperties( nProps ); - conversionProperties[0].Name = "Overwrite"; - conversionProperties[0].Value <<= true; + conversionProperties[0].Name = "ConversionRequestOrigin"; + conversionProperties[0].Value <<= OUString("CommandLine"); + conversionProperties[1].Name = "Overwrite"; + conversionProperties[1].Value <<= true; - conversionProperties[1].Name = "FilterName"; + conversionProperties[2].Name = "FilterName"; if( 0 < nFilterOptionsIndex ) { OUString sFilterName = aFilter.copy(0, nFilterOptionsIndex); @@ -641,18 +643,19 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest bMultiFileTarget = (!aTok.isEmpty() && aTok.toInt32() != 0); } - conversionProperties[1].Value <<= sFilterName; + conversionProperties[2].Value <<= sFilterName; - conversionProperties[2].Name = "FilterOptions"; - conversionProperties[2].Value <<= sFilterOptions; + conversionProperties[3].Name = "FilterOptions"; + conversionProperties[3].Value <<= sFilterOptions; } else { - conversionProperties[1].Value <<= aFilter; + conversionProperties[2].Value <<= aFilter; } if ( !aImgOut.isEmpty() ) { + assert(conversionProperties[nProps-1].Name.isEmpty()); conversionProperties[nProps-1].Name = "ImageFilter"; conversionProperties[nProps-1].Value <<= aImgOut; } |