diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-31 14:18:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-01 06:46:46 +0000 |
| commit | 76cacf1a6045b133ba07c84c67b34f85a389c81e (patch) | |
| tree | f963270ddd3baf80e9a0e0482f7c103c61daa223 /vcl | |
| parent | b860b73f2ba3322663106eeb1de7e07af6959248 (diff) | |
Convert printer enums to scoped enums
Change-Id: Ic0f9d57181809b3fef3abbad462456fc2d5ced55
Reviewed-on: https://gerrit.libreoffice.org/25719
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/print.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/gdi/print2.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/print3.cxx | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index c0cfdf590c7a..c0d016f7ba1b 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -88,12 +88,12 @@ void ImplUpdateJobSetupPaper( JobSetup& rJobSetup ) // PrinterOptions PrinterOptions::PrinterOptions() : mbReduceTransparency( false ), - meReducedTransparencyMode( PRINTER_TRANSPARENCY_AUTO ), + meReducedTransparencyMode( PrinterTransparencyMode::Auto ), mbReduceGradients( false ), - meReducedGradientsMode( PRINTER_GRADIENT_STRIPES ), + meReducedGradientsMode( PrinterGradientMode::Stripes ), mnReducedGradientStepCount( 64 ), mbReduceBitmaps( false ), - meReducedBitmapMode( PRINTER_BITMAP_NORMAL ), + meReducedBitmapMode( PrinterBitmapMode::Normal ), mnReducedBitmapResolution( 200 ), mbReducedBitmapsIncludeTransparency( true ), mbConvertToGreyscales( false ), diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index d7056bc897e8..c2e589d2cce0 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -1346,7 +1346,7 @@ void Printer::DrawGradientEx( OutputDevice* pOut, const Rectangle& rRect, const if( rPrinterOptions.IsReduceGradients() ) { - if( PRINTER_GRADIENT_STRIPES == rPrinterOptions.GetReducedGradientMode() ) + if( PrinterGradientMode::Stripes == rPrinterOptions.GetReducedGradientMode() ) { if( !rGradient.GetSteps() || ( rGradient.GetSteps() > rPrinterOptions.GetReducedGradientStepCount() ) ) { diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index bb8081e54320..f2e73c623fb6 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -1215,12 +1215,12 @@ DrawModeFlags PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMe if( rPrinterOptions.IsReduceBitmaps() ) { // calculate maximum resolution for bitmap graphics - if( PRINTER_BITMAP_OPTIMAL == rPrinterOptions.GetReducedBitmapMode() ) + if( PrinterBitmapMode::Optimal == rPrinterOptions.GetReducedBitmapMode() ) { nMaxBmpDPIX = std::min( sal_Int32(OPTIMAL_BMP_RESOLUTION), nMaxBmpDPIX ); nMaxBmpDPIY = std::min( sal_Int32(OPTIMAL_BMP_RESOLUTION), nMaxBmpDPIY ); } - else if( PRINTER_BITMAP_NORMAL == rPrinterOptions.GetReducedBitmapMode() ) + else if( PrinterBitmapMode::Normal == rPrinterOptions.GetReducedBitmapMode() ) { nMaxBmpDPIX = std::min( sal_Int32(NORMAL_BMP_RESOLUTION), nMaxBmpDPIX ); nMaxBmpDPIY = std::min( sal_Int32(NORMAL_BMP_RESOLUTION), nMaxBmpDPIY ); @@ -1241,7 +1241,7 @@ DrawModeFlags PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMe } // disable transparency output - if( rPrinterOptions.IsReduceTransparency() && ( PRINTER_TRANSPARENCY_NONE == rPrinterOptions.GetReducedTransparencyMode() ) ) + if( rPrinterOptions.IsReduceTransparency() && ( PrinterTransparencyMode::NONE == rPrinterOptions.GetReducedTransparencyMode() ) ) { mpImplData->mxPrinter->SetDrawMode( mpImplData->mxPrinter->GetDrawMode() | DrawModeFlags::NoTransparency ); } @@ -1256,7 +1256,7 @@ DrawModeFlags PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMe } mpImplData->mxPrinter->RemoveTransparenciesFromMetaFile( i_rIn, o_rOut, nMaxBmpDPIX, nMaxBmpDPIY, rPrinterOptions.IsReduceTransparency(), - rPrinterOptions.GetReducedTransparencyMode() == PRINTER_TRANSPARENCY_AUTO, + rPrinterOptions.GetReducedTransparencyMode() == PrinterTransparencyMode::Auto, rPrinterOptions.IsReduceBitmaps() && rPrinterOptions.IsReducedBitmapIncludesTransparency(), aBg ); |