diff options
Diffstat (limited to 'vcl/source/control')
-rw-r--r-- | vcl/source/control/edit.cxx | 12 | ||||
-rw-r--r-- | vcl/source/control/scrbar.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/slider.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/spinbtn.cxx | 6 | ||||
-rw-r--r-- | vcl/source/control/spinfld.cxx | 12 | ||||
-rw-r--r-- | vcl/source/control/tabctrl.cxx | 8 |
6 files changed, 22 insertions, 22 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 9962c3213578..5d0bb1db13b4 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -561,8 +561,8 @@ void Edit::ImplRepaint(bool bLayout) // save graphics state Push(); // first calculate higlighted and non highlighted clip regions - Region aHiglightClipRegion; - Region aNormalClipRegion; + vcl::Region aHiglightClipRegion; + vcl::Region aNormalClipRegion; Selection aTmpSel( maSelection ); aTmpSel.Justify(); // selection is highlighted @@ -619,7 +619,7 @@ void Edit::ImplRepaint(bool bLayout) { for( int n = 0; n < 2; n++ ) { - Region aRegion; + vcl::Region aRegion; if( n == 0 ) { SetTextColor( aNormalTextColor ); @@ -639,7 +639,7 @@ void Edit::ImplRepaint(bool bLayout) for( i = 0; i < mpIMEInfos->nLen; ) { sal_uInt16 nAttr = mpIMEInfos->pAttribs[i]; - Region aClip; + vcl::Region aClip; int nIndex = i; while( nIndex < mpIMEInfos->nLen && mpIMEInfos->pAttribs[nIndex] == nAttr) // #112631# check nIndex before using it { @@ -1029,7 +1029,7 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd ) if( pBorder ) { // set proper clipping region to not overdraw the whole control - Region aClipRgn = GetPaintRegion(); + vcl::Region aClipRgn = GetPaintRegion(); if( !aClipRgn.IsNull() ) { // transform clipping region to border window's coordinate system @@ -1055,7 +1055,7 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd ) aClipRgn.Move( aBorderOffs.X(), aBorderOffs.Y() ); } - Region oldRgn( pBorder->GetClipRegion() ); + vcl::Region oldRgn( pBorder->GetClipRegion() ); pBorder->SetClipRegion( aClipRgn ); pBorder->Paint( Rectangle() ); diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index c11bb36654ba..d9ee7576306b 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1270,8 +1270,8 @@ bool ScrollBar::PreNotify( NotifyEvent& rNEvt ) Rectangle* pLastRect = ImplFindPartRect( GetLastPointerPosPixel() ); if( pRect != pLastRect || pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow() ) { - Region aRgn( GetActiveClipRegion() ); - Region aClipRegion; + vcl::Region aRgn( GetActiveClipRegion() ); + vcl::Region aClipRegion; if ( pRect ) aClipRegion.Union( *pRect ); diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 00cf7108c981..0ebdc37dc66e 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -193,7 +193,7 @@ void Slider::ImplUpdateRects( bool bUpdate ) Invalidate(); else { - Region aInvalidRegion( aOldThumbRect ); + vcl::Region aInvalidRegion( aOldThumbRect ); aInvalidRegion.Union( maThumbRect ); if( !IsBackground() && GetParent() ) diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index f760aaf669e5..b7d9de824902 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -457,16 +457,16 @@ bool SpinButton::PreNotify( NotifyEvent& rNEvt ) Rectangle* pLastRect = ImplFindPartRect( GetLastPointerPosPixel() ); if( pRect != pLastRect || (pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) ) { - Region aRgn( GetActiveClipRegion() ); + vcl::Region aRgn( GetActiveClipRegion() ); if( pLastRect ) { - SetClipRegion(Region(*pLastRect)); + SetClipRegion(vcl::Region(*pLastRect)); Paint( *pLastRect ); SetClipRegion( aRgn ); } if( pRect ) { - SetClipRegion(Region(*pRect)); + SetClipRegion(vcl::Region(*pRect)); Paint( *pRect ); SetClipRegion( aRgn ); } diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index e71cfbb60406..a6c558317eea 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -98,8 +98,8 @@ bool ImplDrawNativeSpinfield( vcl::Window *pWin, const SpinbuttonValue& rSpinbut // convert from screen space to borderwin space aClipRect.SetPos( pBorder->ScreenToOutputPixel(pWin->OutputToScreenPixel(aClipRect.TopLeft())) ); - Region oldRgn( pBorder->GetClipRegion() ); - pBorder->SetClipRegion( Region( aClipRect ) ); + vcl::Region oldRgn( pBorder->GetClipRegion() ); + pBorder->SetClipRegion( vcl::Region( aClipRect ) ); Point aPt; Size aSize( pBorder->GetOutputSizePixel() ); // the size of the border window, i.e., the whole control @@ -116,7 +116,7 @@ bool ImplDrawNativeSpinfield( vcl::Window *pWin, const SpinbuttonValue& rSpinbut bNativeOK = pBorder->DrawNativeControl( CTRL_SPINBOX, PART_ENTIRE_CONTROL, aRgn, CTRL_STATE_ENABLED, rSpinbuttonValue, OUString() ); - pBorder->SetClipRegion(Region(oldRgn)); + pBorder->SetClipRegion(vcl::Region(oldRgn)); } } return bNativeOK; @@ -879,16 +879,16 @@ bool SpinField::PreNotify( NotifyEvent& rNEvt ) else { // paint directly - Region aRgn( GetActiveClipRegion() ); + vcl::Region aRgn( GetActiveClipRegion() ); if( pLastRect ) { - SetClipRegion(Region(*pLastRect)); + SetClipRegion(vcl::Region(*pLastRect)); Paint( *pLastRect ); SetClipRegion( aRgn ); } if( pRect ) { - SetClipRegion(Region(*pRect)); + SetClipRegion(vcl::Region(*pRect)); Paint( *pRect ); SetClipRegion( aRgn ); } diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 4e377cb103ee..f0aa4dbad2fb 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1102,7 +1102,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) if ( HasFocus() ) nState |= CTRL_STATE_FOCUSED; - Region aClipRgn( GetActiveClipRegion() ); + vcl::Region aClipRgn( GetActiveClipRegion() ); aClipRgn.Intersect( aRect ); if( !rRect.IsEmpty() ) aClipRgn.Intersect( rRect ); @@ -1197,7 +1197,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) ImplTabItem* pItem = &mpTabCtrlData->maItemList[idx]; if ( pItem != pCurItem ) { - Region aClipRgn( GetActiveClipRegion() ); + vcl::Region aClipRgn( GetActiveClipRegion() ); aClipRgn.Intersect( pItem->maRect ); if( !rRect.IsEmpty() ) aClipRgn.Intersect( rRect ); @@ -1213,7 +1213,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) if ( pCurItem ) { - Region aClipRgn( GetActiveClipRegion() ); + vcl::Region aClipRgn( GetActiveClipRegion() ); aClipRgn.Intersect( pCurItem->maRect ); if( !rRect.IsEmpty() ) aClipRgn.Intersect( rRect ); @@ -1543,7 +1543,7 @@ bool TabControl::PreNotify( NotifyEvent& rNEvt ) Rectangle* pLastRect = ImplFindPartRect( GetLastPointerPosPixel() ); if( pRect != pLastRect || (pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) ) { - Region aClipRgn; + vcl::Region aClipRgn; if( pLastRect ) { // allow for slightly bigger tabitems |