[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - vcl/unx

[Caolán McNamara]

 vcl/unx/generic/printer/jobdata.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 30b8a32ff0e165df98a2cf459b95f9a6f95282a9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 20 15:17:09 2016 +0000

    Related: rhbz#1149116 collateEquals was set with OString::boolean
    
    but extracted with toInt32()
    
    since
    
    commit c76cd71fe9bdefaef3f33f8ca193c32e3ab112ed
    
        fdo#41524: CUPS printing: use "collate" option when PDF is available
    
    though actual reported problem works fine for me with default f23
    configuration already, this looks suspicious however
    
    Change-Id: I6fcb5df8039296c0e8b0fe931cb490396182de38
    Reviewed-on: https://gerrit.libreoffice.org/21629
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit e220ba8610f8315af473a230565daa978ca6a16c)
    Reviewed-on: https://gerrit.libreoffice.org/21632
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 9169b01..2c344cc 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -250,7 +250,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
         }
         else if (aLine.startsWith(collateEquals))
         {
-            rJobData.m_bCollate = aLine.copy(RTL_CONSTASCII_LENGTH(collateEquals)).toInt32();
+            rJobData.m_bCollate = aLine.copy(RTL_CONSTASCII_LENGTH(collateEquals)).toBoolean();
         }
         else if (aLine.startsWith(margindajustmentEquals))
         {