diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-03-21 16:48:35 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-03-21 16:48:35 +0100 |
| commit | 17da3432027028279a454be66f371c20cbcebdc6 (patch) | |
| tree | 7de346133d4b98b57b1c1d3581587845cf50de1e /vcl | |
| parent | da941336002b4f4bdfb23b1f05231c243236627c (diff) | |
pClipRegion_ has been apparently renamed to mpClipRegion
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/kde4/KDESalGraphics.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index 0d3d6634b15a..95a913e6d5dd 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -626,12 +626,12 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, // See XRegionToQRegion() comment for a small catch (although not real hopefully). QPixmap destPixmap = QPixmap::fromX11Pixmap( GetDrawable(), QPixmap::ExplicitlyShared ); QPainter paint( &destPixmap ); - if( clipRegion && pClipRegion_ ) - paint.setClipRegion( clipRegion->intersected( XRegionToQRegion( pClipRegion_ ))); + if( clipRegion && mpClipRegion ) + paint.setClipRegion( clipRegion->intersected( XRegionToQRegion( mpClipRegion ))); else if( clipRegion ) paint.setClipRegion( *clipRegion ); - else if( pClipRegion_ ) - paint.setClipRegion( XRegionToQRegion( pClipRegion_ )); + else if( mpClipRegion ) + paint.setClipRegion( XRegionToQRegion( mpClipRegion )); paint.drawImage( widgetRect.left(), widgetRect.top(), *m_image, 0, 0, widgetRect.width(), widgetRect.height(), Qt::ColorOnly | Qt::OrderedDither | Qt::OrderedAlphaDither ); @@ -652,8 +652,8 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, xr.height = r.height(); XUnionRectWithRegion( &xr, pTempClipRegion, pTempClipRegion ); } - if( pClipRegion_ ) - XIntersectRegion( pTempClipRegion, pClipRegion_, pTempClipRegion ); + if( mpClipRegion ) + XIntersectRegion( pTempClipRegion, mpClipRegion, pTempClipRegion ); XSetRegion( GetXDisplay(), gc, pTempClipRegion ); } QPixmap pixmap = QPixmap::fromImage(*m_image, Qt::ColorOnly | Qt::OrderedDither | Qt::OrderedAlphaDither); @@ -664,8 +664,8 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, if( pTempClipRegion ) { - if( pClipRegion_ ) - XSetRegion( GetXDisplay(), gc, pClipRegion_ ); + if( mpClipRegion ) + XSetRegion( GetXDisplay(), gc, mpClipRegion ); else XSetClipMask( GetXDisplay(), gc, None ); XDestroyRegion( pTempClipRegion ); |