diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-11-25 20:27:49 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-11-26 20:19:35 +0100 |
commit | e980aad43ff4f5a3aa07b66ccae200bfb95eabf6 (patch) | |
tree | 697deb75b057175ab815ebcf402fdd27500c52d4 /sfx2 | |
parent | 368c9f4721bcb7b5e373321868f2af249f12fcfc (diff) |
tdf#145814 fill format mode is mostly disabled
when it shouldn't
Change-Id: Ic282c313a6986d7d08f54b475c5d2ce32098ada1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125889
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/StyleList.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx index 776d355b217e..5b86a1033c49 100644 --- a/sfx2/source/dialog/StyleList.cxx +++ b/sfx2/source/dialog/StyleList.cxx @@ -1613,9 +1613,6 @@ IMPL_LINK(StyleList, FmtSelectHdl, weld::TreeView&, rListBox, void) if (!rListBox.get_cursor(xHdlEntry.get())) return; - if (rListBox.is_selected(*xHdlEntry)) - m_aUpdateStyleDependents.Call(nullptr); - m_pParentDialog->SelectStyle(rListBox.get_text(*xHdlEntry), true, *this); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 12a8f9ff3a51..0cccf5a5d989 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -367,11 +367,8 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr, bool bIsCal bWaterDisabled = !IsSafeForWaterCan(); - if (!bIsCallback) - { - // tdf#134598 call UpdateStyleDependents to update watercan - UpdateStyleDependents_Hdl(nullptr); - } + // tdf#134598 call UpdateStyleDependents to update watercan + UpdateStyleDependents_Hdl(nullptr); } void SfxCommonTemplateDialog_Impl::EnableTreeDrag(bool bEnable) |