a7521570c9
The former was of type sal_uLong while the latter has been of (potentially
smaller) type sal_uInt32 ever since at least
a02e8af56b "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>
122 lines
5.2 KiB
C++
122 lines
5.2 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_VCL_INC_SALPRN_HXX
|
|
#define INCLUDED_VCL_INC_SALPRN_HXX
|
|
|
|
#include <i18nutil/paper.hxx>
|
|
#include <vcl/prntypes.hxx>
|
|
#include <vcl/dllapi.h>
|
|
|
|
#include "salptype.hxx"
|
|
|
|
#include <vector>
|
|
|
|
class SalGraphics;
|
|
class SalFrame;
|
|
class ImplJobSetup;
|
|
namespace vcl { class PrinterController; }
|
|
namespace weld { class Window; }
|
|
|
|
struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
|
|
{
|
|
OUString maPrinterName;
|
|
OUString maDriver;
|
|
OUString maLocation;
|
|
OUString maComment;
|
|
PrintQueueFlags mnStatus;
|
|
sal_uInt32 mnJobs;
|
|
std::unique_ptr<OUString> mpPortName; // only used by Windows backend
|
|
|
|
SalPrinterQueueInfo();
|
|
~SalPrinterQueueInfo();
|
|
};
|
|
|
|
class VCL_PLUGIN_PUBLIC SalInfoPrinter
|
|
{
|
|
public:
|
|
std::vector< PaperInfo > m_aPaperFormats; // all printer supported formats
|
|
bool m_bPapersInit; // set to true after InitPaperFormats
|
|
|
|
SalInfoPrinter() : m_bPapersInit( false ) {}
|
|
virtual ~SalInfoPrinter();
|
|
|
|
// SalGraphics or NULL, but two Graphics for all SalFrames
|
|
// must be returned
|
|
virtual SalGraphics* AcquireGraphics() = 0;
|
|
virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0;
|
|
|
|
virtual bool Setup(weld::Window* pFrame, ImplJobSetup* pSetupData) = 0;
|
|
// This function set the driver data and
|
|
// set the new indepen data in pSetupData
|
|
virtual bool SetPrinterData( ImplJobSetup* pSetupData ) = 0;
|
|
// This function merged the indepen driver data
|
|
// and set the new indepen data in pSetupData
|
|
// Only the data must changed, where the bit
|
|
// in nFlags is set
|
|
virtual bool SetData( JobSetFlags nFlags, ImplJobSetup* pSetupData ) = 0;
|
|
|
|
virtual void GetPageInfo( const ImplJobSetup* pSetupData,
|
|
long& rOutWidth, long& rOutHeight,
|
|
Point& rPageOffset,
|
|
Size& rPaperSize ) = 0;
|
|
virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) = 0;
|
|
virtual sal_uInt16 GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0;
|
|
virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt16 nPaperBin ) = 0;
|
|
// fills m_aPaperFormats and sets m_bPapersInit to true
|
|
virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0;
|
|
// returns angle that a landscape page will be turned counterclockwise wrt to portrait
|
|
virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) = 0;
|
|
};
|
|
|
|
class VCL_PLUGIN_PUBLIC SalPrinter
|
|
{
|
|
SalPrinter( const SalPrinter& ) = delete;
|
|
SalPrinter& operator=( const SalPrinter& ) = delete;
|
|
|
|
public:
|
|
SalPrinter() {}
|
|
virtual ~SalPrinter();
|
|
|
|
virtual bool StartJob( const OUString* pFileName,
|
|
const OUString& rJobName,
|
|
const OUString& rAppName,
|
|
sal_uInt32 nCopies,
|
|
bool bCollate,
|
|
bool bDirect,
|
|
ImplJobSetup* pSetupData ) = 0;
|
|
|
|
// implement for pull model print systems only,
|
|
// default implementations (see salvtables.cxx) just returns false
|
|
virtual bool StartJob( const OUString* pFileName,
|
|
const OUString& rJobName,
|
|
const OUString& rAppName,
|
|
ImplJobSetup* pSetupData,
|
|
vcl::PrinterController& rController );
|
|
|
|
virtual bool EndJob() = 0;
|
|
virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) = 0;
|
|
virtual void EndPage() = 0;
|
|
virtual SalPrinterError GetErrorCode() { return SalPrinterError::NONE; }
|
|
|
|
};
|
|
|
|
#endif // INCLUDED_VCL_INC_SALPRN_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|