diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-24 17:59:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-25 12:48:11 +0200 |
| commit | 166c8f16aff45b444ff3d0a1c1e751d1547a27d8 (patch) | |
| tree | ffe34ef67c05146c7e120e817b29ba4ddaf7af4d /vcl | |
| parent | f96c2af0157383ac097a2488ed9f0ba1639681ea (diff) | |
loplugin:unusedfields
Change-Id: I52af3509afde02dae494747527ab800590682fa3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114591
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/fontmanager.hxx | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 13 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/freetypetextrender.cxx | 1 |
3 files changed, 0 insertions, 15 deletions
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index 9ae95d0493af..0f5a85d61153 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -313,7 +313,6 @@ public: void matchFont( FastPrintFontInfo& rInfo, const css::lang::Locale& rLocale ); static std::unique_ptr<FontConfigFontOptions> getFontOptions(const FontAttributes& rFontAttributes, int nSize); - static void clearFontOptionsCache(); void Substitute(FontSelectPattern &rPattern, OUString& rMissingCodes); diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index bf9ad4f9293d..8121158013dc 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -113,9 +113,6 @@ typedef std::unique_ptr<FcPattern, FcPatternDeleter> FcPatternUniquePtr; class CachedFontConfigFontOptions { private: - FontOptionsKey m_aKey; - std::unique_ptr<FontConfigFontOptions> m_xLastFontOptions; - o3tl::lru_map<FontOptionsKey, FcPatternUniquePtr> lru_options_cache; public: @@ -137,10 +134,6 @@ public: lru_options_cache.insert(std::make_pair(rKey, FcPatternUniquePtr(FcPatternDuplicate(pPattern)))); } - void clear() - { - m_xLastFontOptions.reset(); - } }; typedef std::pair<FcChar8*, FcChar8*> lang_and_element; @@ -460,7 +453,6 @@ void FontCfgWrapper::clear() m_pFontSet = nullptr; } m_pLanguageTag.reset(); - m_aCachedFontOptions.clear(); } /* @@ -1232,11 +1224,6 @@ std::unique_ptr<FontConfigFontOptions> PrintFontManager::getFontOptions(const Fo return pOptions; } -void PrintFontManager::clearFontOptionsCache() -{ - FontCfgWrapper& rWrapper = FontCfgWrapper::get(); - rWrapper.m_aCachedFontOptions.clear(); -} void PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const css::lang::Locale& rLocale ) { diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx b/vcl/unx/generic/gdi/freetypetextrender.cxx index 5f28ebdb91fe..0e6556b24588 100644 --- a/vcl/unx/generic/gdi/freetypetextrender.cxx +++ b/vcl/unx/generic/gdi/freetypetextrender.cxx @@ -101,7 +101,6 @@ bool FreeTypeTextRenderImpl::AddTempDevFont( PhysicalFontCollection* pFontCollec void FreeTypeTextRenderImpl::ClearDevFontCache() { FreetypeManager::get().ClearFontCache(); - psp::PrintFontManager::clearFontOptionsCache(); } void FreeTypeTextRenderImpl::GetDevFontList( PhysicalFontCollection* pFontCollection ) |