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

Stephan Bergmann sbergman at redhat.com
Mon Nov 7 08:10:11 UTC 2016


 vcl/quartz/ctfonts.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 02cf121aaba00a4ef7f8fe44203838e0fa1cf738
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 7 09:09:38 2016 +0100

    -Werror,-Wdeprecated-declarations
    
    Change-Id: Ia54f11b799fefcddcbf3b9f49e806bfc0895773f

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 735a30b..20fba1f 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -148,8 +148,12 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricDataRef& rxFontMetric ) const
     CGGlyph nKashidaGid = 0;
     if (CTFontGetGlyphsForCharacters(aCTFontRef, &nKashidaCh, &nKashidaGid, 1))
     {
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
+            // 'kCTFontHorizontalOrientation' is deprecated: first deprecated in
+            // macOS 10.11
         double nKashidaAdv = CTFontGetAdvancesForGlyphs(aCTFontRef,
                 kCTFontHorizontalOrientation, &nKashidaGid, nullptr, 1);
+SAL_WNODEPRECATED_DECLARATIONS_POP
         rxFontMetric->SetMinKashida(lrint(nKashidaAdv));
     }
 }


More information about the Libreoffice-commits mailing list