diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-31 15:15:31 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-05 14:54:15 +0000 |
commit | 7bb46f684ca939fbbbe67bdb1e427e37eec430a7 (patch) | |
tree | 3eddf1ed4c4ec1bcb4a2ff48ae68292b8c8599f9 | |
parent | f75cf4c772279f680839e288b3f6104f9f98c13c (diff) |
Related: tdf#106515 show OpenSymbol if unavailable StarSymbol requested
Change-Id: I442df1c44839642bd1f91afedee577214032466b
(cherry picked from commit 011e1cdbf33e50626f1fefa8b7b4031fa368f3e8)
Reviewed-on: https://gerrit.libreoffice.org/35974
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 5ac0bf270535..24a03364bd1f 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -380,6 +380,13 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont ) // like "Times New Roman;Times" resolved vcl::Font aTmp( GetFontMetric( rFont ) ); + if (aTmp.GetFamilyName() == "StarSymbol" && m_pFontLB->GetEntryPos(aTmp.GetFamilyName()) == LISTBOX_ENTRY_NOTFOUND) + { + //if for some reason, like font in an old document, StarSymbol is requested and its not available, then + //try OpenSymbol instead + aTmp.SetFamilyName("OpenSymbol"); + } + if ( m_pFontLB->GetEntryPos( aTmp.GetFamilyName() ) == LISTBOX_ENTRY_NOTFOUND ) return; |