diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2016-02-29 13:26:24 -0500 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-03-14 10:21:17 +0000 |
| commit | 2a1b70c4b2d5debf235c088a1e3c71a3457c1af7 (patch) | |
| tree | 79ddadf693b57c16ef5d5c194f318b0ab7f61d2d | |
| parent | 1f780088e8171c088ccb1c8bd82e314c1e4016f0 (diff) | |
GetEnglishSearchFontName is what is supposed to use here
Change-Id: I210359c28b5e66b64627cb49cdf388ee35015a92
| -rw-r--r-- | vcl/source/font/PhysicalFontFamily.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index 762983bdac40..43ec3de0f767 100644 --- a/vcl/source/font/PhysicalFontFamily.cxx +++ b/vcl/source/font/PhysicalFontFamily.cxx @@ -263,7 +263,6 @@ void PhysicalFontFamily::GetFontHeights( std::set<int>& rHeights ) const void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection& rFontCollection, bool bScalable, bool bEmbeddable ) const { - // This is rather expensive to do per face. OUString aFamilyName = GetEnglishSearchFontName( GetFamilyName() ); PhysicalFontFamily* pFamily = rFontCollection.FindOrCreateFontFamily( aFamilyName ); @@ -278,8 +277,11 @@ void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection& rFontColle PhysicalFontFace* pClonedFace = pFoundFontFace->Clone(); - assert( pClonedFace->GetFamilyName().replaceAll("-", "").trim() == GetFamilyName().replaceAll("-", "").trim() ); - assert( rFontCollection.FindOrCreateFontFamily( GetEnglishSearchFontName( pClonedFace->GetFamilyName() ) ) == pFamily ); +#if OSL_DEBUG_LEVEL > 0 + OUString aClonedFamilyName = GetEnglishSearchFontName( pClonedFace->GetFamilyName() ); + assert( aClonedFamilyName == aFamilyName ); + assert( rFontCollection.FindOrCreateFontFamily( aClonedFamilyName ) == pFamily ); +#endif if (! pFamily->AddFontFace( pClonedFace ) ) delete pClonedFace; |