diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-09-04 11:04:51 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-04 11:06:11 +0100 |
commit | 77eeece2e744df7f2290ba2738cee95ef367133a (patch) | |
tree | cfe47b5bc6f8aa9f27e4678fc1cb23ec74ad2c18 /sw/source | |
parent | e4b2e9fa7822b5ccc25435101059d0f3ddae08d2 (diff) |
c++11 and c++03 have different enum namespacing behaviour
Change-Id: I899d1ad9e26feb7fcf83c137e4e68628cfdceec8
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index afba1d643198..9209f7fda3cf 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2018,18 +2018,18 @@ void DrawGraphic( const SvxBrushItem *pBrush, Default, Transparent, Gradient - } eDrawStyle = DrawStyle::Default; + } eDrawStyle = Default; // Gradient and transparency are mutually exclusive (need to check gradient first) if (pFillStyleItem && pFillStyleItem->GetValue() == XFILL_GRADIENT && pFillGradientItem) { - eDrawStyle = DrawStyle::Gradient; + eDrawStyle = Gradient; } else if (bConsiderBackgroundTransparency && ( ( aColor.GetTransparency() != 0) || bTransparentGrfWithNoFillBackgrd ) ) { - eDrawStyle = DrawStyle::Transparent; + eDrawStyle = Transparent; } // #i75614# reset draw mode in high contrast mode in order to get fill color set @@ -2045,7 +2045,7 @@ void DrawGraphic( const SvxBrushItem *pBrush, /// the fill color for the output device. switch (eDrawStyle) { - case DrawStyle::Transparent: + case Transparent: { if( pOutDev->GetFillColor() != aColor.GetRGBColor() ) pOutDev->SetFillColor( aColor.GetRGBColor() ); @@ -2066,7 +2066,7 @@ void DrawGraphic( const SvxBrushItem *pBrush, /// OD 02.09.2002 #99657# switch (eDrawStyle) { - case DrawStyle::Transparent: + case Transparent: { /// background region have to be drawn transparent. /// Thus, create a poly-polygon from the region and draw it with @@ -2103,12 +2103,12 @@ void DrawGraphic( const SvxBrushItem *pBrush, break; } - case DrawStyle::Gradient: + case Gradient: { pOutDev->DrawGradient(rOut.SVRect(), pFillGradientItem->GetGradientValue().VclGradient()); break; } - case DrawStyle::Default: + case Default: default: { SwRegionRects aRegion( rOut, 4 ); |