diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-27 14:52:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-30 09:58:23 +0200 |
commit | 8dbde0845a3989528614addb9bd0333f60c522a5 (patch) | |
tree | c1f13bfc8e2841427eb6a07e2147445b309b1e9a /vcl/source/control/edit.cxx | |
parent | b69478acff4f5b7a9d334a765a1a528d44d7b3a4 (diff) |
fdo#82577: Handle Region
Put the VCL Region class in the vcl namespace. Avoids clash with the X11
Region typedef.
Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
Diffstat (limited to 'vcl/source/control/edit.cxx')
-rw-r--r-- | vcl/source/control/edit.cxx | 12 |
1 files changed, 6 insertions, 6 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() ); |