nothing needs GetClipRegionType or uses SAL_OBJECT_CLIP_INCLUDERECTS now

Change-Id: Ie43eb3b2c449891fef1031e7df3f381cecb4b4f9

12 files changed, 3 insertions, 38 deletions

diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 06258ccb2fc6..0c1b8c3ebf66 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 b26540705d8e..e0625a36f560 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 8dc316e6d9f0..19a0090dcc7a 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 67a2f74e6908..174b1b11abc4 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 9e2ad5da1fc1..55896a281aca 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 e03933f50306..424f3aacb686 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 d172d2fad9e8..e6c9e5a4f103 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 a747ae323d6c..87edbfa9a1ed 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 b4f3e63a9a32..8652e50f315d 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 cc78ff5db980..a015c013a5c3 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 8c06b4ec8e8d..d213e1c4bba4 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 033c79822e71..01a330c2d2f5 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;