diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-12 20:20:50 +0000 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-05-16 14:57:00 +0200 |
| commit | 414f5e70c08bbde5f24b006466fc4d2c76e34655 (patch) | |
| tree | 1cf7f58120a7c2ad95fbc970534ef9b3f70722ff | |
| parent | 31511ee8b13954b9cf3dd3f89b132c4d7ac6c1d7 (diff) | |
op is always SAL_OBJECT_CLIP_INCLUDERECTS
Change-Id: I4d350aa5d791febde3fea824e3e7b4ab6b6c06e8
| -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 83e96c0a7354..c5e01a3567f9 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -308,31 +308,17 @@ void X11SalObject::EndSetClipRegion() { XRectangle *pRectangles = maClipRegion.EndSetClipRegion (); - const int nType = maClipRegion.GetClipRegionType(); 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 ); } void |