nothing needs GetClipRegionType or uses SAL_OBJECT_CLIP_INCLUDERECTS now

Change-Id: Ie43eb3b2c449891fef1031e7df3f381cecb4b4f9

6 files changed, 3 insertions, 11 deletions

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;