summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-25 09:11:03 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-25 09:59:43 +0000
commitedc87278036107dc392253bdcb99dce54a1d0a41 (patch)
treef917dce3ef48baf95af92a3fcaf11dcb5ef8e1cb /slideshow
parent2af018e4dd99fccdc85a28b38ff924fb16a750cf (diff)
Convert Disposal to scoped enum
and drop unused FULL value Change-Id: I3b9c26cb164785ef86f1a8d57cce962b015c85d6 Reviewed-on: https://gerrit.libreoffice.org/25432 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx13
1 files changed, 3 insertions, 10 deletions
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 19fc0015b6a4..ae5997d2ff71 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -323,7 +323,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames,
const AnimationBitmap& rAnimBmp( aAnimation.Get(i) );
switch(rAnimBmp.eDisposal)
{
- case DISPOSE_NOT:
+ case Disposal::Not:
{
pVDev->DrawBitmapEx(rAnimBmp.aPosPix,
rAnimBmp.aBmpEx);
@@ -347,7 +347,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames,
break;
}
- case DISPOSE_BACK:
+ case Disposal::Back:
{
// #i70772# react on no mask
const Bitmap aMask(rAnimBmp.aBmpEx.GetMask());
@@ -370,14 +370,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames,
break;
}
- case DISPOSE_FULL:
- {
- pVDev->DrawBitmapEx(rAnimBmp.aPosPix,
- rAnimBmp.aBmpEx);
- break;
- }
-
- case DISPOSE_PREVIOUS :
+ case Disposal::Previous :
{
pVDev->DrawBitmapEx(rAnimBmp.aPosPix,
rAnimBmp.aBmpEx);