these overrides just call only their parent version

looks like the sort of simplfication that could be automated

Change-Id: I29ce13fe1b98e99be096e44239b971f6971c5f98

4 files changed, 4 insertions, 23 deletions

diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index c18834f75157..c2ffb56846e4 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -61,7 +61,6 @@ private:
 
 protected:
     virtual void    Resize() override;
-    virtual bool    Close() override;
 
 public:
     SvxColorWindow_Impl( const OUString& rCommand,
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 49da834f9227..b0c25965c2c2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -258,7 +258,6 @@ private:
 
 protected:
     virtual void    Resize() override;
-    virtual bool    Close() override;
     virtual void    GetFocus() override;
 
 public:
@@ -283,7 +282,6 @@ private:
 
 protected:
     virtual void    Resize() override;
-    virtual bool    Close() override;
     virtual void    GetFocus() override;
 public:
     SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow );
@@ -1458,11 +1456,6 @@ void SvxColorWindow_Impl::StartSelection()
     mpColorSet->StartSelection();
 }
 
-bool SvxColorWindow_Impl::Close()
-{
-    return SfxPopupWindow::Close();
-}
-
 void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( nSID == SID_COLOR_TABLE )
@@ -1850,11 +1843,6 @@ void SvxFrameWindow_Impl::StartSelection()
     aFrameSet->StartSelection();
 }
 
-bool SvxFrameWindow_Impl::Close()
-{
-    return SfxPopupWindow::Close();
-}
-
 static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
 {
     return SvxBorderLine::threeDMediumColor( aMain );
@@ -2030,11 +2018,6 @@ void SvxLineWindow_Impl::Resize()
     m_aLineStyleLb->Resize();
 }
 
-bool SvxLineWindow_Impl::Close()
-{
-    return SfxPopupWindow::Close();
-}
-
 void SvxLineWindow_Impl::GetFocus()
 {
     if ( m_aLineStyleLb )
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 28583f53275c..dd8a8aebc215 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -957,9 +957,9 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
                 {
                     // dispatch to correct window type (why is Close() not virtual ??? )
                     // TODO: make Close() virtual
-                    VclPtr<vcl::Window> pWin = pBorderWindow->ImplGetClientWindow()->ImplGetWindow();
-                    SystemWindow  *pSysWin  = dynamic_cast<SystemWindow* >(pWin.get());
-                    DockingWindow *pDockWin = dynamic_cast<DockingWindow*>(pWin.get());
+                    vcl::Window *pWin = pBorderWindow->ImplGetClientWindow()->ImplGetWindow();
+                    SystemWindow  *pSysWin  = dynamic_cast<SystemWindow* >(pWin);
+                    DockingWindow *pDockWin = dynamic_cast<DockingWindow*>(pWin);
                     if ( pSysWin )
                         pSysWin->Close();
                     else if ( pDockWin )
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index d130466d1603..82283c94337e 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -569,7 +569,7 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const vcl::Window* pWindow )
 
 IMPL_LINK_NOARG_TYPED(FloatingWindow, ImplEndPopupModeHdl, void*, void)
 {
-    VclPtr<FloatingWindow> xThis(this);
+    VclPtr<FloatingWindow> pThis(this);
     mnPostId            = nullptr;
     mnPopupModeFlags    = FloatWinPopupFlags::NONE;
     mbPopupMode         = false;
@@ -590,7 +590,6 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
 
             if ( (nKeyCode == KEY_ESCAPE) && (GetStyle() & WB_CLOSEABLE) )
             {
-                VclPtr<FloatingWindow> xThis(this);
                 Close();
                 return true;
             }