From 5ef22c17a05ab161abc591f195158da5e4e9359e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 20 Sep 2018 17:09:57 +0100 Subject: drop dead PointChanged variant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie467c3aa1787902364f545a13ab3b4d0e4bbdbb2 Reviewed-on: https://gerrit.libreoffice.org/60831 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/inc/backgrnd.hxx | 1 - cui/source/inc/cuitabarea.hxx | 2 -- cui/source/inc/measure.hxx | 1 - cui/source/inc/textattr.hxx | 1 - cui/source/inc/transfrm.hxx | 4 +--- cui/source/tabpages/backgrnd.cxx | 5 ----- cui/source/tabpages/measure.cxx | 5 ----- cui/source/tabpages/textattr.cxx | 35 ----------------------------------- cui/source/tabpages/tppattern.cxx | 5 ----- cui/source/tabpages/tpshadow.cxx | 6 ------ cui/source/tabpages/transfrm.cxx | 10 ---------- 11 files changed, 1 insertion(+), 74 deletions(-) (limited to 'cui/source') diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 374409cb8a6f..db665c4815ef 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -56,7 +56,6 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void FillUserData() override; - virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override; virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) override; /// Shift-ListBox activation diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 5770104120b0..88232baaf86e 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -339,7 +339,6 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override; virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) override; void SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; } @@ -635,7 +634,6 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override; virtual void PointChanged( weld::DrawingArea*, RectPoint eRP ) override; void SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; } diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 728814315783..5ba4ef2ecc4f 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -79,7 +79,6 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; - virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override; virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) override; void Construct(); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 60bc9719887e..743928ffa223 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -88,7 +88,6 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; - virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override; virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) override; void Construct(); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index c04dd42c02f3..a7abbf793962 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -146,8 +146,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) override; - virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override; + virtual void PointChanged(weld::DrawingArea* pWindow, RectPoint eRP) override; void Construct(); void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } @@ -207,7 +206,6 @@ public: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PointChanged(weld::DrawingArea* pWindow, RectPoint eRP) override; - virtual void PointChanged(vcl::Window* pWindow, RectPoint eRP) override; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 4052f988d2f1..5452b11da15d 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -800,11 +800,6 @@ DeactivateRC SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) return DeactivateRC::LeavePage; } -void SvxBackgroundTabPage::PointChanged( vcl::Window*, RectPoint ) -{ - // has to be implemented so that position control can work -} - void SvxBackgroundTabPage::PointChanged( weld::DrawingArea*, RectPoint ) { // has to be implemented so that position control can work diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index b46fcdb7e8fb..7946c0b8637a 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -584,11 +584,6 @@ VclPtr SvxMeasurePage::Create(TabPageParent pParent, return VclPtr::Create(pParent, *rAttrs); } -void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RectPoint /*eRP*/ ) -{ - ChangeAttrHdl_Impl(pWindow); -} - void SvxMeasurePage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint /*eRP*/) { ChangeAttrHdl_Impl(pDrawingArea); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index b090e3f60822..b54f1dc97cce 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -507,41 +507,6 @@ VclPtr SvxTextAttrPage::Create(TabPageParent pWindow, const SfxItemS /** Check whether we have to uncheck the "Full width" check box. */ -void SvxTextAttrPage::PointChanged( vcl::Window*, RectPoint eRP ) -{ - if (m_xTsbFullWidth->get_state() == TRISTATE_TRUE) - { - // Depending on write direction and currently checked anchor we have - // to uncheck the "full width" button. - if (IsTextDirectionLeftToRight()) - switch( eRP ) - { - case RectPoint::LT: - case RectPoint::LM: - case RectPoint::LB: - case RectPoint::RT: - case RectPoint::RM: - case RectPoint::RB: - m_xTsbFullWidth->set_state( TRISTATE_FALSE ); - break; - default: ;//prevent warning - } - else - switch (eRP) - { - case RectPoint::LT: - case RectPoint::MT: - case RectPoint::RT: - case RectPoint::LB: - case RectPoint::MB: - case RectPoint::RB: - m_xTsbFullWidth->set_state( TRISTATE_FALSE ); - break; - default: ;//prevent warning - } - } -} - void SvxTextAttrPage::PointChanged(weld::DrawingArea*, RectPoint eRP) { if (m_xTsbFullWidth->get_state() == TRISTATE_TRUE) diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index a8e5e4865bb5..31babbecd6fe 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -532,11 +532,6 @@ void SvxPatternTabPage::ChangeColor_Impl() m_aCtlPreview.Invalidate(); } -void SvxPatternTabPage::PointChanged( vcl::Window*, RectPoint ) -{ - assert(false); -} - void SvxPatternTabPage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint) { if (pDrawingArea == m_xCtlPixel->GetDrawingArea()) diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index ee81f915c2a8..7535392dc327 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -476,12 +476,6 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl, weld::MetricSpinButton&, m_aCtlXRectPreview.Invalidate(); } -void SvxShadowTabPage::PointChanged( vcl::Window*, RectPoint ) -{ - // repaint shadow - ModifyShadowHdl_Impl( *m_xMtrTransparent ); -} - void SvxShadowTabPage::PointChanged( weld::DrawingArea*, RectPoint ) { // repaint shadow diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index b1a81ab56d39..46c3d2570762 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -328,11 +328,6 @@ DeactivateRC SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) return DeactivateRC::LeavePage; } -void SvxAngleTabPage::PointChanged(vcl::Window*, RectPoint) -{ - assert(false); -} - void SvxAngleTabPage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint eRP) { if (pDrawingArea == m_aCtlRect.GetDrawingArea()) @@ -1447,11 +1442,6 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const } } -void SvxPositionSizeTabPage::PointChanged(vcl::Window* /*pWindow*/, RectPoint /*eRP*/) -{ - assert(false); -} - void SvxPositionSizeTabPage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint eRP) { if (pDrawingArea == m_aCtlPos.GetDrawingArea()) -- cgit