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

Douglas Mencken dougmencken at gmail.com
Thu Apr 24 07:25:41 PDT 2014


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

New commits:
commit e6b142a06833404d8b8a5be0501fd4751df60f35
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Sun Mar 30 01:50:58 2014 -0400

    vcl-quartz: fix build of recently introduced DrawTextSpecial for OSX<10.6
    
    Change-Id: I277d9e2f385b712001385e115b22f6fbb8106ae5
    Reviewed-on: https://gerrit.libreoffice.org/8790
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 06bf300..9376402 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -278,9 +278,13 @@ bool CTLayout::DrawTextSpecial( SalGraphics& rGraphics, sal_uInt32 flags ) const
                 CFDictionaryGetCount(mpTextStyle->GetStyleDict()),
                 mpTextStyle->GetStyleDict());
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+        /* just don't do 'kCTStrokeWidthAttributeName' */
+#else
         int nStroke = 2;
         CFNumberRef rStroke = CFNumberCreate(NULL, kCFNumberSInt32Type, &nStroke);
         CFDictionarySetValue(styledict, kCTStrokeWidthAttributeName, rStroke);
+#endif
 
         CFAttributedStringRef pAttrStr = CFAttributedStringCreate(
                 NULL,


More information about the Libreoffice-commits mailing list