vcl/headless/svpprn.cxx | 2 +-
vcl/unx/generic/print/genprnpsp.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 516bb69247c79ea0913856b9b053599f57ad90fb
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Mar 10 16:45:31 2017 +0100
The previous commit wasn't really thought through
Change-Id: I88e44e637e2ac93b4deed42a2d0f94b0a973c995
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 50a4432..0db8fd8 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -105,7 +105,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData& rData )
nPaperBin < pKey->countValues();
nPaperBin++ );
pJobSetup->SetPaperBin(
- (nPaperBin < 0 || nPaperBin >= pKey->countValues()
+ (nPaperBin == pKey->countValues()
|| pValue == pKey->getDefaultValue())
? 0xffff : nPaperBin);
}
diff --git a/vcl/unx/generic/print/genprnpsp.cxx
b/vcl/unx/generic/print/genprnpsp.cxx
index 1790571..f8321b7 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -201,7 +201,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData& rData )
nPaperBin < pKey->countValues();
nPaperBin++);
pJobSetup->SetPaperBin(
- nPaperBin < 0 || nPaperBin >= pKey->countValues() ? 0 : nPaperBin);
+ nPaperBin == pKey->countValues() ? 0 : nPaperBin);
}
// copy duplex
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
