[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/app/salvtables.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 154c72769d39258c5efbc35175824d08706a9314
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 9 13:05:16 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jan 11 18:43:23 2019 +0100

    Resolves: tdf#122348 make return in spinbutton signal value change
    
    before going on to close the dialog afterwards
    
    Change-Id: I9764512a944e52b0d2bff2d11c8cf74c057e2623
    Reviewed-on: https://gerrit.libreoffice.org/66083
    Tested-by: Jenkins
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index baf21c15532c..20198f7f556d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1644,6 +1644,7 @@ private:
     DECL_LINK(LoseFocusHdl, Control&, void);
     DECL_LINK(OutputHdl, Edit&, bool);
     DECL_LINK(InputHdl, sal_Int64*, TriState);
+    DECL_LINK(ActivateHdl, Edit&, void);
 
 public:
     SalInstanceSpinButton(NumericField* pButton, bool bTakeOwnership)
@@ -1655,6 +1656,7 @@ public:
         m_xButton->SetLoseFocusHdl(LINK(this, SalInstanceSpinButton, LoseFocusHdl));
         m_xButton->SetOutputHdl(LINK(this, SalInstanceSpinButton, OutputHdl));
         m_xButton->SetInputHdl(LINK(this, SalInstanceSpinButton, InputHdl));
+        m_xButton->GetSubEdit()->SetActivateHdl(LINK(this, SalInstanceSpinButton, ActivateHdl));
     }
 
     virtual int get_value() const override
@@ -1709,6 +1711,8 @@ public:
 
     virtual ~SalInstanceSpinButton() override
     {
+        if (Edit* pEdit = m_xButton->GetSubEdit())
+            pEdit->SetActivateHdl(Link<Edit&, void>());
         m_xButton->SetInputHdl(Link<sal_Int64*, TriState>());
         m_xButton->SetOutputHdl(Link<Edit&, bool>());
         m_xButton->SetLoseFocusHdl(Link<Control&, void>());
@@ -1717,6 +1721,12 @@ public:
     }
 };
 
+IMPL_LINK_NOARG(SalInstanceSpinButton, ActivateHdl, Edit&, void)
+{
+    // tdf#122348 return pressed to end dialog
+    signal_value_changed();
+}
+
 IMPL_LINK_NOARG(SalInstanceSpinButton, UpDownHdl, SpinField&, void)
 {
     signal_value_changed();