mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GetEnglishSearchFontName is what is supposed to use here

Browse Source 
Change-Id: I210359c28b5e66b64627cb49cdf388ee35015a92
This commit is contained in:
Douglas Mencken
2016-02-29 13:26:24 -05:00
committed by Michael Meeks
parent 1f780088e8
commit 2a1b70c4b2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vcl/source/font/PhysicalFontFamily.cxx
View File

@@ -263,7 +263,6 @@ void PhysicalFontFamily::GetFontHeights( std::set<int>& rHeights ) const
void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection& rFontCollection, void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection& rFontCollection,
bool bScalable, bool bEmbeddable ) const bool bScalable, bool bEmbeddable ) const
{ {
// This is rather expensive to do per face.
OUString aFamilyName = GetEnglishSearchFontName( GetFamilyName() ); OUString aFamilyName = GetEnglishSearchFontName( GetFamilyName() );
PhysicalFontFamily* pFamily = rFontCollection.FindOrCreateFontFamily( aFamilyName ); PhysicalFontFamily* pFamily = rFontCollection.FindOrCreateFontFamily( aFamilyName );
@@ -278,8 +277,11 @@ void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection& rFontColle
PhysicalFontFace* pClonedFace = pFoundFontFace->Clone(); PhysicalFontFace* pClonedFace = pFoundFontFace->Clone();
assert( pClonedFace->GetFamilyName().replaceAll("-", "").trim() == GetFamilyName().replaceAll("-", "").trim() ); #if OSL_DEBUG_LEVEL > 0
assert( rFontCollection.FindOrCreateFontFamily( GetEnglishSearchFontName( pClonedFace->GetFamilyName() ) ) == pFamily ); OUString aClonedFamilyName = GetEnglishSearchFontName( pClonedFace->GetFamilyName() );
assert( aClonedFamilyName == aFamilyName );
assert( rFontCollection.FindOrCreateFontFamily( aClonedFamilyName ) == pFamily );
#endif
if (! pFamily->AddFontFace( pClonedFace ) ) if (! pFamily->AddFontFace( pClonedFace ) )
delete pClonedFace; delete pClonedFace;