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

[Caolán McNamara]

 vcl/source/gdi/gdimtf.cxx       |    2 --
 vcl/unx/kde4/KDESalGraphics.cxx |    2 --
 2 files changed, 4 deletions(-)

New commits:
commit f4b300753878698d05d3e6fff236fdb57f5c5d20
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Thu Apr 7 13:28:50 2011 +0200

    Fixed more build breakages with --enable-kde4
    (cherry picked from commit 5dbb3b7b920045156e998ea2f0a93a870b93f09c)

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 4809b1f..5c787bb 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -439,8 +439,6 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, sal_uLong nPos )
 
         rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas );
 
-        rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas );
-
         if( nPos > nObjCount )
             nPos = nObjCount;
 
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 7fefe8f..749fbf0 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -418,8 +418,6 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         const int width = kapp->style()->pixelMetric(QStyle::PM_ToolBarHandleExtent);
         QRect rect( 0, 0, width, widgetRect.height());
         clipRegion = new QRegion( widgetRect.x(), widgetRect.y(), width, widgetRect.height());
-        XRectangle xRect = { widgetRect.x(), widgetRect.y(), width, widgetRect.height() };
-        XUnionRectWithRegion( &xRect, pTempClipRegion, pTempClipRegion );
         
         QStyleOption option;
         option.state = QStyle::State_Horizontal;