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 --- reportdesign/source/ui/inc/ColorChanger.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx index 3a4f9b333c9b..7a26c606e05b 100644 --- a/reportdesign/source/ui/inc/ColorChanger.hxx +++ b/reportdesign/source/ui/inc/ColorChanger.hxx @@ -33,20 +33,20 @@ namespace rptui ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor) :m_pDev( _pDev ) { - m_pDev->Push( PUSH_LINECOLOR ); + m_pDev->Push( PushFlags::LINECOLOR ); m_pDev->SetLineColor( _rNewLineColor ); } ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor ) :m_pDev( _pDev ) { - m_pDev->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR ); + m_pDev->Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); m_pDev->SetLineColor( _rNewLineColor ); m_pDev->SetFillColor( _rNewFillColor ); } ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor, const Color& _rNewTextColor ) :m_pDev( _pDev ) { - m_pDev->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR | PUSH_TEXTCOLOR); + m_pDev->Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR | PushFlags::TEXTCOLOR); m_pDev->SetLineColor( _rNewLineColor ); m_pDev->SetFillColor( _rNewFillColor ); m_pDev->SetTextColor( _rNewTextColor ); -- cgit