commit dcab1993ed29a408a704cfddbbd15dc7dd8ffc80
author Caolán McNamara <caolanm@redhat.com> Mon Jan 06 10:48:34 2020 +0000
committer Caolán McNamara <caolanm@redhat.com> Mon Jan 06 14:30:37 2020 +0100
tree f8ed013d9499c59b3286bc6524266a9a6fa81b72
parent aa528eadbf3f1fa46390ad5b25e0f4e3c89e0382

Resolves: tdf#129527 enable/disable edit-style button at the right time

Change-Id: I70b14ad8d96a2564c06a47608e5cf2c438cf7d38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/source/ui/chrdlg/numpara.cxx

diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index fcabb9bb..8a43e38 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -66,12 +66,7 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(weld::Container* pPage, weld::Dialo
    m_xNewStartNumberCB->set_state(TRISTATE_FALSE);
    m_xCountParaCB->set_state(TRISTATE_FALSE);
    m_xRestartParaCountCB->set_state(TRISTATE_FALSE);

    int numSelectPos = m_xNumberStyleLB->get_active();
    if (numSelectPos == 0)
        m_xEditNumStyleBtn->set_sensitive(false);
    else
        m_xEditNumStyleBtn->set_sensitive(true);
    m_xEditNumStyleBtn->set_sensitive(false);

    const SfxPoolItem* pItem;
    SfxObjectShell* pObjSh;
@@ -213,6 +208,8 @@ void SwParagraphNumTabPage::Reset(const SfxItemSet* rSet)
        m_xNumberStyleLB->set_active(-1);
    }

    EditNumStyleSelectHdl_Impl(*m_xNumberStyleLB);

    m_xNumberStyleLB->save_value();

    eItemState = rSet->GetItemState( FN_NUMBER_NEWSTART );
@@ -301,7 +298,8 @@ IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl, weld::ToggleButton&, v
IMPL_LINK_NOARG(SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, weld::ComboBox&, void)
{
    int numSelectPos = m_xNumberStyleLB->get_active();
    if (numSelectPos == 0)
    // 0 is "None" and -1 is unselected state
    if (numSelectPos == 0 || numSelectPos == -1)
        m_xEditNumStyleBtn->set_sensitive(false);
    else
        m_xEditNumStyleBtn->set_sensitive(true);