diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2013-12-06 20:43:24 +0000 |
|---|---|---|
| committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2013-12-06 20:54:56 +0000 |
| commit | 85b6167276e6dc1298e9343af06cafb0ea1fde98 (patch) | |
| tree | ebd543c190759c0858093f9f4f40f16538be4cdc | |
| parent | 669b9c993dc771ada788d23296252f141462398d (diff) | |
fdo#60705 Don't discard valid printing options.
PPDValue::m_aValue is simply an optional parameter description, whereas
m_aOption is the actual option being passed to cups.
For example, for the key "PageSize" (which was previously passed
without problem), a typical PPDValue could be:
m_aOption = "A4"
m_aValue = "<</PageSize[595.3 841.9]/ImagingBBox null>>setpagedevice"
However for the key "InputSlot" (which was previously not passed
to the printer), a typical PPDValue could be:
m_aOption = "RearPaperFeedSlot"
m_aValue = ""
Change-Id: I7959317c9f9d67bfafd911e710927a70edfa8792
(cherry picked from commit 4c160e3d54ec1c6c04bc80c6cec7ee58e20af3bb)
| -rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 15e1ca63bdb0..52b6bfbc5509 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -618,7 +618,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner { const PPDKey* pKey = aKeys[i]; const PPDValue* pValue = rJob.m_aContext.getValue( pKey ); - if(pValue && pValue->m_eType == eInvocation && !pValue->m_aValue.isEmpty() ) + if(pValue && pValue->m_eType == eInvocation && !pValue->m_aOption.isEmpty() ) { OString aKey = OUStringToOString( pKey->getKey(), RTL_TEXTENCODING_ASCII_US ); OString aValue = OUStringToOString( pValue->m_aOption, RTL_TEXTENCODING_ASCII_US ); |