[Libreoffice-commits] core.git: sc/source vcl/inc vcl/unx

[Noel Grandin (via logerrit)]

 sc/source/core/tool/scmatrix.cxx           |    4 +---
 vcl/inc/unx/fontmanager.hxx                |    1 -
 vcl/unx/generic/fontmanager/fontconfig.cxx |   13 -------------
 vcl/unx/generic/gdi/freetypetextrender.cxx |    1 -
 4 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 166c8f16aff45b444ff3d0a1c1e751d1547a27d8
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat Apr 24 17:59:56 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Apr 25 12:48:11 2021 +0200

    loplugin:unusedfields
    
    Change-Id: I52af3509afde02dae494747527ab800590682fa3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114591
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 6dad97eee6a0..ad7f4c788df7 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -3310,17 +3310,15 @@ struct MatOp
 private:
     TOp maOp;
     ScInterpreter* mpErrorInterpreter;
-    svl::SharedString maString;
     double mfVal;
 
 public:
     typedef double number_value_type;
 
     MatOp( TOp aOp, ScInterpreter* pErrorInterpreter,
-            double fVal = 0.0, const svl::SharedString& rString = svl::SharedString() ):
+            double fVal = 0.0 ):
         maOp(aOp),
         mpErrorInterpreter(pErrorInterpreter),
-        maString(rString),
         mfVal(fVal)
     {
         if (mpErrorInterpreter)
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 )