[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

New commits:
commit 0e7237e76215f06f5aee8354b2a06078bf34f5dc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jun 23 08:35:36 2013 +0100

    fix missing content of header tabs with gtk vclplug
    
    regression since e717d1dcce7f8906311c5ccdbb2326b61a702630
    
    Change-Id: I72e6e2f3ef093f272765036ebfc60b3f56a8fc34

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 9f15e31..2fce91c 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -833,24 +833,11 @@ sal_Bool GtkSalGraphics::drawNativeControl(    ControlType nType,
 
         for(RectangleVector::const_iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); ++aRectIter)
         {
-            if(aRectIter->IsEmpty())
-            {
+            Rectangle aPaintRect = aCtrlRect.GetIntersection(*aRectIter);
+            if( aPaintRect.IsEmpty() )
                 continue;
-            }
-
-            aClip.push_back(*aRectIter);
+            aClip.push_back( aPaintRect );
         }
-
-        //RegionHandle aHdl = aClipRegion.BeginEnumRects();
-        //Rectangle aPaintRect;
-        //while( aClipRegion.GetEnumRects( aHdl, aPaintRect ) )
-        //{
-        //    aPaintRect = aCtrlRect.GetIntersection( aPaintRect );
-        //    if( aPaintRect.IsEmpty() )
-        //        continue;
-        //    aClip.push_back( aPaintRect );
-        //}
-        //aClipRegion.EndEnumRects( aHdl );
     }
 
     if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL) )