From d7ff5df1dc5c7ae0f468e0250c54e9f72035093c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 14 Oct 2020 16:42:26 +0100 Subject: tdf#137294 don't change subset sensitivity after setting search mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iaa76e2bc8029ac8f8a52b0c45f74b57395090088 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104312 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- cui/source/dialogs/cuicharmap.cxx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'cui/source/dialogs/cuicharmap.cxx') diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 25b05c68d2b1..f78b70a29662 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -644,11 +644,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl, weld::ComboBox&, void) m_xShowSet->SetFont( aFont ); m_xSearchSet->SetFont( aFont ); m_aShowChar.SetFont( aFont ); - if (isSearchMode) - { - SearchUpdateHdl(*m_xSearchText); - SearchCharHighlightHdl(m_xSearchSet.get()); - } // setup unicode subset listbar with font specific subsets, // hide unicode subset listbar for symbol fonts @@ -676,6 +671,14 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl, weld::ComboBox&, void) m_xSubsetText->set_sensitive(bNeedSubset); m_xSubsetLB->set_sensitive(bNeedSubset); + if (isSearchMode) + { + // tdf#137294 do this after modifying m_xSubsetLB sensitivity to + // restore insensitive for the search case + SearchUpdateHdl(*m_xSearchText); + SearchCharHighlightHdl(m_xSearchSet.get()); + } + // tdf#118304 reselect current glyph to see if its still there in new font selectCharByCode(Radix::hexadecimal); } -- cgit v1.2.3