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 /slideshow | |
| 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 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/gdimtftools.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index ef9f4df82aee..f3159a728475 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -293,14 +293,14 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, for( sal_uInt16 i=0, nCount=aAnimation.Count(); i<nCount; ++i ) { - const AnimationBitmap& rAnimBmp( aAnimation.Get(i) ); - switch(rAnimBmp.eDisposal) + const AnimationBitmap& rAnimationBitmap( aAnimation.Get(i) ); + switch(rAnimationBitmap.meDisposal) { case Disposal::Not: { - pVDev->DrawBitmapEx(rAnimBmp.aPosPix, - rAnimBmp.aBmpEx); - Bitmap aMask = rAnimBmp.aBmpEx.GetMask(); + pVDev->DrawBitmapEx(rAnimationBitmap.maPositionPixel, + rAnimationBitmap.maBitmapEx); + Bitmap aMask = rAnimationBitmap.maBitmapEx.GetMask(); if( aMask.IsEmpty() ) { @@ -314,8 +314,8 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, { BitmapEx aTmpMask = BitmapEx(aMask, aMask); - pVDevMask->DrawBitmapEx(rAnimBmp.aPosPix, - aTmpMask ); + pVDevMask->DrawBitmapEx(rAnimationBitmap.maPositionPixel, + aTmpMask ); } break; } @@ -323,32 +323,32 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, case Disposal::Back: { // #i70772# react on no mask - const Bitmap aMask(rAnimBmp.aBmpEx.GetMask()); - const Bitmap aContent(rAnimBmp.aBmpEx.GetBitmap()); + const Bitmap aMask(rAnimationBitmap.maBitmapEx.GetMask()); + const Bitmap aContent(rAnimationBitmap.maBitmapEx.GetBitmap()); pVDevMask->Erase(); - pVDev->DrawBitmap(rAnimBmp.aPosPix, aContent); + pVDev->DrawBitmap(rAnimationBitmap.maPositionPixel, aContent); if(aMask.IsEmpty()) { - const tools::Rectangle aRect(rAnimBmp.aPosPix, aContent.GetSizePixel()); + const tools::Rectangle aRect(rAnimationBitmap.maPositionPixel, aContent.GetSizePixel()); pVDevMask->SetFillColor( COL_BLACK); pVDevMask->SetLineColor(); pVDevMask->DrawRect(aRect); } else { - pVDevMask->DrawBitmap(rAnimBmp.aPosPix, aMask); + pVDevMask->DrawBitmap(rAnimationBitmap.maPositionPixel, aMask); } break; } case Disposal::Previous : { - pVDev->DrawBitmapEx(rAnimBmp.aPosPix, - rAnimBmp.aBmpEx); - pVDevMask->DrawBitmap(rAnimBmp.aPosPix, - rAnimBmp.aBmpEx.GetMask()); + pVDev->DrawBitmapEx(rAnimationBitmap.maPositionPixel, + rAnimationBitmap.maBitmapEx); + pVDevMask->DrawBitmap(rAnimationBitmap.maPositionPixel, + rAnimationBitmap.maBitmapEx.GetMask()); break; } } @@ -374,7 +374,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, // Take care of special value for MultiPage TIFFs. ATM these shall just // show their first page for _quite_ some time. - sal_Int32 nWaitTime100thSeconds( rAnimBmp.nWait ); + sal_Int32 nWaitTime100thSeconds(rAnimationBitmap.mnWait); if( ANIMATION_TIMEOUT_ON_CLICK == nWaitTime100thSeconds ) { // ATM the huge value would block the timer, so use a long |