diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-06 09:00:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-06 09:01:31 +0200 |
| commit | 662fc8eaa94d766104bced33c18b4718722c6692 (patch) | |
| tree | bdf3c702a3e1991e6e20cfd2d10615bf844930df /sw | |
| parent | b13fbd19b7282a1210a2e14bb5ede9ecdf944c1c (diff) | |
convert BMP_MIRROR constants to scoped enum
and fix bug in svx/source/xoutdev/_xoutbmp.cxx,XOutBitmap::MirrorGraphic
where it was not correctly translating between different flags types.
Change-Id: I78b4965544da2aa54b67ec18307fa54c8ffc3aee
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 16 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 8a5833c7e058..b3b3d13f731e 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -997,22 +997,22 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA, rGA.SetDrawMode( (GraphicDrawMode)rSet.GetDrawModeGrf().GetValue() ); const SwMirrorGrf & rMirror = rSet.GetMirrorGrf(); - sal_uLong nMirror = BMP_MIRROR_NONE; + BmpMirrorFlags nMirror = BmpMirrorFlags::NONE; if( rMirror.IsGrfToggle() && pFrm && !pFrm->FindPageFrm()->OnRightPage() ) { switch( rMirror.GetValue() ) { case RES_MIRROR_GRAPH_DONT: - nMirror = BMP_MIRROR_HORZ; + nMirror = BmpMirrorFlags::Horizontal; break; case RES_MIRROR_GRAPH_VERT: - nMirror = BMP_MIRROR_NONE; + nMirror = BmpMirrorFlags::NONE; break; case RES_MIRROR_GRAPH_HOR: - nMirror = BMP_MIRROR_HORZ|BMP_MIRROR_VERT; + nMirror = BmpMirrorFlags::Horizontal|BmpMirrorFlags::Vertical; break; default: - nMirror = BMP_MIRROR_VERT; + nMirror = BmpMirrorFlags::Vertical; break; } } @@ -1020,13 +1020,13 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA, switch( rMirror.GetValue() ) { case RES_MIRROR_GRAPH_BOTH: - nMirror = BMP_MIRROR_HORZ|BMP_MIRROR_VERT; + nMirror = BmpMirrorFlags::Horizontal|BmpMirrorFlags::Vertical; break; case RES_MIRROR_GRAPH_VERT: - nMirror = BMP_MIRROR_HORZ; + nMirror = BmpMirrorFlags::Horizontal; break; case RES_MIRROR_GRAPH_HOR: - nMirror = BMP_MIRROR_VERT; + nMirror = BmpMirrorFlags::Vertical; break; } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index f8a8a500a8d0..7da73f230dd8 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2702,11 +2702,11 @@ void BmpWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& if (bHorz || bVert) { BitmapEx aTmpBmp(bGraphic ? aGraphic.GetBitmapEx() : aBmp); - sal_uLong nMirrorFlags(BMP_MIRROR_NONE); + BmpMirrorFlags nMirrorFlags(BmpMirrorFlags::NONE); if (bHorz) - nMirrorFlags |= BMP_MIRROR_VERT; + nMirrorFlags |= BmpMirrorFlags::Vertical; if (bVert) - nMirrorFlags |= BMP_MIRROR_HORZ; + nMirrorFlags |= BmpMirrorFlags::Horizontal; aTmpBmp.Mirror(nMirrorFlags); DrawBitmapEx( aPntPos, aPntSz, aTmpBmp ); } |