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-29 13:32:10 +0100 |
| commit | 184e614038893d94f45dbcd6334ee8d682c2d7f3 (patch) | |
| tree | 9f0f387f21ee23a363b1397879c1df8ad208226b /cui | |
| parent | 8c9ea04208e22ffc3601652c00f56a473e207df9 (diff) | |
Resolves: tdf#122992 allow pre-selected fonts not in the font list
Change-Id: I75c1b6d3933a5773d9e1dce40744c2342ab63ee8
Reviewed-on: https://gerrit.libreoffice.org/67025
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -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 c1a46b88663a..a12cc64ba4f6 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 { |