diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-02-11 11:13:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-02-11 16:34:22 +0100 |
| commit | cac7541e1b2a1bbd0fca08853fd8323bb0078247 (patch) | |
| tree | 4f7b12c01609b76a6ef0059469dcd49262324af4 /sw | |
| parent | 129899248e035a0fb751c943e4a4cdf1713beec7 (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/chrdlg/drpcps.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
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); |