cui/source/tabpages/chardlg.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 61da05ebd0cd73507484ce11c8ba6401d5c562fe
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jan 28 17:21:32 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jan 28 22:09:06 2019 +0100
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
