summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-12-21 13:54:43 +0100
committerMichael Stahl <mstahl@redhat.com>2012-12-21 13:57:59 +0100
commit06968a96afd334c276b425bf6b809c011f88b716 (patch)
treed280e9254cae1856aa41fffd104f0c0eb7c207b9 /vcl
parent9c6006b961f690728f4035c10f8b9fe9fdb6f332 (diff)
fdo#55044: OutputDevice::ImplDrawAlpha:
reset members before calling GetBitmap(), as apparently they are used by GetBitmap(), resulting in missing/not rendering parts of the preview image in the bugdoc. (regression from c0ce7ca4884f7f6d1016bd1dbcc22066cb4a7797) Change-Id: I02a6abb822900e1a28a1c632a122c1e093b73553
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/outdev2.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 7010193ae90b..31a789e58253 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -1883,9 +1883,9 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
{
GDIMetaFile* pOldMetaFile = mpMetaFile;
const bool bOldMap = mbMap;
- Bitmap aBmp( GetBitmap( aDstRect.TopLeft(), aDstRect.GetSize() ) );
- mpMetaFile = NULL;
+ mpMetaFile = NULL; // fdo#55044 reset before GetBitmap!
mbMap = false;
+ Bitmap aBmp( GetBitmap( aDstRect.TopLeft(), aDstRect.GetSize() ) );
// #109044# The generated bitmap need not necessarily be
// of aDstRect dimensions, it's internally clipped to