From af5ebbf7835441c767f91a620f109ee6722e57bd Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 6 Oct 2014 14:48:16 +0200 Subject: create a macro library for implementing bit-flags types Signed-off-by: Stephan Bergmann , 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 --- svtools/source/graphic/grfmgr.cxx | 4 ++-- svtools/source/graphic/grfmgr2.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'svtools/source/graphic') diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index be4baa30e6ea..69c710991d5b 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -582,7 +582,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, bool bRectClip; const bool bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); - pOut->Push( PUSH_CLIPREGION ); + pOut->Push( PushFlags::CLIPREGION ); if( bCrop ) { @@ -727,7 +727,7 @@ bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const bool bRectClip; const bool bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); - pOut->Push( PUSH_CLIPREGION ); + pOut->Push( PushFlags::CLIPREGION ); if( bCrop ) { diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 57a1620d5fa7..b61f079d39d2 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -1647,7 +1647,7 @@ void GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& aOutSz = aRotBoundRect.GetSize(); } - pOut->Push( PUSH_CLIPREGION ); + pOut->Push( PushFlags::CLIPREGION ); pOut->IntersectClipRegion( Rectangle( aOutPt, aOutSz ) ); ( (GDIMetaFile&) rMtf ).WindStart(); @@ -1994,7 +1994,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c const Point aOutStart( aOutOrigin.X() + nInvisibleTilesX*rSizePixel.Width(), aOutOrigin.Y() + nInvisibleTilesY*rSizePixel.Height() ); - pOut->Push( PUSH_CLIPREGION ); + pOut->Push( PushFlags::CLIPREGION ); pOut->IntersectClipRegion( rArea ); // Paint all tiles -- cgit