vcl/unx/generic/printer/ppdparser.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 83748e50026bff56aaa1c2f7bfb0b1557344d72c
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Sep 12 13:15:52 2017 +0100
CUPS_VERSION_MAJOR is not defined
on arm
Change-Id: Ibeca07800d02f5f69046c7bdee57143c78c03aad
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 97551db1983b..3f9a0d131677 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -619,6 +619,7 @@ PPDParser::PPDParser( const OUString& rFile,
std::vector<PPDKey*> keys) :
if ( pKey ) {
PPDKey* pImageableAreas = new PPDKey("ImageableArea");
PPDKey* pPaperDimensions = new PPDKey("PaperDimension");
+#if defined(CUPS_VERSION_MAJOR)
#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 7) || CUPS_VERSION_MAJOR
> 1
for (int i = 0; i < pKey->countValues(); i++) {
const PPDValue* pValue = pKey -> getValue(i);
@@ -648,6 +649,7 @@ PPDParser::PPDParser( const OUString& rFile,
std::vector<PPDKey*> keys) :
}
}
#endif // HAVE_CUPS_API_1_7
+#endif
insertKey("ImageableArea", pImageableAreas);
insertKey("PaperDimension", pPaperDimensions);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
