diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-14 16:42:26 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-10-16 11:04:26 +0200 |
| commit | 252cf479c483022505efc2641b64fa7cfde385b1 (patch) | |
| tree | fdeb64f5f722877c3ef1f407a388f65bc68602a9 /cui | |
| parent | better fix for tdf#136455 without destroying widgets we don't truly own (diff) | |
| download | core-252cf479c483022505efc2641b64fa7cfde385b1.tar.gz core-252cf479c483022505efc2641b64fa7cfde385b1.zip | |
tdf#137294 don't change subset sensitivity after setting search mode
Change-Id: Iaa76e2bc8029ac8f8a52b0c45f74b57395090088
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104307
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 13d3c8e7658b..bcc1dd16a454 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -643,11 +643,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 @@ -675,6 +670,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); } |