sw/source/ui/chrdlg/drpcps.cxx | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit cac7541e1b2a1bbd0fca08853fd8323bb0078247
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 11 11:13:49 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Feb 11 16:34:22 2019 +0100
Resolves: tdf#123320 non-existing drop caps char style
Change-Id: I416e3fcffe7da549ffd3b82cb912d78d1ca02339
Reviewed-on: https://gerrit.libreoffice.org/67682
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 04d88c166db6..da6500ddd642 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -554,9 +554,14 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet)
m_xTemplateBox->insert_text(0, SwResId(SW_STR_NONE));
// Reset format
- m_xTemplateBox->set_active(0);
+ int nSelect = 0;
if (aFormatDrop.GetCharFormat())
-
m_xTemplateBox->set_active_text(aFormatDrop.GetCharFormat()->GetName());
+ {
+ int nPos =
m_xTemplateBox->find_text(aFormatDrop.GetCharFormat()->GetName());
+ if (nPos != -1)
+ nSelect = nPos;
+ }
+ m_xTemplateBox->set_active(nSelect);
// Enable controls
m_xDropCapsBox->set_active(aFormatDrop.GetLines() > 1);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
