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

[Khaled Hosny (via logerrit)]

 vcl/inc/quartz/salgdi.h |    6 +++---
 vcl/quartz/ctfonts.cxx  |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 35eaff1ad0490b0a1133a594041a6726e5844bd4
Author:     Khaled Hosny <kha...@aliftype.com>
AuthorDate: Sun Nov 6 00:07:15 2022 +0200
Commit:     خالد حسني <kha...@aliftype.com>
CommitDate: Sun Nov 6 16:53:08 2022 +0100

    vcl: cleanup CoreTextFontFace() a bit
    
    Change-Id: Idcef772802636efab7e7b92415a6d31fec0ba979
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142348
    Tested-by: Jenkins
    Reviewed-by: خالد حسني <kha...@aliftype.com>

diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index f3bab610f08b..121aef3cf59a 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -58,11 +58,11 @@ class FontAttributes;
 class XorEmulation;
 
 // CoreText-specific physically available font face
-class CoreTextFontFace : public vcl::font::PhysicalFontFace
+class CoreTextFontFace final : public vcl::font::PhysicalFontFace
 {
 public:
                                     CoreTextFontFace( const FontAttributes&, 
CTFontDescriptorRef xRef );
-    virtual                         ~CoreTextFontFace() override;
+                                    ~CoreTextFontFace() override;
 
     sal_IntPtr                      GetFontId() const override;
 
@@ -70,7 +70,7 @@ public:
 
     rtl::Reference<LogicalFontInstance> CreateFontInstance(const 
vcl::font::FontSelectPattern&) const override;
 
-    virtual hb_blob_t*              GetHbTable(hb_tag_t nTag) const override;
+    hb_blob_t* GetHbTable(hb_tag_t nTag) const override;
 
     std::vector<hb_variation_t> GetVariations() const override;
 
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index f75f8c4c3406..0ca4ffc953ec 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -218,8 +218,7 @@ bool CoreTextFont::GetGlyphOutline(sal_GlyphId nId, 
basegfx::B2DPolyPolygon& rRe
 hb_blob_t* CoreTextFontFace::GetHbTable(hb_tag_t nTag) const
 {
     hb_blob_t* pBlob = nullptr;
-    CTFontDescriptorRef pFontDesc = 
reinterpret_cast<CTFontDescriptorRef>(GetFontId());
-    CTFontRef pFont = CTFontCreateWithFontDescriptor(pFontDesc, 0.0, nullptr);
+    CTFontRef pFont = CTFontCreateWithFontDescriptor(mxFontDescriptor, 0.0, 
nullptr);
 
     if (!nTag)
     {