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 /forms | |
| 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 'forms')
| -rw-r--r-- | forms/source/richtext/richtextimplcontrol.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 55e039c0d375..1e84f1b39648 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -461,7 +461,7 @@ namespace frm long nFontWidth = m_pEngine->GetStandardFont(0).GetSize().Width(); if ( !nFontWidth ) { - m_pViewport->Push( PUSH_FONT ); + m_pViewport->Push( PushFlags::FONT ); m_pViewport->SetFont( m_pEngine->GetStandardFont(0) ); nFontWidth = m_pViewport->GetTextWidth( "x" ); m_pViewport->Pop(); @@ -576,7 +576,7 @@ namespace frm { // need to normalize the map mode of the device - every paint operation on any device needs // to use the same map mode - _pDev->Push( PUSH_MAPMODE | PUSH_LINECOLOR | PUSH_FILLCOLOR ); + _pDev->Push( PushFlags::MAPMODE | PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); // enforce our "normalize map mode" on the device MapMode aRefMapMode( m_pEngine->GetRefDevice()->GetMapMode() ); |