sfx2/source/dialog/StyleList.cxx | 3 ---
sfx2/source/dialog/templdlg.cxx | 7 ++-----
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 94960a5594f932a2ba767db21bdf803180a8c761
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Nov 25 20:27:49 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Nov 26 16:49:01 2021 +0100
tdf#145814 fill format mode is mostly disabled
when it shouldn't
Change-Id: Ic282c313a6986d7d08f54b475c5d2ce32098ada1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125851
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 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)
