diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-06 14:48:16 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-13 17:45:57 +0200 |
| commit | af5ebbf7835441c767f91a620f109ee6722e57bd (patch) | |
| tree | c72b2a1ddb5aa0a0a369be7babd516a5592d5fac /canvas | |
| parent | 1156d11ef0bb2bc3d71ae9299656db4fed66f073 (diff) | |
create a macro library for implementing bit-flags types
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>,
changed from a macro- to a template-based solution. (Unfortunately MSVC 2012
does not support explicit conversion operators. Worked around that with
explicit #ifs rather than some HAVE_EXPLICIT_CONVERSION_OPERATORS and
SAL_EXPLICIT_CONVERSION_OPERATOR ainticipating we hopefully soon move to a
baseline that requires unconditional support for them.)
Change-Id: I4a89643b218d247e8e4a861faba458ec6dfe1396
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 8 | ||||
| -rw-r--r-- | canvas/source/vcl/spritecanvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/spritehelper.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 7f6ff6381779..f57e49812acc 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -584,7 +584,7 @@ namespace vclcanvas // poly-polygons, and don't have to output the gradient // twice for XOR - rOutDev.Push( PUSH_CLIPREGION ); + rOutDev.Push( PushFlags::CLIPREGION ); rOutDev.IntersectClipRegion( aPolygonDeviceRectOrig ); doGradientFill( rOutDev, rValues, @@ -609,7 +609,7 @@ namespace vclcanvas { const vcl::Region aPolyClipRegion( rPoly ); - rOutDev.Push( PUSH_CLIPREGION ); + rOutDev.Push( PushFlags::CLIPREGION ); rOutDev.SetClipRegion( aPolyClipRegion ); doGradientFill( rOutDev, @@ -1071,7 +1071,7 @@ namespace vclcanvas { const vcl::Region aPolyClipRegion( aPolyPoly ); - rOutDev.Push( PUSH_CLIPREGION ); + rOutDev.Push( PushFlags::CLIPREGION ); rOutDev.SetClipRegion( aPolyClipRegion ); textureFill( rOutDev, @@ -1088,7 +1088,7 @@ namespace vclcanvas if( mp2ndOutDev ) { OutputDevice& r2ndOutDev( mp2ndOutDev->getOutDev() ); - r2ndOutDev.Push( PUSH_CLIPREGION ); + r2ndOutDev.Push( PushFlags::CLIPREGION ); r2ndOutDev.SetClipRegion( aPolyClipRegion ); textureFill( r2ndOutDev, diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index dd4fd2bac735..a4ad7fa349e6 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -453,7 +453,7 @@ namespace vclcanvas // repaint uncovered areas from sprite. Need to actually // clip here, since we're only repainting _parts_ of the // sprite - rOutDev.Push( PUSH_CLIPREGION ); + rOutDev.Push( PushFlags::CLIPREGION ); ::std::for_each( aUnscrollableAreas.begin(), aUnscrollableAreas.end(), ::boost::bind( &opaqueUpdateSpriteArea, diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 523e4aa37a68..8e7d783847d8 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -237,7 +237,7 @@ namespace vclcanvas // already redrawn the sprite. bool bSpriteRedrawn( false ); - rTargetSurface.Push( PUSH_CLIPREGION ); + rTargetSurface.Push( PushFlags::CLIPREGION ); // apply clip (if any) if( getClip().is() ) |