diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-02-12 20:22:49 +0000 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2016-05-16 14:57:00 +0200 |
commit | 75241604b048f1099f8bba7376d73e86a85a6c8c (patch) | |
tree | 22f6f5970be5c859a26b1a0298ea4ada0d73ea1f | |
parent | 0e8e3ebce707828c369f701d470d45551df0cf26 (diff) |
nothing needs GetClipRegionType or uses SAL_OBJECT_CLIP_INCLUDERECTS now
Change-Id: Ie43eb3b2c449891fef1031e7df3f381cecb4b4f9
-rw-r--r-- | vcl/inc/osx/salobj.h | 1 | ||||
-rw-r--r-- | vcl/inc/salobj.hxx | 7 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkobject.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/unx/salobj.h | 3 | ||||
-rw-r--r-- | vcl/inc/win/salobj.h | 1 | ||||
-rw-r--r-- | vcl/osx/salobj.cxx | 5 | ||||
-rw-r--r-- | vcl/unx/generic/window/salobj.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkobject.cxx | 5 | ||||
-rw-r--r-- | vcl/win/source/window/salobj.cxx | 5 |
9 files changed, 2 insertions, 34 deletions
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h index 5db9d3e2ad1f..8660d39df714 100644 --- a/vcl/inc/osx/salobj.h +++ b/vcl/inc/osx/salobj.h @@ -56,7 +56,6 @@ public: virtual ~AquaSalObject(); virtual void ResetClipRegion() SAL_OVERRIDE; - virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE; virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; virtual void EndSetClipRegion() SAL_OVERRIDE; diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 943cefe514a4..b948e0bfae31 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -27,12 +27,6 @@ struct SystemEnvData; -// SalObject types - -#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 { void* m_pInst; @@ -44,7 +38,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 5204143b6be8..bc0c4fa5d416 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() SAL_OVERRIDE; - virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE; + virtual void ResetClipRegion() SAL_OVERRIDE; virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; virtual void EndSetClipRegion() SAL_OVERRIDE; diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index 4fc5a0867b7a..693dea718241 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -72,8 +72,7 @@ public: virtual ~X11SalObject(); // override all pure virtual methods - virtual void ResetClipRegion() SAL_OVERRIDE; - virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE; + virtual void ResetClipRegion() SAL_OVERRIDE; virtual void BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE; virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; virtual void EndSetClipRegion() SAL_OVERRIDE; diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h index 454a8563604d..096f7126f35b 100644 --- a/vcl/inc/win/salobj.h +++ b/vcl/inc/win/salobj.h @@ -41,7 +41,6 @@ public: virtual ~WinSalObject(); virtual void ResetClipRegion() SAL_OVERRIDE; - virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE; virtual void BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE; virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight) SAL_OVERRIDE; virtual void EndSetClipRegion() SAL_OVERRIDE; diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx index 58e2c6436b1a..04639fb8b95b 100644 --- a/vcl/osx/salobj.cxx +++ b/vcl/osx/salobj.cxx @@ -137,11 +137,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 e538ae423e99..923cd112bf77 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -341,12 +341,6 @@ X11SalObject::EndSetClipRegion() op, ordering ); } -sal_uInt16 -X11SalObject::GetClipRegionType() -{ - return maClipRegion.GetClipRegionType(); -} - void X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index 463c3c1ff486..fd210ea8c81f 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -112,11 +112,6 @@ void GtkSalObject::ResetClipRegion() gdk_window_shape_combine_region( widget_get_window(m_pSocket), NULL, 0, 0 ); } -sal_uInt16 GtkSalObject::GetClipRegionType() -{ - return SAL_OBJECT_CLIP_INCLUDERECTS; -} - void GtkSalObject::BeginSetClipRegion( sal_uLong ) { #if GTK_CHECK_VERSION(3,0,0) diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 4877c5329629..54f800c1b796 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/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; |