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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/graphicfilter/icgm/actimpr.cxx | 8 | ||||
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 7d1dd7c0705b..1e73c13c5538 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -562,12 +562,12 @@ void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc ) double fdx = pBmpDesc->mndx; double fdy = pBmpDesc->mndy; - sal_uInt32 nMirr = BMP_MIRROR_NONE; + BmpMirrorFlags nMirr = BmpMirrorFlags::NONE; if ( pBmpDesc->mbVMirror ) - nMirr |= BMP_MIRROR_VERT; + nMirr |= BmpMirrorFlags::Vertical; if ( pBmpDesc->mbHMirror ) - nMirr |= BMP_MIRROR_HORZ; - if ( nMirr != BMP_MIRROR_NONE ) + nMirr |= BmpMirrorFlags::Horizontal; + if ( nMirr != BmpMirrorFlags::NONE ) pBmpDesc->mpBitmap->Mirror( nMirr ); mpCGM->ImplMapPoint( aOrigin ); diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 9366ec20cfd4..6cf97f933d1a 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1640,7 +1640,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( if(bMirrored) { - pGraphicAttr->SetMirrorFlags(BMP_MIRROR_HORZ); + pGraphicAttr->SetMirrorFlags(BmpMirrorFlags::Horizontal); } // #121074# @@ -4122,7 +4122,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject { SvMemoryStream aSt( sizeof( GraphicAttr ) ); aSt.WriteUInt16( pGraphicAttr->GetDrawMode() ) - .WriteUInt32( pGraphicAttr->GetMirrorFlags() ) + .WriteUInt32( static_cast<sal_uInt32>(pGraphicAttr->GetMirrorFlags()) ) .WriteInt32( pGraphicAttr->GetLeftCrop() ) .WriteInt32( pGraphicAttr->GetTopCrop() ) .WriteInt32( pGraphicAttr->GetRightCrop() ) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 8935ae4257f2..8e757f7b5916 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1224,12 +1224,12 @@ void ApplyRectangularGradientAsBitmap( const SvxMSDffManager& rManager, SvStream { aBitmap.Rotate( nFix16Angle / 10, rShadeColors[ 0 ].aColor ); - sal_uLong nMirrorFlags = BMP_MIRROR_NONE; + BmpMirrorFlags nMirrorFlags = BmpMirrorFlags::NONE; if ( rObjData.nSpFlags & SP_FFLIPV ) - nMirrorFlags |= BMP_MIRROR_VERT; + nMirrorFlags |= BmpMirrorFlags::Vertical; if ( rObjData.nSpFlags & SP_FFLIPH ) - nMirrorFlags |= BMP_MIRROR_HORZ; - if ( nMirrorFlags != BMP_MIRROR_NONE ) + nMirrorFlags |= BmpMirrorFlags::Horizontal; + if ( nMirrorFlags != BmpMirrorFlags::NONE ) aBitmap.Mirror( nMirrorFlags ); } } |