rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more kde4 build fixes

Browse Source
This commit is contained in:
Caolán McNamara 2011-04-13 08:57:07 +01:00
parent b7e9c278e8
commit 66e4dcd914
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-Removed-duplicate-code-block-mis-merge-prolly.patch
View File

@ -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;