[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/quartz

[Douglas Mencken]

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

New commits:
commit 48db1512eb7c6eac7e0fb5445bd81b5a491c984d
Author: Douglas Mencken <dougmenc...@gmail.com>
Date:   Thu Jun 12 14:38:10 2014 -0400

    workaround for kCTForegroundColorFromContextAttributeName unavailability
    
    fixes "error: ‘kCTForegroundColorFromContextAttributeName’ was not 
declared in this scope"
    
    see commits:
      5bc5387669bca8a0b410e295b0992fd2424a1536
    
    Change-Id: Ifdf69ab2f9a6437d18a6d3e3f5d756beeed3ba5c
    Reviewed-on: https://gerrit.libreoffice.org/9758
    Reviewed-by: Noel Grandin <noelgran...@gmail.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit 4af1b789545bc3815f79fafed5b1806b3c08b69d)

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index d2e3d32..38cf249 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -27,6 +27,10 @@
 #ifdef MACOSX
 #include "osx/salinst.h"
 #include "osx/saldata.hxx"
+// kCTForegroundColorFromContextAttributeName is available on 10.5, but it is 
"hidden"
+#ifndef kCTForegroundColorFromContextAttributeName
+extern const CFStringRef kCTForegroundColorFromContextAttributeName;
+#endif
 #endif
 #include "quartz/salgdi.h"
 #include "quartz/utils.h"
@@ -103,7 +107,6 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD 
)
     // allow delayed setting the font color, i.e. after the text layout
     CFDictionarySetValue( mpStyleDict, 
kCTForegroundColorFromContextAttributeName, kCFBooleanTrue );
 
-
 #if 0 // LastResort is implicit in CoreText's font cascading
     const void* aGFBDescriptors[] = { CTFontDescriptorCreateWithNameAndSize( 
CFSTR("LastResort"), 0) }; // TODO: use the full GFB list
     const int nGfbCount = sizeof(aGFBDescriptors) / sizeof(*aGFBDescriptors);

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits