diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-19 10:10:22 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-19 10:25:44 +0200 |
| commit | 79a277072a09b486538470a546ecdcbe81e37c95 (patch) | |
| tree | f80927342e7c05ebe7a73af9e291e6b8891e5c96 | |
| parent | cd68903660d2ba71fe6e033b0ae7880366913a4e (diff) | |
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
| -rw-r--r-- | vcl/source/font/PhysicalFontFamily.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index fea492f94ab9..395bcf0bb45d 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 ) ) |