diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-02-11 11:13:49 +0000 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-02-11 17:40:20 +0100 |
| commit | ad4e32ce3696de21d797e200b565e830320e14eb (patch) | |
| tree | 8b81580c916de6fde39a8c56a17525dc64109605 | |
| parent | 439407a36e4085c17c65c620a1bb2ca95f4564b0 (diff) | |
Resolves: tdf#123320 non-existing drop caps char style
Change-Id: I416e3fcffe7da549ffd3b82cb912d78d1ca02339
Reviewed-on: https://gerrit.libreoffice.org/67684
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
| -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 854e3f29fcf3..176efeaccdd5 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -549,9 +549,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); |