summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-30 10:55:13 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-31 06:27:16 +0000
commitfafb2cf4de2eb2de46afab0738b7fd95663c0164 (patch)
tree237f13421f8d87e12ff27bf8fdf5b1925bf485b2 /vcl
parentfe6ac2d11a6f870094bd630759f998d8ed9272e3 (diff)
Convert PrinterSupport to scoped enum
Change-Id: I2bde7261b8e8f31e6dd5a02cd4130156a04b8a7f Reviewed-on: https://gerrit.libreoffice.org/25657 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/print.cxx20
-rw-r--r--vcl/source/window/printdlg.cxx2
-rw-r--r--vcl/unx/generic/print/genprnpsp.cxx2
3 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 8c267dbb5a5d..c0cfdf590c7a 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1031,23 +1031,23 @@ bool Printer::HasSupport( PrinterSupport eFeature ) const
{
switch ( eFeature )
{
- case SUPPORT_SET_ORIENTATION:
+ case PrinterSupport::SetOrientation:
return GetCapabilities( PrinterCapType::SetOrientation ) != 0;
- case SUPPORT_SET_PAPERBIN:
+ case PrinterSupport::SetPaperBin:
return GetCapabilities( PrinterCapType::SetPaperBin ) != 0;
- case SUPPORT_SET_PAPERSIZE:
+ case PrinterSupport::SetPaperSize:
return GetCapabilities( PrinterCapType::SetPaperSize ) != 0;
- case SUPPORT_SET_PAPER:
+ case PrinterSupport::SetPaper:
return GetCapabilities( PrinterCapType::SetPaper ) != 0;
- case SUPPORT_COPY:
+ case PrinterSupport::Copy:
return (GetCapabilities( PrinterCapType::Copies ) != 0);
- case SUPPORT_COLLATECOPY:
+ case PrinterSupport::CollateCopy:
return (GetCapabilities( PrinterCapType::CollateCopies ) != 0);
- case SUPPORT_SETUPDIALOG:
+ case PrinterSupport::SetupDialog:
return GetCapabilities( PrinterCapType::SupportDialog ) != 0;
- case SUPPORT_FAX:
+ case PrinterSupport::Fax:
return GetCapabilities( PrinterCapType::Fax ) != 0;
- case SUPPORT_PDF:
+ case PrinterSupport::Pdf:
return GetCapabilities( PrinterCapType::PDF ) != 0;
}
@@ -1330,7 +1330,7 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe
// all paper sizes with portrait orientation only!!
if ( pSetupData->mePaperFormat == PAPER_USER &&
nLandscapeAngle != 0 &&
- HasSupport( SUPPORT_SET_ORIENTATION ))
+ HasSupport( PrinterSupport::SetOrientation ))
{
const long nRotatedWidth = pSetupData->mnPaperHeight;
const long nRotatedHeight = pSetupData->mnPaperWidth;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index c03d76fc7752..0363ea6a3a18 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1221,7 +1221,7 @@ void PrintDialog::checkControlDependencies()
maJobPage.mpCollateImage->SetImage( aImg );
// enable setup button only for printers that can be setup
- bool bHaveSetup = maPController->getPrinter()->HasSupport( SUPPORT_SETUPDIALOG );
+ bool bHaveSetup = maPController->getPrinter()->HasSupport( PrinterSupport::SetupDialog );
maJobPage.mpSetupButton->Enable(bHaveSetup);
}
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 3e2a17f2e75f..63495e9adec6 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -1163,7 +1163,7 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo
{
if( bCollate )
{
- if (aPDFFiles.size() == 1 && xPrinter->HasSupport(SUPPORT_COLLATECOPY))
+ if (aPDFFiles.size() == 1 && xPrinter->HasSupport(PrinterSupport::CollateCopy))
{
m_aJobData.setCollate( true );
m_aJobData.m_nCopies = nCopies;