Kaydet (Commit) a7521570 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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
a02e8af5 "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: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 0160fd3f
......@@ -273,9 +273,6 @@ blacklist:
- vcl/mapmod.hxx
- tools/color.hxx
- tools/gen.hxx
include/vcl/prntypes.hxx:
# Needed for macro
- tools/solar.h
include/vcl/transfer.hxx:
# base class has to be a complete type
- com/sun/star/datatransfer/XTransferable2.hpp
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_PRNTYPES_HXX
#define INCLUDED_VCL_PRNTYPES_HXX
#include <tools/solar.h>
#include <sal/types.h>
#include <o3tl/typed_flags_set.hxx>
......@@ -65,7 +65,7 @@ namespace o3tl
template<> struct typed_flags<PrintQueueFlags> : is_typed_flags<PrintQueueFlags, 0x01ffffff> {};
}
#define QUEUE_JOBS_DONTKNOW (sal_uLong(0xFFFFFFFF))
#define QUEUE_JOBS_DONTKNOW (sal_uInt32(0xFFFFFFFF))
enum class PrinterCapType
......
......@@ -41,7 +41,7 @@ struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
OUString maLocation;
OUString maComment;
PrintQueueFlags mnStatus;
sal_uLong mnJobs;
sal_uInt32 mnJobs;
std::unique_ptr<OUString> mpPortName; // only used by Windows backend
SalPrinterQueueInfo();
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment