Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
c375cd09
Kaydet (Commit)
c375cd09
authored
Tem 14, 2012
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Resolves: fdo#35322 add a font only once under one of its names
Change-Id: I644596b71b8526501160c666e72162ae8190bfd3
üst
1574c76e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
31 deletions
+12
-31
outdev3.cxx
vcl/source/gdi/outdev3.cxx
+12
-31
No files found.
vcl/source/gdi/outdev3.cxx
Dosyayı görüntüle @
c375cd09
...
@@ -1483,41 +1483,22 @@ ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& r
...
@@ -1483,41 +1483,22 @@ ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& r
void ImplDevFontList::Add( PhysicalFontFace* pNewData )
void ImplDevFontList::Add( PhysicalFontFace* pNewData )
{
{
int nAliasQuality = pNewData->mnQuality - 100;
String aSearchName = pNewData->maName;
String aMapNames = pNewData->maMapNames;
GetEnglishSearchFontName( aSearchName );
pNewData->maMapNames = String();
bool bKeepNewData = false;
DevFontList::const_iterator it = maDevFontList.find( aSearchName );
xub_StrLen nMapNameIndex = 0;
ImplDevFontListData* pFoundData = NULL;
while( true )
if( it != maDevFontList.end() )
{
pFoundData = (*it).second;
String aSearchName = pNewData->maName;
GetEnglishSearchFontName( aSearchName );
DevFontList::const_iterator it = maDevFontList.find( aSearchName );
ImplDevFontListData* pFoundData = NULL;
if( it != maDevFontList.end() )
pFoundData = (*it).second;
if( !pFoundData )
{
pFoundData = new ImplDevFontListData( aSearchName );
maDevFontList[ aSearchName ] = pFoundData;
}
bKeepNewData = pFoundData->AddFontFace( pNewData );
// add (another) font alias if available
if( !pFoundData )
// a font alias should never win against an original font with similar quality
{
if( aMapNames.Len() <= nMapNameIndex )
pFoundData = new ImplDevFontListData( aSearchName );
break;
maDevFontList[ aSearchName ] = pFoundData;
if( bKeepNewData ) // try to recycle obsoleted object
pNewData = pNewData->CreateAlias();
bKeepNewData = false;
pNewData->mnQuality = nAliasQuality;
pNewData->maName = GetNextFontToken( aMapNames, nMapNameIndex );
}
}
bool bKeepNewData = pFoundData->AddFontFace( pNewData );
if( !bKeepNewData )
if( !bKeepNewData )
delete pNewData;
delete pNewData;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment