diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 19:07:05 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 19:07:05 +0200 |
| commit | c87019c1a938d7bb4ba1575f79df20f94a619ca9 (patch) | |
| tree | 76f3d71ea01469e16f365f145cdeb464983aebd9 /vcl | |
| parent | 149bb82c280a7846981793714d9111a83119798d (diff) | |
| parent | ef29f115c0e99c631ec7e037f4b39e961dc3c858 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
svtools/source/control/toolbarmenu.cxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/settings.hxx
vcl/unx/inc/saldata.hxx
vcl/unx/kde4/KDESalGraphics.cxx
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDESalGraphics.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 10 |
3 files changed, 14 insertions, 0 deletions
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 79b8f417891b..849750ea20a9 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -439,6 +439,8 @@ 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 95a913e6d5dd..c2ac0c76e3e3 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -433,6 +433,8 @@ 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; diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index ce4ea14dadb5..03bcfca8e47e 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -219,6 +219,16 @@ static bool qt_event_filter( void* m ) return false; } +static bool ( *old_qt_event_filter )( void* ); +static bool qt_event_filter( void* m ) +{ + if( old_qt_event_filter != NULL && old_qt_event_filter( m )) + return true; + if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( static_cast< XEvent* >( m ))) + return true; + return false; +} + void KDEXLib::setupEventLoop() { old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter ); |