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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0b3ceaaf9bddd74aa61e8ab934caa68a7238e405
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Apr 1 12:09:43 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Apr 4 17:10:52 2019 +0200

    Resolves: tdf#124440 nospin has no subedit
    
    Change-Id: I4e801ec234e86be935a79c9e29f0e5091904f12e
    Reviewed-on: https://gerrit.libreoffice.org/70053
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 2c150f952fb75da271648bf76c3a1bbf32bd25da)
    Reviewed-on: https://gerrit.libreoffice.org/70125
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    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 297926d03012..bce3b3815f06 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2559,7 +2559,10 @@ 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));
+        if (Edit* pEdit = m_xButton->GetSubEdit())
+            pEdit->SetActivateHdl(LINK(this, SalInstanceSpinButton, ActivateHdl));
+        else
+            m_xButton->SetActivateHdl(LINK(this, SalInstanceSpinButton, ActivateHdl));
     }
 
     virtual int get_value() const override
@@ -2621,6 +2624,8 @@ public:
     {
         if (Edit* pEdit = m_xButton->GetSubEdit())
             pEdit->SetActivateHdl(Link<Edit&, bool>());
+        else
+            m_xButton->SetActivateHdl(Link<Edit&, bool>());
         m_xButton->SetInputHdl(Link<sal_Int64*, TriState>());
         m_xButton->SetOutputHdl(Link<Edit&, bool>());
         m_xButton->SetLoseFocusHdl(Link<Control&, void>());