diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2014-06-12 14:38:10 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-14 14:52:32 +0000 |
| commit | 4af1b789545bc3815f79fafed5b1806b3c08b69d (patch) | |
| tree | 081be20fe982fe8bcae4c7af3a6aa9797b1ed2ce | |
| parent | bdbe854a4a56a9cc11f3028db98b8150c17dab77 (diff) | |
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 <noelgrandin@gmail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/quartz/ctfonts.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index d2e3d3259db2..38cf249cfaf2 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); |