From 66e4dcd9144bec1c63e12f6b05f60541efa5eb71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 13 Apr 2011 08:57:07 +0100 Subject: [PATCH] more kde4 build fixes --- ...uplicate-code-block-mis-merge-prolly.patch | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/0001-Removed-duplicate-code-block-mis-merge-prolly.patch b/0001-Removed-duplicate-code-block-mis-merge-prolly.patch index 6e91313..21c2846 100644 --- a/0001-Removed-duplicate-code-block-mis-merge-prolly.patch +++ b/0001-Removed-duplicate-code-block-mis-merge-prolly.patch @@ -29,6 +29,29 @@ index 7757014..ca435c8 100644 void KDEXLib::setupEventLoop() { old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter ); --- -1.7.4.2 - +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 6cf466d..3b9a13c 100644 +--- a/vcl/unx/kde4/KDESalGraphics.cxx ++++ b/vcl/unx/kde4/KDESalGraphics.cxx +@@ -433,8 +433,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;