[Libreoffice-commits] core.git: include/vcl vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/slider.hxx        |    4 ----
 vcl/source/control/slider.cxx |   17 -----------------
 2 files changed, 21 deletions(-)

New commits:
commit e9136f8f30d08b29b684bc7870aee7a845283065
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 29 21:23:04 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 30 09:47:33 2020 +0100

    mpLinkedField is never set
    
    Change-Id: Ib774c57e9137979fc3f70d4798f1b875b99e4ea1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87710
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 1dacbdf98866..3281080526b3 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -51,8 +51,6 @@ private:
     bool            mbCalcSize;
     bool            mbScrollTypeSet;
 
-    VclPtr<NumericField> mpLinkedField;
-
     Link<Slider*,void>   maSlideHdl;
     Link<Slider*,void>   maEndSlideHdl;
 
@@ -72,12 +70,10 @@ private:
     SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, bool bCallAction );
     SAL_DLLPRIVATE void ImplDoSlide( long nNewPos );
     SAL_DLLPRIVATE void ImplDoSlideAction( ScrollType eScrollType );
-    SAL_DLLPRIVATE void ImplUpdateLinkedField();
 
 public:
                     Slider( vcl::Window* pParent, WinBits nStyle);
     virtual         ~Slider() override;
-    virtual void    dispose() override;
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
     virtual void    MouseButtonUp( const MouseEvent& rMEvt ) override;
     virtual void    Tracking( const TrackingEvent& rTEvt ) override;
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 394371f0fac5..f1f447f56673 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -58,8 +58,6 @@ void Slider::ImplInit( vcl::Window* pParent, WinBits nStyle )
     mbCalcSize          = true;
     mbScrollTypeSet     = false;
 
-    mpLinkedField       = nullptr;
-
     Control::ImplInit( pParent, nStyle, nullptr );
 
     ImplInitSettings();
@@ -77,12 +75,6 @@ Slider::~Slider()
     disposeOnce();
 }
 
-void Slider::dispose()
-{
-    mpLinkedField.clear();
-    Control::dispose();
-}
-
 void Slider::ImplInitSettings()
 {
     vcl::Window* pParent = GetParent();
@@ -213,12 +205,6 @@ void Slider::ImplUpdateRects( bool bUpdate )
     }
 }
 
-void Slider::ImplUpdateLinkedField()
-{
-    if (mpLinkedField)
-        mpLinkedField->SetValue(mnThumbPos);
-}
-
 long Slider::ImplCalcThumbPos( long nPixPos )
 {
     // calculate position
@@ -770,7 +756,6 @@ void Slider::Tracking( const TrackingEvent& rTEvt )
                 {
                     ImplUpdateRects();
                     Update();
-                    ImplUpdateLinkedField();
                     if ( nOldPos != mnThumbPos )
                     {
                         Slide();
@@ -939,7 +924,6 @@ void Slider::SetRange( const Range& rRange )
             mnThumbPos = mnMaxRange;
         if ( mnThumbPos < mnMinRange )
             mnThumbPos = mnMinRange;
-        ImplUpdateLinkedField();
         CompatStateChanged( StateChangedType::Data );
     }
 }
@@ -954,7 +938,6 @@ void Slider::SetThumbPos( long nNewThumbPos )
     if ( mnThumbPos != nNewThumbPos )
     {
         mnThumbPos = nNewThumbPos;
-        ImplUpdateLinkedField();
         CompatStateChanged( StateChangedType::Data );
     }
 }