[Libreoffice-commits] core.git: compilerplugins/clang vcl/inc

[Caolán McNamara (via logerrit)]

 compilerplugins/clang/unusedmethods.results |    2 --
 vcl/inc/fontinstance.hxx                    |    9 ---------
 2 files changed, 11 deletions(-)

New commits:
commit 649593b5232beade06d279981c045c6388f9163a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 15 20:16:39 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 15 22:19:17 2020 +0200

    ReleaseHbFont is unused
    
    LogicalFontInstance dtor does call hb_font_destroy though
    
    Change-Id: I59d9711f1934966cddd73c5e62c8929f08b1359a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94335
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index 4da3b5cc4be1..f3650915fd32 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1696,8 +1696,6 @@ vcl/inc/fontinstance.hxx:69
     void LogicalFontInstance::SetAverageWidthFactor(double)
 vcl/inc/fontinstance.hxx:70
     double LogicalFontInstance::GetAverageWidthFactor() const
-vcl/inc/fontinstance.hxx:93
-    void LogicalFontInstance::ReleaseHbFont()
 vcl/inc/fontselect.hxx:48
     _Bool FontSelectPattern::operator!=(const class FontSelectPattern &) const
 vcl/inc/graphic/GraphicID.hxx:39
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index 365ce74d1099..4aff50c9577e 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -90,7 +90,6 @@ protected:
     // Takes ownership of pHbFace.
     static hb_font_t* InitHbFont(hb_face_t* pHbFace);
     virtual hb_font_t* ImplInitHbFont() { assert(false); return hb_font_get_empty(); }
-    inline void ReleaseHbFont();
 
 private:
     // cache of Unicode characters and replacement font names
@@ -113,14 +112,6 @@ inline hb_font_t* LogicalFontInstance::GetHbFont()
     return m_pHbFont;
 }
 
-inline void LogicalFontInstance::ReleaseHbFont()
-{
-    if (!m_pHbFont)
-        return;
-    hb_font_destroy(m_pHbFont);
-    m_pHbFont = nullptr;
-}
-
 inline void LogicalFontInstance::DecodeOpenTypeTag(const uint32_t nTableTag, char* pTagName)
 {
     pTagName[0] = static_cast<char>(nTableTag >> 24);