diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-01 15:48:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
| commit | a881fd7e66294ada222e1d618a7d47a0549a2342 (patch) | |
| tree | cb928eb75f73e36ec3c93a44f2901617476e7fc8 /svtools | |
| parent | 8c5d90adaf1813c8f3a65487044b8fbe80f8bc85 (diff) | |
convert RasterOp to scoped enum
Change-Id: I136423c105316c9b5b18e64d04a248fd7ac5590b
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/svimpbox.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/headbar.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/graphic/grfcache.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index fcaf870d0fc8..d364a3b0b635 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -2904,7 +2904,7 @@ void SvImpLBox::PaintDDCursor( SvTreeListEntry* pInsertionPos ) else nY = 1; RasterOp eOldOp = pView->GetRasterOp(); - pView->SetRasterOp( ROP_INVERT ); + pView->SetRasterOp( RasterOp::Invert ); Color aOldLineColor = pView->GetLineColor(); pView->SetLineColor( Color( COL_BLACK ) ); pView->DrawLine( Point( 0, nY ), Point( aOutputSize.Width(), nY ) ); diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 2efc557a66ca..c3de48a856d4 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -251,7 +251,7 @@ void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ) aEndPos.X() = aRect2.Left()+6; } - SetRasterOp( ROP_INVERT ); + SetRasterOp( RasterOp::Invert ); DrawRect( aStartRect ); DrawLine( aStartPos, aEndPos ); if ( nEndPos > nStartPos ) @@ -274,7 +274,7 @@ void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ) Point( aEndPos.X()-3, aEndPos.Y()+1 ) ); DrawPixel( Point( aEndPos.X()-4, aEndPos.Y() ) ); } - SetRasterOp( ROP_OVERPAINT ); + SetRasterOp( RasterOp::OverPaint ); } void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh, diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 43f4d07b28c3..5d2bf627811c 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -676,7 +676,7 @@ bool GraphicDisplayCacheEntry::IsCacheableAsBitmap( const GDIMetaFile& rMtf, // these actions actually output something (that's // different from a bitmap) case MetaActionType::RASTEROP: - if( static_cast<MetaRasterOpAction*>(pAct)->GetRasterOp() == ROP_OVERPAINT ) + if( static_cast<MetaRasterOpAction*>(pAct)->GetRasterOp() == RasterOp::OverPaint ) break; SAL_FALLTHROUGH; case MetaActionType::PIXEL: diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 457d71f056ff..03ca1a5a5285 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -1287,7 +1287,7 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, // these actions actually output something (that's // different from a bitmap) case MetaActionType::RASTEROP: - if( static_cast<MetaRasterOpAction*>(pAct)->GetRasterOp() == ROP_OVERPAINT ) + if( static_cast<MetaRasterOpAction*>(pAct)->GetRasterOp() == RasterOp::OverPaint ) break; SAL_FALLTHROUGH; case MetaActionType::PIXEL: |