[Libreoffice-commits] core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/animations/CustomAnimationDialog.cxx |   22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

New commits:
commit a8f9b351fe331785823d2bc7ffd3ebec7a0cb1fa
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu May 20 10:53:17 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu May 20 13:41:59 2021 +0200

    only the listbox handler does anything, remove the others
    
    Change-Id: I7c63b21c0902edd4586e6f249d50e6f0d475a851
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115860
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 1fb22575975e..b888d92926f4 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1428,9 +1428,7 @@ public:
     void update( STLPropertySet* pSet );
 
     DECL_LINK(implControlHdl, weld::ComboBox&, void);
-    DECL_LINK(implClickHdl, weld::Button&, void);
     DECL_LINK(DurationModifiedHdl, weld::MetricSpinButton&, void);
-    void implHdl(const weld::Widget*);
 
 private:
     const STLPropertySet* mpSet;
@@ -1472,7 +1470,6 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(weld::Container*
 
     fillRepeatComboBox(*mxCBRepeat);
 
-    mxRBClickSequence->connect_clicked(LINK(this, CustomAnimationDurationTabPage, implClickHdl));
     mxLBTrigger->connect_changed(LINK(this, CustomAnimationDurationTabPage, implControlHdl));
     mxCBXDuration->connect_value_changed(LINK( this, CustomAnimationDurationTabPage, DurationModifiedHdl));
 
@@ -1609,14 +1606,10 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(weld::Container*
     }
 }
 
-IMPL_LINK(CustomAnimationDurationTabPage, implClickHdl, weld::Button&, rBtn, void)
-{
-    implHdl(&rBtn);
-}
-
-IMPL_LINK(CustomAnimationDurationTabPage, implControlHdl, weld::ComboBox&, rListBox, void)
+IMPL_LINK_NOARG(CustomAnimationDurationTabPage, implControlHdl, weld::ComboBox&, void)
 {
-    implHdl(&rListBox);
+    mxRBInteractive->set_active(true);
+    assert(!mxRBClickSequence->get_active());
 }
 
 IMPL_LINK_NOARG(CustomAnimationDurationTabPage, DurationModifiedHdl, weld::MetricSpinButton&, void)
@@ -1631,15 +1624,6 @@ IMPL_LINK_NOARG(CustomAnimationDurationTabPage, DurationModifiedHdl, weld::Metri
     }
 }
 
-void CustomAnimationDurationTabPage::implHdl(const weld::Widget* pControl)
-{
-    if (pControl == mxLBTrigger.get())
-    {
-        mxRBClickSequence->set_active(false);
-        mxRBInteractive->set_active(true);
-    }
-}
-
 void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
 {
     auto nPos = mxLBStart->get_active();