sfx2/source/dialog/templdlg.cxx | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 0e46ba3aa1822ba04a319b28bdc1ca4df6805064
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Sep 17 12:14:25 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Sep 17 15:34:36 2020 +0200
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 <caol...@redhat.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
