[Libreoffice-commits] .: 2 commits - vcl/source

[Fridrich Strba]

 vcl/source/gdi/outdev6.cxx      |    2 ++
 vcl/source/gdi/outdevnative.cxx |   14 --------------
 2 files changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 1f6e66c431b58904829f60a94a0f45e8b87f349e
Author: Takeshi Abe <tabe-wFAinkBuZDxhPPLSxPa2lQ at public.gmane.org>
Date:   Thu Feb 10 03:11:10 2011 +0900

    fix memleak

diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index bf26e17..e1dca1b 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -711,6 +711,8 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
                     pVDev->EnableMapMode(false);
                     const AlphaMask aAlpha(pVDev->GetBitmap(aPoint, pVDev->GetOutputSizePixel()));
 
+                    delete pVDev;
+
                     // draw masked content to target and restore MapMode
                     DrawBitmapEx(aDstRect.TopLeft(), BitmapEx(aPaint, aAlpha));
                     EnableMapMode(bOrigMapModeEnabled);
commit 11f000805d2b05de3badfa7a3fc590cdc7dfad75
Author: Takeshi Abe <tabe-wFAinkBuZDxhPPLSxPa2lQ at public.gmane.org>
Date:   Thu Feb 10 03:10:31 2011 +0900

    remove dead code

diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index 746e642..3818951 100644
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -218,20 +218,6 @@ BOOL OutputDevice::DrawNativeControl( ControlType nType,
     if( !lcl_enableNativeWidget( *this ) )
         return FALSE;
 
-    /*
-    if( !IsInPaint() && IsPaintTransparent() )
-    {
-        // only required if called directly (ie, we're not in Paint() ):
-        // force redraw (Paint()) for transparent controls
-        // to trigger a repaint of the background
-        Region aClipRgn( GetClipRegion() );
-        if( !rControlRegion.IsEmpty() )
-            aClipRgn.Intersect( rControlRegion );
-        Invalidate( aClipRgn, INVALIDATE_UPDATE );
-        return TRUE;
-    }
-    */
-
     // make sure the current clip region is initialized correctly
     if ( !mpGraphics )
         if ( !ImplGetGraphics() )