diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-04-27 23:08:01 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-04-28 05:31:16 +0200 |
| commit | 6bcc4cb109b4ab6ec194a04c53cf1d545a7a7dfd (patch) | |
| tree | c89f80ddca6eb9dc4c118478e873bc46b7584f6c /svx | |
| parent | 9afa666120d8bb045f3569a77475a58c368c03a1 (diff) | |
prefix member variables of AnimationBitmap
Change-Id: Ic84773399c95d61f843e4388fe01d00cd4facc5a
Reviewed-on: https://gerrit.libreoffice.org/71425
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 12 | ||||
| -rw-r--r-- | svx/source/dialog/_contdlg.cxx | 4 | ||||
| -rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 40ce126c1d3e..b0a7b7de8458 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -651,9 +651,9 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation ) for( sal_uInt16 i = 0; i < nAnimationCount; i++ ) { - AnimationBitmap aAnimBmp( aAnimation.Get( i ) ); - aAnimBmp.aBmpEx = Mask( aAnimBmp.aBmpEx ).GetBitmapEx(); - aAnimation.Replace( aAnimBmp, i ); + AnimationBitmap aAnimationBitmap( aAnimation.Get( i ) ); + aAnimationBitmap.maBitmapEx = Mask(aAnimationBitmap.maBitmapEx).GetBitmapEx(); + aAnimation.Replace(aAnimationBitmap, i); } return aAnimation; @@ -921,9 +921,9 @@ Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Colo for( sal_uInt16 i = 0; i < nAnimationCount; i++ ) { - AnimationBitmap aAnimBmp( aAnimation.Get( i ) ); - aAnimBmp.aBmpEx = ImpReplaceTransparency( aAnimBmp.aBmpEx, rColor ); - aAnimation.Replace( aAnimBmp, i ); + AnimationBitmap aAnimationBitmap(aAnimation.Get(i)); + aAnimationBitmap.maBitmapEx = ImpReplaceTransparency(aAnimationBitmap.maBitmapEx, rColor); + aAnimation.Replace(aAnimationBitmap, i); } return aAnimation; diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 7e1254899eb7..a63ee17c932b 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -126,9 +126,9 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, // Push Polygon output to the right place; this is the // offset of the sub-image within the total animation - aTransMap.SetOrigin( Point( rStepBmp.aPosPix.X(), rStepBmp.aPosPix.Y() ) ); + aTransMap.SetOrigin( Point( rStepBmp.maPositionPixel.X(), rStepBmp.maPositionPixel.Y() ) ); pVDev->SetMapMode( aTransMap ); - pVDev->DrawPolyPolygon( CreateAutoContour( rStepBmp.aBmpEx, pRect ) ); + pVDev->DrawPolyPolygon( CreateAutoContour( rStepBmp.maBitmapEx, pRect ) ); } aTransMap.SetOrigin( Point() ); diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index be113900d941..decc1de34565 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -64,21 +64,21 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, bool bHMirr, for( sal_uInt16 i = 0, nCount = aNewAnim.Count(); i < nCount; i++ ) { - AnimationBitmap aAnimBmp( aNewAnim.Get( i ) ); + AnimationBitmap aAnimationBitmap( aNewAnim.Get( i ) ); // mirror the BitmapEx - aAnimBmp.aBmpEx.Mirror( nMirrorFlags ); + aAnimationBitmap.maBitmapEx.Mirror( nMirrorFlags ); // Adjust the positions inside the whole bitmap if( bHMirr ) - aAnimBmp.aPosPix.setX( rGlobalSize.Width() - aAnimBmp.aPosPix.X() - - aAnimBmp.aSizePix.Width() ); + aAnimationBitmap.maPositionPixel.setX(rGlobalSize.Width() - aAnimationBitmap.maPositionPixel.X() - + aAnimationBitmap.maSizePixel.Width()); if( bVMirr ) - aAnimBmp.aPosPix.setY( rGlobalSize.Height() - aAnimBmp.aPosPix.Y() - - aAnimBmp.aSizePix.Height() ); + aAnimationBitmap.maPositionPixel.setY(rGlobalSize.Height() - aAnimationBitmap.maPositionPixel.Y() - + aAnimationBitmap.maSizePixel.Height()); - aNewAnim.Replace( aAnimBmp, i ); + aNewAnim.Replace(aAnimationBitmap, i); } } |