[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/gdi/outdev2.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit edf54efa7f939be9b289f94ed4f19fb8322660ef
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Dec 21 13:54:43 2012 +0100

    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
    (cherry picked from commit 06968a96afd334c276b425bf6b809c011f88b716)

diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 7010193..31a789e 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