sfx2/source/dialog/StyleList.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 18a66c788983115a37bb02112d3dba8935a4ce97
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Nov 25 20:16:14 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Nov 26 09:51:39 2021 +0100
m_xTreeBox is always true
this has evolved from an optional m_pTreeBox widget to an always present
widget that's optionally visible and this case wasn't updated somewhere
along the line. Use "IsSafeForWaterCan" which the other cases of this
pattern were merged to
Change-Id: Ia20327ade5378bbdfa9fbfecbfa9705a33555f17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125850
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx
index a76a0dd094fb..776d355b217e 100644
--- a/sfx2/source/dialog/StyleList.cxx
+++ b/sfx2/source/dialog/StyleList.cxx
@@ -1051,8 +1051,7 @@ IMPL_LINK_NOARG(StyleList, UpdateStyleDependents, void*,
void)
// Trigger Help PI. Only when the watercan is on
if (m_nActFamily != 0xffff && m_pParentDialog->IsCheckedItem("watercan") &&
// only if that region is allowed
- nullptr != m_pFamilyState[m_nActFamily - 1]
- && (m_xTreeBox || m_xFmtLb->count_selected_rows() <= 1))
+ nullptr != m_pFamilyState[m_nActFamily - 1] &&
IsSafeForWaterCan(nullptr))
{
m_pParentDialog->Execute_Impl(SID_STYLE_WATERCAN, "", "", 0, *this);
m_pParentDialog->Execute_Impl(SID_STYLE_WATERCAN, GetSelectedEntry(),
"",
