|
 |
46fb8c6 |
From e220ba8610f8315af473a230565daa978ca6a16c Mon Sep 17 00:00:00 2001
|
|
|
46fb8c6 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
46fb8c6 |
Date: Wed, 20 Jan 2016 15:17:09 +0000
|
|
|
46fb8c6 |
Subject: [PATCH] Related: rhbz#1149116 collateEquals was set with
|
|
|
46fb8c6 |
OString::boolean
|
|
|
46fb8c6 |
|
|
|
46fb8c6 |
but extracted with toInt32()
|
|
|
46fb8c6 |
|
|
|
46fb8c6 |
since
|
|
|
46fb8c6 |
|
|
|
46fb8c6 |
commit c76cd71fe9bdefaef3f33f8ca193c32e3ab112ed
|
|
|
46fb8c6 |
|
|
|
46fb8c6 |
fdo#41524: CUPS printing: use "collate" option when PDF is available
|
|
|
46fb8c6 |
|
|
|
46fb8c6 |
though actual reported problem works fine for me with default f23
|
|
|
46fb8c6 |
configuration already, this looks suspicious however
|
|
|
46fb8c6 |
|
|
|
46fb8c6 |
Change-Id: I6fcb5df8039296c0e8b0fe931cb490396182de38
|
|
|
46fb8c6 |
Reviewed-on: https://gerrit.libreoffice.org/21629
|
|
|
46fb8c6 |
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
|
46fb8c6 |
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
|
46fb8c6 |
---
|
|
|
46fb8c6 |
vcl/unx/generic/printer/jobdata.cxx | 2 +-
|
|
|
46fb8c6 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
46fb8c6 |
|
|
|
46fb8c6 |
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
|
|
|
46fb8c6 |
index a9f7c30..309309e 100644
|
|
|
46fb8c6 |
--- a/vcl/unx/generic/printer/jobdata.cxx
|
|
|
46fb8c6 |
+++ b/vcl/unx/generic/printer/jobdata.cxx
|
|
|
46fb8c6 |
@@ -251,7 +251,7 @@ bool JobData::constructFromStreamBuffer( void* pData, sal_uInt32 bytes, JobData&
|
|
|
46fb8c6 |
}
|
|
|
46fb8c6 |
else if (aLine.startsWith(collateEquals))
|
|
|
46fb8c6 |
{
|
|
|
46fb8c6 |
- rJobData.m_bCollate = aLine.copy(RTL_CONSTASCII_LENGTH(collateEquals)).toInt32();
|
|
|
46fb8c6 |
+ rJobData.m_bCollate = aLine.copy(RTL_CONSTASCII_LENGTH(collateEquals)).toBoolean();
|
|
|
46fb8c6 |
}
|
|
|
46fb8c6 |
else if (aLine.startsWith(margindajustmentEquals))
|
|
|
46fb8c6 |
{
|
|
|
46fb8c6 |
--
|
|
|
46fb8c6 |
2.5.0
|
|
|
46fb8c6 |
|