|
 |
b7e9c27 |
From ea898caa151fb8e94b6bdb00b1008b6da98fddad Mon Sep 17 00:00:00 2001
|
|
|
b7e9c27 |
From: Katarina Machalkova <kmachalkova@suse.cz>
|
|
|
b7e9c27 |
Date: Thu, 7 Apr 2011 13:11:00 +0200
|
|
|
b7e9c27 |
Subject: [PATCH] Removed duplicate code block (mis-merge, prolly)
|
|
|
b7e9c27 |
|
|
|
b7e9c27 |
This fixes build with --enable-kde4
|
|
|
b7e9c27 |
---
|
|
|
b7e9c27 |
vcl/unx/kde4/KDEXLib.cxx | 10 ----------
|
|
|
b7e9c27 |
1 files changed, 0 insertions(+), 10 deletions(-)
|
|
|
b7e9c27 |
|
|
|
b7e9c27 |
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
|
|
|
b7e9c27 |
index 7757014..ca435c8 100644
|
|
|
b7e9c27 |
--- a/vcl/unx/kde4/KDEXLib.cxx
|
|
|
b7e9c27 |
+++ b/vcl/unx/kde4/KDEXLib.cxx
|
|
|
b7e9c27 |
@@ -219,16 +219,6 @@ static bool qt_event_filter( void* m )
|
|
|
b7e9c27 |
return false;
|
|
|
b7e9c27 |
}
|
|
|
b7e9c27 |
|
|
|
b7e9c27 |
-static bool ( *old_qt_event_filter )( void* );
|
|
|
b7e9c27 |
-static bool qt_event_filter( void* m )
|
|
|
b7e9c27 |
-{
|
|
|
b7e9c27 |
- if( old_qt_event_filter != NULL && old_qt_event_filter( m ))
|
|
|
b7e9c27 |
- return true;
|
|
|
b7e9c27 |
- if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( static_cast< XEvent* >( m )))
|
|
|
b7e9c27 |
- return true;
|
|
|
b7e9c27 |
- return false;
|
|
|
b7e9c27 |
-}
|
|
|
b7e9c27 |
-
|
|
|
b7e9c27 |
void KDEXLib::setupEventLoop()
|
|
|
b7e9c27 |
{
|
|
|
b7e9c27 |
old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter );
|
|
|
66e4dcd |
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
|
|
|
66e4dcd |
index 4809b1f..5c787bb 100644
|
|
|
66e4dcd |
--- a/vcl/source/gdi/gdimtf.cxx
|
|
|
66e4dcd |
+++ b/vcl/source/gdi/gdimtf.cxx
|
|
|
66e4dcd |
@@ -439,8 +439,6 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, sal_uLong nPos )
|
|
|
66e4dcd |
|
|
|
66e4dcd |
rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas );
|
|
|
66e4dcd |
|
|
|
66e4dcd |
- rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas );
|
|
|
66e4dcd |
-
|
|
|
66e4dcd |
if( nPos > nObjCount )
|
|
|
66e4dcd |
nPos = nObjCount;
|
|
|
66e4dcd |
|
|
|
66e4dcd |
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
|
|
|
66e4dcd |
index 6cf466d..3b9a13c 100644
|
|
|
66e4dcd |
--- a/vcl/unx/kde4/KDESalGraphics.cxx
|
|
|
66e4dcd |
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
|
|
|
66e4dcd |
@@ -433,8 +433,6 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
|
|
|
66e4dcd |
const int width = kapp->style()->pixelMetric(QStyle::PM_ToolBarHandleExtent);
|
|
|
66e4dcd |
QRect rect( 0, 0, width, widgetRect.height());
|
|
|
66e4dcd |
clipRegion = new QRegion( widgetRect.x(), widgetRect.y(), width, widgetRect.height());
|
|
|
66e4dcd |
- XRectangle xRect = { widgetRect.x(), widgetRect.y(), width, widgetRect.height() };
|
|
|
66e4dcd |
- XUnionRectWithRegion( &xRect, pTempClipRegion, pTempClipRegion );
|
|
|
66e4dcd |
|
|
|
66e4dcd |
QStyleOption option;
|
|
|
66e4dcd |
option.state = QStyle::State_Horizontal;
|