From f1cf3d1d6a18af079f8afd0b18be5b15b043948e Mon Sep 17 00:00:00 2001 From: Greggory Hernandez Date: Wed, 22 Feb 2012 09:37:42 +0000 Subject: vcl: fdo#46399 cleanup and share dummy virtual methods ... --- vcl/aqua/source/window/salobj.cxx | 24 ------------------------ vcl/headless/svpdummies.cxx | 4 ---- vcl/inc/aqua/salobj.h | 4 ---- vcl/inc/headless/svpdummies.hxx | 5 ----- vcl/inc/ios/salobj.h | 4 ---- vcl/inc/salobj.hxx | 8 ++++---- vcl/inc/unx/gtk/gtkobject.hxx | 5 ----- vcl/inc/unx/salobj.h | 4 ---- vcl/inc/win/salobj.h | 2 -- vcl/ios/source/window/salobj.cxx | 24 ------------------------ vcl/unx/generic/window/salobj.cxx | 20 -------------------- vcl/unx/gtk/window/gtkobject.cxx | 16 ---------------- vcl/win/source/window/salobj.cxx | 14 -------------- 13 files changed, 4 insertions(+), 130 deletions(-) (limited to 'vcl') diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx index 38fa396c4d51..40ba2d5a5128 100644 --- a/vcl/aqua/source/window/salobj.cxx +++ b/vcl/aqua/source/window/salobj.cxx @@ -207,30 +207,6 @@ void AquaSalObject::Show( sal_Bool bVisible ) // ----------------------------------------------------------------------- -void AquaSalObject::Enable( sal_Bool ) -{ -} - -// ----------------------------------------------------------------------- - -void AquaSalObject::GrabFocus() -{ -} - -// ----------------------------------------------------------------------- - -void AquaSalObject::SetBackground() -{ -} - -// ----------------------------------------------------------------------- - -void AquaSalObject::SetBackground( SalColor ) -{ -} - -// ----------------------------------------------------------------------- - const SystemEnvData* AquaSalObject::GetSystemData() const { return &maSysData; diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx index ae5c9cd09577..9ebf261aa634 100644 --- a/vcl/headless/svpdummies.cxx +++ b/vcl/headless/svpdummies.cxx @@ -50,10 +50,6 @@ void SvpSalObject::UnionClipRegion( long, long, long, long ) {} void SvpSalObject::EndSetClipRegion() {} void SvpSalObject::SetPosSize( long, long, long, long ) {} void SvpSalObject::Show( sal_Bool ) {} -void SvpSalObject::Enable( sal_Bool ) {} -void SvpSalObject::GrabFocus() {} -void SvpSalObject::SetBackground() {} -void SvpSalObject::SetBackground( SalColor ) {} const SystemEnvData* SvpSalObject::GetSystemData() const { return &m_aSystemChildData; } void SvpSalObject::InterceptChildWindowKeyDown( sal_Bool ) {} diff --git a/vcl/inc/aqua/salobj.h b/vcl/inc/aqua/salobj.h index 0eca9e9badbd..2931ca05bf56 100644 --- a/vcl/inc/aqua/salobj.h +++ b/vcl/inc/aqua/salobj.h @@ -76,10 +76,6 @@ public: virtual void EndSetClipRegion(); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); virtual void Show( sal_Bool bVisible ); - virtual void Enable( sal_Bool nEnable ); - virtual void GrabFocus(); - virtual void SetBackground(); - virtual void SetBackground( SalColor nSalColor ); virtual const SystemEnvData* GetSystemData() const; virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); }; diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 14f6e166d781..0fc437e1aa71 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -53,11 +53,6 @@ public: virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); virtual void Show( sal_Bool bVisible ); - virtual void Enable( sal_Bool nEnable ); - virtual void GrabFocus(); - - virtual void SetBackground(); - virtual void SetBackground( SalColor nSalColor ); virtual const SystemEnvData* GetSystemData() const; diff --git a/vcl/inc/ios/salobj.h b/vcl/inc/ios/salobj.h index 3203a0d46e93..751131f25933 100644 --- a/vcl/inc/ios/salobj.h +++ b/vcl/inc/ios/salobj.h @@ -73,10 +73,6 @@ public: virtual void EndSetClipRegion(); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); virtual void Show( sal_Bool bVisible ); - virtual void Enable( sal_Bool nEnable ); - virtual void GrabFocus(); - virtual void SetBackground(); - virtual void SetBackground( SalColor nSalColor ); virtual const SystemEnvData* GetSystemData() const; virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); }; diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index d83379d3a09a..b4416749d113 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -66,11 +66,11 @@ public: virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0; virtual void Show( sal_Bool bVisible ) = 0; - virtual void Enable( sal_Bool nEnable ) = 0; - virtual void GrabFocus() = 0; + virtual void Enable( sal_Bool nEnable ) {} + virtual void GrabFocus() {} - virtual void SetBackground() = 0; - virtual void SetBackground( SalColor nSalColor ) = 0; + virtual void SetBackground() {} + virtual void SetBackground( SalColor nSalColor ) {} virtual void SetForwardKey( sal_Bool /*bEnable*/ ) {} diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx index 69768743db50..7b1a41032a13 100644 --- a/vcl/inc/unx/gtk/gtkobject.hxx +++ b/vcl/inc/unx/gtk/gtkobject.hxx @@ -61,11 +61,6 @@ public: virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); virtual void Show( sal_Bool bVisible ); - virtual void Enable( sal_Bool nEnable ); - virtual void GrabFocus(); - - virtual void SetBackground(); - virtual void SetBackground( SalColor nSalColor ); virtual void SetForwardKey( sal_Bool bEnable ); diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index 5f10027a0d8b..74225cfa1222 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -92,12 +92,8 @@ public: virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); virtual void Show( sal_Bool bVisible ); - virtual void Enable( sal_Bool nEnable ); virtual void GrabFocus(); - virtual void SetBackground(); - virtual void SetBackground( SalColor nSalColor ); - virtual const SystemEnvData* GetSystemData() const; virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h index 068d65a611f2..d96c9843893b 100644 --- a/vcl/inc/win/salobj.h +++ b/vcl/inc/win/salobj.h @@ -62,8 +62,6 @@ public: virtual void Show( sal_Bool bVisible ); virtual void Enable( sal_Bool nEnable ); virtual void GrabFocus(); - virtual void SetBackground(); - virtual void SetBackground( SalColor nSalColor ); virtual const SystemEnvData* GetSystemData() const; virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); }; diff --git a/vcl/ios/source/window/salobj.cxx b/vcl/ios/source/window/salobj.cxx index ba2b1b0b8c7d..cd90e18a9b7e 100644 --- a/vcl/ios/source/window/salobj.cxx +++ b/vcl/ios/source/window/salobj.cxx @@ -202,30 +202,6 @@ void IosSalObject::Show( sal_Bool /*bVisible*/ ) // ----------------------------------------------------------------------- -void IosSalObject::Enable( sal_Bool ) -{ -} - -// ----------------------------------------------------------------------- - -void IosSalObject::GrabFocus() -{ -} - -// ----------------------------------------------------------------------- - -void IosSalObject::SetBackground() -{ -} - -// ----------------------------------------------------------------------- - -void IosSalObject::SetBackground( SalColor ) -{ -} - -// ----------------------------------------------------------------------- - const SystemEnvData* IosSalObject::GetSystemData() const { return &maSysData; diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index db344ed528e8..e7ce60ff32bb 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -412,14 +412,6 @@ X11SalObject::Show( sal_Bool bVisible ) mbVisible = bVisible; } -// ----------------------------------------------------------------------- - -void X11SalObject::Enable( sal_Bool ) -{ -} - -// ----------------------------------------------------------------------- - void X11SalObject::GrabFocus() { if( mbVisible ) @@ -431,18 +423,6 @@ void X11SalObject::GrabFocus() // ----------------------------------------------------------------------- -void X11SalObject::SetBackground() -{ -} - -// ----------------------------------------------------------------------- - -void X11SalObject::SetBackground( SalColor ) -{ -} - -// ----------------------------------------------------------------------- - const SystemChildData* X11SalObject::GetSystemData() const { return &maSystemChildData; diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index 7ca30237d2b0..552541024efb 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -176,22 +176,6 @@ void GtkSalObject::Show( sal_Bool bVisible ) } } -void GtkSalObject::Enable( sal_Bool ) -{ -} - -void GtkSalObject::GrabFocus() -{ -} - -void GtkSalObject::SetBackground() -{ -} - -void GtkSalObject::SetBackground( SalColor ) -{ -} - const SystemEnvData* GtkSalObject::GetSystemData() const { return &m_aSystemData; diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 29125c00c602..bdb515ab2884 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -815,20 +815,6 @@ void WinSalObject::GrabFocus() ::SetFocus( mhWndChild ); } -// ----------------------------------------------------------------------- - -void WinSalObject::SetBackground() -{ -} - -// ----------------------------------------------------------------------- - -void WinSalObject::SetBackground( SalColor ) -{ -} - -// ----------------------------------------------------------------------- - const SystemEnvData* WinSalObject::GetSystemData() const { return &maSysData; -- cgit v1.2.3