vcl/headless/svpdummies.cxx | 1 -
vcl/inc/headless/svpdummies.hxx | 3 +--
vcl/inc/osx/salobj.h | 1 -
vcl/inc/salobj.hxx | 5 -----
vcl/inc/unx/gtk/gtkobject.hxx | 3 +--
vcl/inc/unx/salobj.h | 6 +-----
vcl/inc/win/salobj.h | 1 -
vcl/osx/salobj.cxx | 5 -----
vcl/source/window/clipping.cxx | 9 +--------
vcl/unx/generic/window/salobj.cxx | 31 ++-----------------------------
vcl/unx/gtk/gtkobject.cxx | 5 -----
vcl/unx/gtk3/gtk3gtkobject.cxx | 5 -----
vcl/win/window/salobj.cxx | 5 -----
13 files changed, 6 insertions(+), 74 deletions(-)
New commits:
commit a3e224a55bc7e996d92c7677746d79bb98b91d18
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 12 20:22:49 2016 +0000
nothing needs GetClipRegionType or uses SAL_OBJECT_CLIP_INCLUDERECTS now
Change-Id: Ie43eb3b2c449891fef1031e7df3f381cecb4b4f9
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 06258cc..0c1b8c3 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -35,7 +35,6 @@ SvpSalObject::~SvpSalObject()
}
void SvpSalObject::ResetClipRegion() {}
-sal_uInt16 SvpSalObject::GetClipRegionType() { return 0; }
void SvpSalObject::BeginSetClipRegion( sal_uLong ) {}
void SvpSalObject::UnionClipRegion( long, long, long, long ) {}
void SvpSalObject::EndSetClipRegion() {}
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index b265407..e0625a3 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -37,8 +37,7 @@ public:
virtual ~SvpSalObject();
// override all pure virtual methods
- virtual void ResetClipRegion() override;
- virtual sal_uInt16 GetClipRegionType() override;
+ virtual void ResetClipRegion() override;
virtual void BeginSetClipRegion( sal_uLong nRects )
override;
virtual void UnionClipRegion( long nX, long nY, long
nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index 8dc316e..19a0090 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -55,7 +55,6 @@ public:
virtual ~AquaSalObject();
virtual void ResetClipRegion() override;
- virtual sal_uInt16 GetClipRegionType() override;
virtual void BeginSetClipRegion( sal_uLong nRects )
override;
virtual void UnionClipRegion( long nX, long nY, long
nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 67a2f74..174b1b1 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -26,8 +26,6 @@
struct SystemEnvData;
-#define SAL_OBJECT_CLIP_INCLUDERECTS ((sal_uInt16)0x0001)
-
class VCL_PLUGIN_PUBLIC SalObject
{
void* m_pInst;
@@ -39,7 +37,6 @@ public:
virtual ~SalObject();
virtual void ResetClipRegion() = 0;
- virtual sal_uInt16 GetClipRegionType() = 0;
virtual void BeginSetClipRegion( sal_uLong nRects ) = 0;
virtual void UnionClipRegion( long nX, long nY, long
nWidth, long nHeight ) = 0;
virtual void EndSetClipRegion() = 0;
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 9e2ad5d..55896a2 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -44,8 +44,7 @@ public:
virtual ~GtkSalObject();
// override all pure virtual methods
- virtual void ResetClipRegion() override;
- virtual sal_uInt16 GetClipRegionType() override;
+ virtual void ResetClipRegion() override;
virtual void BeginSetClipRegion( sal_uLong nRects )
override;
virtual void UnionClipRegion( long nX, long nY, long
nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index e03933f..424f3aa 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -67,8 +67,7 @@ public:
virtual ~X11SalObject();
// override all pure virtual methods
- virtual void ResetClipRegion() override;
- virtual sal_uInt16 GetClipRegionType() override;
+ virtual void ResetClipRegion() override;
virtual void BeginSetClipRegion( sal_uIntPtr nRects )
override;
virtual void UnionClipRegion( long nX, long nY, long
nWidth, long nHeight ) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index d172d2f..e6c9e5a 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -40,7 +40,6 @@ public:
virtual ~WinSalObject();
virtual void ResetClipRegion() override;
- virtual sal_uInt16 GetClipRegionType() override;
virtual void BeginSetClipRegion( sal_uIntPtr nRects )
override;
virtual void UnionClipRegion( long nX, long nY, long
nWidth, long nHeight) override;
virtual void EndSetClipRegion() override;
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index a747ae3..87edbfa 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -139,11 +139,6 @@ void AquaSalObject::ResetClipRegion()
setClippedPosSize();
}
-sal_uInt16 AquaSalObject::GetClipRegionType()
-{
- return SAL_OBJECT_CLIP_INCLUDERECTS;
-}
-
void AquaSalObject::BeginSetClipRegion( sal_uLong )
{
mbClip = false;
diff --git a/vcl/unx/generic/window/salobj.cxx
b/vcl/unx/generic/window/salobj.cxx
index b4f3e63..8652e50 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -320,12 +320,6 @@ X11SalObject::EndSetClipRegion()
ShapeSet, YSorted );
}
-sal_uInt16
-X11SalObject::GetClipRegionType()
-{
- return SAL_OBJECT_CLIP_INCLUDERECTS;
-}
-
void
X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
{
diff --git a/vcl/unx/gtk/gtkobject.cxx b/vcl/unx/gtk/gtkobject.cxx
index cc78ff5..a015c01 100644
--- a/vcl/unx/gtk/gtkobject.cxx
+++ b/vcl/unx/gtk/gtkobject.cxx
@@ -101,11 +101,6 @@ void GtkSalObject::ResetClipRegion()
gdk_window_shape_combine_region( widget_get_window(m_pSocket),
nullptr, 0, 0 );
}
-sal_uInt16 GtkSalObject::GetClipRegionType()
-{
- return SAL_OBJECT_CLIP_INCLUDERECTS;
-}
-
void GtkSalObject::BeginSetClipRegion( sal_uLong )
{
if( m_pRegion )
diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx
index 8c06b4e..d213e1c 100644
--- a/vcl/unx/gtk3/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtk3gtkobject.cxx
@@ -98,11 +98,6 @@ void GtkSalObject::ResetClipRegion()
gdk_window_shape_combine_region( widget_get_window(m_pSocket),
nullptr, 0, 0 );
}
-sal_uInt16 GtkSalObject::GetClipRegionType()
-{
- return SAL_OBJECT_CLIP_INCLUDERECTS;
-}
-
void GtkSalObject::BeginSetClipRegion( sal_uLong )
{
if( m_pRegion )
diff --git a/vcl/win/window/salobj.cxx b/vcl/win/window/salobj.cxx
index 033c798..01a330c 100644
--- a/vcl/win/window/salobj.cxx
+++ b/vcl/win/window/salobj.cxx
@@ -590,11 +590,6 @@ void WinSalObject::ResetClipRegion()
SetWindowRgn( mhWnd, 0, TRUE );
}
-sal_uInt16 WinSalObject::GetClipRegionType()
-{
- return SAL_OBJECT_CLIP_INCLUDERECTS;
-}
-
void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount )
{
sal_uLong nRectBufSize = sizeof(RECT)*nRectCount;
commit 4d5de8725138595b10af9709f39cb88f2940ee8b
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 12 20:20:50 2016 +0000
op is always SAL_OBJECT_CLIP_INCLUDERECTS
Change-Id: I4d350aa5d791febde3fea824e3e7b4ab6b6c06e8
diff --git a/vcl/unx/generic/window/salobj.cxx
b/vcl/unx/generic/window/salobj.cxx
index f18f73a..b4f3e63 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
commit 32765747ace52f553f815a4ba21f7e6c9b9e899f
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 12 20:19:21 2016 +0000
this GetClipRegionType is always SAL_OBJECT_CLIP_INCLUDERECTS
Change-Id: I0dc1ac4748dc81e16cf1d68e5f1bd8eb407bb9cf
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 867181a..e03933f 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -39,8 +39,6 @@ public:
return ClipRectangleList; }
void ResetClipRegion() {
numClipRectangles = 0; }
- sal_uInt16 GetClipRegionType() {
- return SAL_OBJECT_CLIP_INCLUDERECTS; }
int GetRectangleCount() {
return numClipRectangles; }
diff --git a/vcl/unx/generic/window/salobj.cxx
b/vcl/unx/generic/window/salobj.cxx
index 85cc498..f18f73a 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -307,7 +307,7 @@ void
X11SalObject::EndSetClipRegion()
{
XRectangle *pRectangles = maClipRegion.EndSetClipRegion ();
- const int nType = maClipRegion.GetClipRegionType();
+ const int nType = SAL_OBJECT_CLIP_INCLUDERECTS;
const int nRectangles = maClipRegion.GetRectangleCount();
const int dest_kind = ShapeBounding;
@@ -337,7 +337,7 @@ X11SalObject::EndSetClipRegion()
sal_uInt16
X11SalObject::GetClipRegionType()
{
- return maClipRegion.GetClipRegionType();
+ return SAL_OBJECT_CLIP_INCLUDERECTS;
}
void
commit f2d7ee6704626b7686c1046ac796f0aac8fccbfd
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 12 17:21:25 2016 +0000
SAL_OBJECT_CLIP_ABSOLUTE is never used
Change-Id: I090f9854589a26b8de78fcda1093ea0c19625c79
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index b3ae152..67a2f74 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 ad8578d..1468e22 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 5b9797d..85cc498 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;
}
commit 77bc209d64072a935c61caff2564e7f6952e3a77
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 12 17:20:38 2016 +0000
SAL_OBJECT_CLIP_EXCLUDERECTS is never used
Change-Id: I60b267e84df2ca0e540fc3218faa9a3fc4c9c55d
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index ce35234..b3ae152 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_EXCLUDERECTS ((sal_uInt16)0x0002)
#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 fbbc8fc..ad8578d 100644
--- a/vcl/source/window/clipping.cxx
+++ b/vcl/source/window/clipping.cxx
@@ -327,11 +327,6 @@ bool Window::ImplSysObjClip( const vcl::Region* pOldRegion
)
mpWindowImpl->mpSysObj->ResetClipRegion();
else
{
- if ( nClipFlags & SAL_OBJECT_CLIP_EXCLUDERECTS )
- {
- aWinRectRegion.Exclude( aRegion );
- aRegion = aWinRectRegion;
- }
if ( !(nClipFlags & SAL_OBJECT_CLIP_ABSOLUTE) )
aRegion.Move( -mnOutOffX, -mnOutOffY );
diff --git a/vcl/unx/generic/window/salobj.cxx
b/vcl/unx/generic/window/salobj.cxx
index 58f9c46..5b9797d 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_EXCLUDERECTS :
- op = ShapeSubtract;
- break;
case SAL_OBJECT_CLIP_ABSOLUTE :
op = ShapeSet;
break;
commit b7d8be937e8704c65412a972c2c823f8d8fb99b7
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 12 17:17:31 2016 +0000
nClipRegionType is always SAL_OBJECT_CLIP_INCLUDERECTS
Change-Id: Iba054bc064c664f8499219db002749072435e32c
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 77167da..867181a 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -40,7 +40,7 @@ public:
void ResetClipRegion() {
numClipRectangles = 0; }
sal_uInt16 GetClipRegionType() {
- return nClipRegionType; }
+ return SAL_OBJECT_CLIP_INCLUDERECTS; }
int GetRectangleCount() {
return numClipRectangles; }
@@ -49,7 +49,6 @@ private:
XRectangle* ClipRectangleList;
int numClipRectangles;
int maxClipRectangles;
- sal_uInt16 nClipRegionType;
};
class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
diff --git a/vcl/unx/generic/window/salobj.cxx
b/vcl/unx/generic/window/salobj.cxx
index d2809f1..58f9c46 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -184,7 +184,6 @@ SalClipRegion::SalClipRegion()
ClipRectangleList = nullptr;
numClipRectangles = 0;
maxClipRectangles = 0;
- nClipRegionType = SAL_OBJECT_CLIP_INCLUDERECTS;
}
SalClipRegion::~SalClipRegion()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
