diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-12 17:21:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-12 20:23:56 +0000 |
| commit | f2d7ee6704626b7686c1046ac796f0aac8fccbfd (patch) | |
| tree | c161d0a92466e62dce07e59f0a7d1e0feec838b8 /vcl | |
| parent | 77bc209d64072a935c61caff2564e7f6952e3a77 (diff) | |
SAL_OBJECT_CLIP_ABSOLUTE is never used
Change-Id: I090f9854589a26b8de78fcda1093ea0c19625c79
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/salobj.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/clipping.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/window/salobj.cxx | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index b3ae1527c662..67a2f74e6908 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -27,7 +27,6 @@ struct SystemEnvData; #define SAL_OBJECT_CLIP_INCLUDERECTS ((sal_uInt16)0x0001) -#define SAL_OBJECT_CLIP_ABSOLUTE ((sal_uInt16)0x0004) class VCL_PLUGIN_PUBLIC SalObject { diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx index ad8578df958e..1468e22f2cad 100644 --- a/vcl/source/window/clipping.cxx +++ b/vcl/source/window/clipping.cxx @@ -321,14 +321,12 @@ bool Window::ImplSysObjClip( const vcl::Region* pOldRegion ) vcl::Region aRegion = *pWinChildClipRegion; Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); vcl::Region aWinRectRegion( aWinRect ); - sal_uInt16 nClipFlags = mpWindowImpl->mpSysObj->GetClipRegionType(); if ( aRegion == aWinRectRegion ) mpWindowImpl->mpSysObj->ResetClipRegion(); else { - if ( !(nClipFlags & SAL_OBJECT_CLIP_ABSOLUTE) ) - aRegion.Move( -mnOutOffX, -mnOutOffY ); + aRegion.Move( -mnOutOffX, -mnOutOffY ); // set/update clip region RectangleVector aRectangles; diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index 5b9797d33a58..85cc4983e9fb 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -319,9 +319,6 @@ X11SalObject::EndSetClipRegion() case SAL_OBJECT_CLIP_INCLUDERECTS : op = ShapeSet; break; - case SAL_OBJECT_CLIP_ABSOLUTE : - op = ShapeSet; - break; default : op = ShapeUnion; } |