extensions/source/propctrlr/browserline.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
New commits: commit 87ccf7f5395919ec4c5b7c4433c3f259eb10674d Author: Caolán McNamara <[email protected]> AuthorDate: Wed Nov 11 20:58:25 2020 +0000 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Nov 16 09:50:15 2020 +0100 tdf#138131 don't set enabled if container is already enabled Change-Id: I46556c7242ad9b5c4c7a8fb923dc87458e56494e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105538 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 9b45c0c9e3f5..5f185c594243 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -232,16 +232,18 @@ namespace pcr } } - void implEnable(weld::Widget* pWindow, sal_uInt16 nEnabledBits, sal_uInt16 nMatchBits) + void implEnable(weld::Widget* pWindow, bool bEnable) { - if (pWindow) - pWindow->set_sensitive((nEnabledBits & nMatchBits) == nMatchBits); + // tdf#138131 get_sensitive comparison as bodge for + // vcl's recursive Enable behavior + if (pWindow && pWindow->get_sensitive() != bEnable) + pWindow->set_sensitive(bEnable); } - void implEnable(weld::Widget* pWindow, bool bEnable) + void implEnable(weld::Widget* pWindow, sal_uInt16 nEnabledBits, sal_uInt16 nMatchBits) { - if (pWindow) - pWindow->set_sensitive(bEnable); + bool bEnable = ((nEnabledBits & nMatchBits) == nMatchBits); + implEnable(pWindow, bEnable); } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
