ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Resolves: tdf#122992 allow pre-selected fonts not in the font list

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2019-01-28 22:09:06 +01:00
parent 31d3369803
commit 61da05ebd0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cui/source/tabpages/chardlg.cxx
+6 -1
View File
@@ -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
{