summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/salprn.hxx4
-rw-r--r--vcl/source/gdi/print.cxx10
-rw-r--r--vcl/win/source/gdi/salprn.cxx54
3 files changed, 35 insertions, 33 deletions
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index b7640a48d3e9..d3f89ddada58 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -39,8 +39,8 @@ struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
OUString maDriver;
OUString maLocation;
OUString maComment;
- sal_uLong mnStatus;
- sal_uLong mnJobs;
+ PrintQueueFlags mnStatus;
+ sal_uLong mnJobs;
OUString* mpSysData;
SalPrinterQueueInfo();
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index c861466c21ff..b920cea2da08 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -358,7 +358,7 @@ bool Printer::HasMirroredGraphics() const
// QueueInfo
QueueInfo::QueueInfo()
{
- mnStatus = 0;
+ mnStatus = PrintQueueFlags::NONE;
mnJobs = 0;
}
@@ -395,7 +395,7 @@ SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo )
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8);
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8);
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8);
- rOStream.WriteUInt32( rInfo.mnStatus );
+ rOStream.WriteUInt32( static_cast<sal_uInt32>(rInfo.mnStatus) );
rOStream.WriteUInt32( rInfo.mnJobs );
return rOStream;
@@ -409,7 +409,9 @@ SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo )
rInfo.maDriver = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
rInfo.maLocation = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
rInfo.maComment = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
- rIStream.ReadUInt32( rInfo.mnStatus );
+ sal_uInt32 nTmp;
+ rIStream.ReadUInt32( nTmp );
+ rInfo.mnStatus = static_cast<PrintQueueFlags>(nTmp);
rIStream.ReadUInt32( rInfo.mnJobs );
return rIStream;
@@ -417,7 +419,7 @@ SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo )
SalPrinterQueueInfo::SalPrinterQueueInfo()
{
- mnStatus = 0;
+ mnStatus = PrintQueueFlags::NONE;
mnJobs = QUEUE_JOBS_DONTKNOW;
mpSysData = NULL;
}
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 300d2aaf172e..f6c00be989c8 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -100,59 +100,59 @@ static LPDEVMODEW SAL_DEVMODE_W( const ImplJobSetup* pSetupData )
return pRet;
}
-static sal_uLong ImplWinQueueStatusToSal( DWORD nWinStatus )
+static PrintQueueFlags ImplWinQueueStatusToSal( DWORD nWinStatus )
{
- sal_uLong nStatus = 0;
+ PrintQueueFlags nStatus = PrintQueueFlags::NONE;
if ( nWinStatus & PRINTER_STATUS_PAUSED )
- nStatus |= QUEUE_STATUS_PAUSED;
+ nStatus |= PrintQueueFlags::Paused;
if ( nWinStatus & PRINTER_STATUS_ERROR )
- nStatus |= QUEUE_STATUS_ERROR;
+ nStatus |= PrintQueueFlags::Error;
if ( nWinStatus & PRINTER_STATUS_PENDING_DELETION )
- nStatus |= QUEUE_STATUS_PENDING_DELETION;
+ nStatus |= PrintQueueFlags::PendingDeletion;
if ( nWinStatus & PRINTER_STATUS_PAPER_JAM )
- nStatus |= QUEUE_STATUS_PAPER_JAM;
+ nStatus |= PrintQueueFlags::PaperJam;
if ( nWinStatus & PRINTER_STATUS_PAPER_OUT )
- nStatus |= QUEUE_STATUS_PAPER_OUT;
+ nStatus |= PrintQueueFlags::PaperOut;
if ( nWinStatus & PRINTER_STATUS_MANUAL_FEED )
- nStatus |= QUEUE_STATUS_MANUAL_FEED;
+ nStatus |= PrintQueueFlags::ManualFeed;
if ( nWinStatus & PRINTER_STATUS_PAPER_PROBLEM )
- nStatus |= QUEUE_STATUS_PAPER_PROBLEM;
+ nStatus |= PrintQueueFlags::PaperProblem;
if ( nWinStatus & PRINTER_STATUS_OFFLINE )
- nStatus |= QUEUE_STATUS_OFFLINE;
+ nStatus |= PrintQueueFlags::Offline;
if ( nWinStatus & PRINTER_STATUS_IO_ACTIVE )
- nStatus |= QUEUE_STATUS_IO_ACTIVE;
+ nStatus |= PrintQueueFlags::IOActive;
if ( nWinStatus & PRINTER_STATUS_BUSY )
- nStatus |= QUEUE_STATUS_BUSY;
+ nStatus |= PrintQueueFlags::Busy;
if ( nWinStatus & PRINTER_STATUS_PRINTING )
- nStatus |= QUEUE_STATUS_PRINTING;
+ nStatus |= PrintQueueFlags::Printing;
if ( nWinStatus & PRINTER_STATUS_OUTPUT_BIN_FULL )
- nStatus |= QUEUE_STATUS_OUTPUT_BIN_FULL;
+ nStatus |= PrintQueueFlags::OutputBinFull;
if ( nWinStatus & PRINTER_STATUS_WAITING )
- nStatus |= QUEUE_STATUS_WAITING;
+ nStatus |= PrintQueueFlags::Waiting;
if ( nWinStatus & PRINTER_STATUS_PROCESSING )
- nStatus |= QUEUE_STATUS_PROCESSING;
+ nStatus |= PrintQueueFlags::Processing;
if ( nWinStatus & PRINTER_STATUS_INITIALIZING )
- nStatus |= QUEUE_STATUS_INITIALIZING;
+ nStatus |= PrintQueueFlags::Initializing;
if ( nWinStatus & PRINTER_STATUS_WARMING_UP )
- nStatus |= QUEUE_STATUS_WARMING_UP;
+ nStatus |= PrintQueueFlags::WarmingUp;
if ( nWinStatus & PRINTER_STATUS_TONER_LOW )
- nStatus |= QUEUE_STATUS_TONER_LOW;
+ nStatus |= PrintQueueFlags::TonerLow;
if ( nWinStatus & PRINTER_STATUS_NO_TONER )
- nStatus |= QUEUE_STATUS_NO_TONER;
+ nStatus |= PrintQueueFlags::NoToner;
if ( nWinStatus & PRINTER_STATUS_PAGE_PUNT )
- nStatus |= QUEUE_STATUS_PAGE_PUNT;
+ nStatus |= PrintQueueFlags::PagePunt;
if ( nWinStatus & PRINTER_STATUS_USER_INTERVENTION )
- nStatus |= QUEUE_STATUS_USER_INTERVENTION;
+ nStatus |= PrintQueueFlags::UserIntervention;
if ( nWinStatus & PRINTER_STATUS_OUT_OF_MEMORY )
- nStatus |= QUEUE_STATUS_OUT_OF_MEMORY;
+ nStatus |= PrintQueueFlags::OutOfMemory;
if ( nWinStatus & PRINTER_STATUS_DOOR_OPEN )
- nStatus |= QUEUE_STATUS_DOOR_OPEN;
+ nStatus |= PrintQueueFlags::DoorOpen;
if ( nWinStatus & PRINTER_STATUS_SERVER_UNKNOWN )
- nStatus |= QUEUE_STATUS_SERVER_UNKNOWN;
+ nStatus |= PrintQueueFlags::StatusUnknown;
if ( nWinStatus & PRINTER_STATUS_POWER_SAVE )
- nStatus |= QUEUE_STATUS_POWER_SAVE;
+ nStatus |= PrintQueueFlags::PowerSave;
if ( !nStatus && !(nWinStatus & PRINTER_STATUS_NOT_AVAILABLE) )
- nStatus |= QUEUE_STATUS_READY;
+ nStatus |= PrintQueueFlags::Ready;
return nStatus;
}
generated by cgit (git 2.34.1) at 2025-02-22 16:52:20 +0000