diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 12:48:13 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 12:48:13 +0000 |
| commit | c15f08eb6573fdd5bf3667ba4c9c9d2bf1de2602 (patch) | |
| tree | 7ab88e67f262158478b304e649150da0ffde33fe /slideshow/source/engine/shapes/gdimtftools.cxx | |
| parent | INTEGRATION: CWS impress146 (1.50.18); FILE MERGED (diff) | |
| download | core-c15f08eb6573fdd5bf3667ba4c9c9d2bf1de2602.tar.gz core-c15f08eb6573fdd5bf3667ba4c9c9d2bf1de2602.zip | |
INTEGRATION: CWS impress146 (1.3.14); FILE MERGED
2008/06/27 10:10:08 cl 1.3.14.1: #i70772# applied patch to fix issue mit empty masks on animated images
Diffstat (limited to 'slideshow/source/engine/shapes/gdimtftools.cxx')
| -rw-r--r-- | slideshow/source/engine/shapes/gdimtftools.cxx | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 718b575a14de..4817a131cddc 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: gdimtftools.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -426,11 +426,24 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, case DISPOSE_BACK: { + // #i70772# react on no mask + const Bitmap aMask(rAnimBmp.aBmpEx.GetMask()); + const Bitmap aContent(rAnimBmp.aBmpEx.GetBitmap()); + aVDevMask.Erase(); - aVDev.DrawBitmap(rAnimBmp.aPosPix, - rAnimBmp.aBmpEx.GetBitmap()); - aVDevMask.DrawBitmap(rAnimBmp.aPosPix, - rAnimBmp.aBmpEx.GetMask()); + aVDev.DrawBitmap(rAnimBmp.aPosPix, aContent); + + if(aMask.IsEmpty()) + { + const Rectangle aRect(rAnimBmp.aPosPix, aContent.GetSizePixel()); + aVDevMask.SetFillColor(COL_BLACK); + aVDevMask.SetLineColor(); + aVDevMask.DrawRect(aRect); + } + else + { + aVDevMask.DrawBitmap(rAnimBmp.aPosPix, aMask); + } break; } |