commit 6e8605ee6de4ead23925476f0e945b51dea26be0
author Caolán McNamara <caolanm@redhat.com> Tue Nov 27 14:57:08 2018 +0000
committer Caolán McNamara <caolanm@redhat.com> Tue Nov 27 21:08:49 2018 +0100
tree da3ec97cb52331bdc41abc56211bb9aa84e02cf6
parent 6ab7bfbca4148416233dbf8b9bfc79f3a1dfa821

Related: tdf#94446 don't assert on unsetting focus handlers

Change-Id: I7817f66974807eaf7d16a6d0dc30b4fbd6d366a5
Reviewed-on: https://gerrit.libreoffice.org/64119
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

include/vcl/weld.hxx

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index fa2ba7b..da56503 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -98,13 +98,13 @@

    virtual void connect_focus_in(const Link<Widget&, void>& rLink)
    {
        assert(!m_aFocusInHdl.IsSet());
        assert(!m_aFocusInHdl.IsSet() || !rLink.IsSet());
        m_aFocusInHdl = rLink;
    }

    virtual void connect_focus_out(const Link<Widget&, void>& rLink)
    {
        assert(!m_aFocusOutHdl.IsSet());
        assert(!m_aFocusOutHdl.IsSet() || !rLink.IsSet());
        m_aFocusOutHdl = rLink;
    }