From 662fc8eaa94d766104bced33c18b4718722c6692 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 6 May 2015 09:00:50 +0200 Subject: 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 --- svtools/source/graphic/grfmgr2.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'svtools/source/graphic/grfmgr2.cxx') diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 46b48091fb9f..202528d2e42e 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -331,8 +331,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib long nX, nY, nTmpX, nTmpY, nTmpFX, nTmpFY, nTmp; double fTmp; - bool bHMirr = ( rAttributes.GetMirrorFlags() & BMP_MIRROR_HORZ ) != 0; - bool bVMirr = ( rAttributes.GetMirrorFlags() & BMP_MIRROR_VERT ) != 0; + bool bHMirr( rAttributes.GetMirrorFlags() & BmpMirrorFlags::Horizontal ); + bool bVMirr( rAttributes.GetMirrorFlags() & BmpMirrorFlags::Vertical ); boost::scoped_array pMapIX(new long[ aUnrotatedWidth ]); boost::scoped_array pMapFX(new long[ aUnrotatedWidth ]); @@ -905,8 +905,8 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, const long nW = rBmpSzPix.Width(); const long nH = rBmpSzPix.Height(); long nStartX = -1, nStartY = -1, nEndX = -1, nEndY = -1; - bool bHMirr = ( rAttributes.GetMirrorFlags() & BMP_MIRROR_HORZ ) != 0; - bool bVMirr = ( rAttributes.GetMirrorFlags() & BMP_MIRROR_VERT ) != 0; + bool bHMirr( rAttributes.GetMirrorFlags() & BmpMirrorFlags::Horizontal ); + bool bVMirr( rAttributes.GetMirrorFlags() & BmpMirrorFlags::Vertical ); // calculate output sizes if( !pBmpEx ) -- cgit