|
|
@ -29,6 +29,29 @@ index 7757014..ca435c8 100644
|
|
|
|
void KDEXLib::setupEventLoop()
|
|
|
|
void KDEXLib::setupEventLoop()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter );
|
|
|
|
old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter );
|
|
|
|
--
|
|
|
|
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
|
|
|
|
1.7.4.2
|
|
|
|
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;
|
|
|
|