[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/unx

[Andrzej Hunt]

 include/vcl/jobdata.hxx             |    2 +-
 vcl/unx/generic/printer/cupsmgr.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c160e3d54ec1c6c04bc80c6cec7ee58e20af3bb
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Fri Dec 6 20:43:24 2013 +0000

    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

diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 15e1ca6..52b6bfb 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 );
commit 9fac96a50270b22061316e0a8ad1969ddf322507
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Fri Dec 6 19:51:39 2013 +0000

    Remove irrelevant comment.
    
    Change-Id: I4858667f781f4e8142dcd096222e98316cf1b9b6

diff --git a/include/vcl/jobdata.hxx b/include/vcl/jobdata.hxx
index 974c049..22ef0ee 100644
--- a/include/vcl/jobdata.hxx
+++ b/include/vcl/jobdata.hxx
@@ -67,7 +67,7 @@ struct VCL_DLLPUBLIC JobData
 
     void setCollate( bool bCollate );
     bool setPaper( int nWidth, int nHeight ); // dimensions in pt
-    bool setPaperBin( int nPaperBin ); // dimensions in pt
+    bool setPaperBin( int nPaperBin );
     void resolveDefaultBackend();
     void setDefaultBackend(bool bUsePDF);