summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-02-06 17:41:45 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-02-06 21:56:16 +0100
commita7521570c95cf4ecd3eb4324581ad09ff30ff70a (patch)
tree5189c9d658dff40a237760259c7e76692ca16caf /vcl/source
parent0160fd3fb4525f73bd51e1c4e1f00db56f652bf8 (diff)
Harmonize SalPrinterQueueInfo::mnJobs and QueueInfo::mnJobs
The former was of type sal_uLong while the latter has been of (potentially smaller) type sal_uInt32 ever since at least a02e8af56ba44e9bb3ba2c6e995a23745ee629a0 "INTEGRATION: CWS hedaburemove01", and Printer::GetQueueInfo (vcl/source/gdi/print.cxx) assigns from the former to the latter (so potentially truncates). But it appears the only non-zero values ever stored in the former are QUEUE_JOBS_DONTKNOW (defined as 0xFFFFFFFF in include/vcl/prntypes.hxx, fitting into sal_uInt32) and Windows-specific PRINTER_INFO_2W::cJobs (in WinSalInstance::GetPrinterQueueState, vcl/win/gdi/salprn.cxx), which is of Windows type DWORD, i.e., unsigned 32-bit, compatible with sal_uInt32. So change the former (and QUEUE_JOBS_DONTKNOW) to sal_uInt32, too. Change-Id: I0cc993d26831313b362cc31ee06fd879c854d146 Reviewed-on: https://gerrit.libreoffice.org/67468 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/gdi/jobset.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 7fc650c38e07..cc82ae183875 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -20,6 +20,7 @@
#include <rtl/alloc.h>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
+#include <tools/solar.h>
#include <tools/stream.hxx>
#include <vcl/jobset.hxx>
#include <jobset.h>