[Libreoffice-commits] core.git: vcl/source

[Miklos Vajna]

 vcl/source/font/PhysicalFontFamily.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 79a277072a09b486538470a546ecdcbe81e37c95
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Sep 19 10:10:22 2014 +0200

    My 'SkakNew-Figurine' font has a hyphen in its name
    
    Problem was:
    
    (gdb) print pClonedFace->GetFamilyName()
    $1 = "SkakNewFigurine"
    (gdb) print GetFamilyName()
    $2 = "SkakNew-Figurine"
    
    and this made e.g. JunitTest_sc_complex fail.
    
    Change-Id: Id779553716611ed31c2ef24e54e7bc4b6cc0f766

diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx
index fea492f..395bcf0 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -294,7 +294,7 @@ void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection& rFontColle
 
         PhysicalFontFace* pClonedFace = pFace->Clone();
 
-        assert( pClonedFace->GetFamilyName().trim() == GetFamilyName().trim() );
+        assert( pClonedFace->GetFamilyName().replaceAll("-", "").trim() == GetFamilyName().replaceAll("-", "").trim() );
         assert( rFontCollection.FindOrCreateFamily( GetEnglishSearchFontName( pClonedFace->GetFamilyName() ) ) == pFamily );
 
         if (! pFamily->AddFontFace( pClonedFace ) )