diff options
| author | Khaled Hosny <khaled@libreoffice.org> | 2023-08-01 18:20:14 +0300 |
|---|---|---|
| committer | خالد حسني <khaled@libreoffice.org> | 2023-08-02 11:57:47 +0200 |
| commit | 0c019cb7c13be75210be824e0f1601d59310a23f (patch) | |
| tree | 58151cf4035b9871150bd3744e114845059d86ab /vcl/unx/generic/fontmanager/fontmanager.cxx | |
| parent | aa53ccd834adcd4dde36dcf36b620984b18711b3 (diff) | |
vcl: Drop unused FontAttributes::GetMapNames()/AddMapName()
Change-Id: I50e06ad24e95cab39009a8affb876ebc920c1c11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155168
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@libreoffice.org>
Diffstat (limited to 'vcl/unx/generic/fontmanager/fontmanager.cxx')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 748017252987..2a6333f6d93e 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -520,12 +520,11 @@ bool PrintFontManager::analyzeSfntFile( PrintFont& rFont ) const TTGlobalFontInfo aInfo; GetTTGlobalFontInfo( pTTFont, & aInfo ); - ::std::vector< OUString > aNames; - analyzeSfntFamilyName( pTTFont, aNames ); - - // set family name from XLFD if possible if (rFont.m_aFamilyName.isEmpty()) { + ::std::vector< OUString > aNames; + analyzeSfntFamilyName( pTTFont, aNames ); + if( !aNames.empty() ) { rFont.m_aFamilyName = aNames.front(); @@ -544,18 +543,6 @@ bool PrintFontManager::analyzeSfntFile( PrintFont& rFont ) const rFont.m_aFamilyName = OStringToOUString(rFont.m_aFontFile.subView(0, dotIndex), aEncoding); } } - for (auto const& aAlias : aNames) - { - if (!aAlias.isEmpty()) - { - if (rFont.m_aFamilyName != aAlias) - { - auto al_it = std::find(rFont.m_aAliases.begin(), rFont.m_aAliases.end(), aAlias); - if( al_it == rFont.m_aAliases.end() ) - rFont.m_aAliases.push_back(aAlias); - } - } - } if( !aInfo.usubfamily.isEmpty() ) rFont.m_aStyleName = aInfo.usubfamily; @@ -698,7 +685,6 @@ void PrintFontManager::fillPrintFontInfo(const PrintFont& rFont, FastPrintFontIn rInfo.m_eWeight = rFont.m_eWeight; rInfo.m_ePitch = rFont.m_ePitch; rInfo.m_aEncoding = rFont.m_aEncoding; - rInfo.m_aAliases = rFont.m_aAliases; } bool PrintFontManager::getFontFastInfo( fontID nFontID, FastPrintFontInfo& rInfo ) const |