diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-17 12:14:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-17 15:34:36 +0200 |
| commit | 0e46ba3aa1822ba04a319b28bdc1ca4df6805064 (patch) | |
| tree | fcce2b4055499b937eeda9e5451248778e515c76 /sfx2/source | |
| parent | 9a31b606d39f90c72dd674b0f4f6a37c44fac5ef (diff) | |
tdf#134598 call FmtSelect to update watercan
Change-Id: Idd88acfdaac66b999b0bcd8cf0a4fe69f7ae6ac5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102917
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 18aa04187fcb..753fd6d23a9c 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -867,7 +867,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr, bool bIsCal { mxTreeBox->scroll_to_row(*xEntry); mxTreeBox->select(*xEntry); - return; + break; } bEntry = mxTreeBox->iter_next(*xEntry); } @@ -893,7 +893,6 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr, bool bIsCal mxFmtLb->unselect_all(); mxFmtLb->scroll_to_row(*xEntry); mxFmtLb->select(*xEntry); - FmtSelect(nullptr, bIsCallback); } } } @@ -909,6 +908,12 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr, bool bIsCal } bWaterDisabled = !IsSafeForWaterCan(); + + if (!bIsCallback) + { + // tdf#134598 call FmtSelect to update watercan + FmtSelect(nullptr, false); + } } OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const |