diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-12 20:20:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-12 20:23:56 +0000 |
| commit | 4d5de8725138595b10af9709f39cb88f2940ee8b (patch) | |
| tree | dfb3d12ccb6b3bdff49a009f043156f4333c999b /vcl | |
| parent | 32765747ace52f553f815a4ba21f7e6c9b9e899f (diff) | |
op is always SAL_OBJECT_CLIP_INCLUDERECTS
Change-Id: I4d350aa5d791febde3fea824e3e7b4ab6b6c06e8
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/window/salobj.cxx | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index f18f73a5b2d7..b4f3e63a9a32 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -307,31 +307,17 @@ void X11SalObject::EndSetClipRegion() { XRectangle *pRectangles = maClipRegion.EndSetClipRegion (); - const int nType = SAL_OBJECT_CLIP_INCLUDERECTS; const int nRectangles = maClipRegion.GetRectangleCount(); - const int dest_kind = ShapeBounding; - const int ordering = YSorted; - int op; - - switch ( nType ) - { - case SAL_OBJECT_CLIP_INCLUDERECTS : - op = ShapeSet; - break; - default : - op = ShapeUnion; - } - ::Window aShapeWindow = maPrimary; XShapeCombineRectangles ( static_cast<Display*>(maSystemChildData.pDisplay), aShapeWindow, - dest_kind, + ShapeBounding, 0, 0, // x_off, y_off pRectangles, nRectangles, - op, ordering ); + ShapeSet, YSorted ); } sal_uInt16 |