cui/source/customize/eventdlg.cxx | 3 --- cui/source/customize/macropg.cxx | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 80d7bedee20eb191b1f5a6b2767630eb823d63b2 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Apr 28 20:12:18 2021 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Apr 29 09:45:11 2021 +0200 freeze without thaw which was already SetUpdateMode(FALSE) without matching SetUpdateMode(TRUE) in: commit d32b3a714fe55892bdead03502c5a9b0e77fa61d Date: Sat Oct 31 00:36:06 2009 +0100 #i106421#: move svx/source/cui to cui and then remove the outside freeze/thaw pair, which may in practice have worked around the unbalanced inner freeze/thaw, from SvxEventConfigPage::SelectHdl_Impl in favour of the inner freeze/thaw so the select can work on a thawed treeview Change-Id: I6dbcfd000f717047354e7cdcfb9b3a502e1fbbe5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114822 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 72cd08b168fa..54ebcdefa0c7 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -123,7 +123,6 @@ IMPL_LINK_NOARG( SvxEventConfigPage, SelectHdl_Impl, weld::ComboBox&, void ) { bool bApp = m_xSaveInListBox->get_active_id().toBoolean(); - mpImpl->xEventLB->freeze(); if (bApp) { SetReadOnly( false ); @@ -155,8 +154,6 @@ IMPL_LINK_NOARG( SvxEventConfigPage, SelectHdl_Impl, weld::ComboBox&, void ) SetReadOnly( isReadonly ); SvxMacroTabPage_::DisplayAppEvents( false ); } - - mpImpl->xEventLB->thaw(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index c6bfd2966b6f..6f03188e285c 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -319,7 +319,10 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents) // have to use the original XNameReplace since the hash iterators do // not guarantee the order in which the elements are returned if(!nameReplace.is()) + { + mpImpl->xEventLB->thaw(); return; + } for (auto const& displayableEvent : aDisplayNames) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
