[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - cui/source

[Caolán McNamara]

 cui/source/dialogs/cuicharmap.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 7bb46f684ca939fbbbe67bdb1e427e37eec430a7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 31 15:15:31 2017 +0100

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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;