[Libreoffice-commits] .: vcl/aqua vcl/headless vcl/inc vcl/ios vcl/unx vcl/win
Michael Meeks
michael at kemper.freedesktop.org
Wed Feb 22 01:39:43 PST 2012
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(-)
New commits:
commit f1cf3d1d6a18af079f8afd0b18be5b15b043948e
Author: Greggory Hernandez <greggory.hz at gmail.com>
Date: Wed Feb 22 09:37:42 2012 +0000
vcl: fdo#46399 cleanup and share dummy virtual methods ...
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 38fa396..40ba2d5 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 ae5c9cd..9ebf261 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 0eca9e9..2931ca0 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 14f6e16..0fc437e 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 3203a0d..751131f 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 d83379d..b441674 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 6976874..7b1a410 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 5f10027..74225cf 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 068d65a..d96c984 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 ba2b1b0..cd90e18 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 db344ed..e7ce60f 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 7ca3023..5525410 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 29125c0..bdb515a 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;
More information about the Libreoffice-commits
mailing list