diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-01-28 17:21:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-01-28 22:09:06 +0100 |
| commit | 61da05ebd0cd73507484ce11c8ba6401d5c562fe (patch) | |
| tree | 90cc245106a3c2aafbc7ef816e07ecd689b1c854 | |
| parent | 31d3369803ce4eceab5ef708f2cd33748b6d10ea (diff) | |
Resolves: tdf#122992 allow pre-selected fonts not in the font list
Change-Id: I75c1b6d3933a5773d9e1dce40744c2342ab63ee8
Reviewed-on: https://gerrit.libreoffice.org/67024
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index ffcfd040493b..6a9c23bb3ef2 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -673,7 +673,12 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp if ( eState >= SfxItemState::DEFAULT ) { pFontItem = static_cast<const SvxFontItem*>(&( rSet.Get( nWhich ) )); - pNameBox->set_active_text( pFontItem->GetFamilyName() ); + const OUString &rName = pFontItem->GetFamilyName(); + int nIndex = pNameBox->find_text(rName); + pNameBox->set_active(nIndex); + // tdf#122992 if it didn't exist in the list, set the entry text to it anyway + if (nIndex == -1) + pNameBox->set_entry_text(rName); } else { |