[Libreoffice-commits] .: vcl/aqua

[Tor Lillqvist]

 vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx |    6 ++++++
 vcl/aqua/source/gdi/atsui/salgdi.cxx            |    6 ++++++
 2 files changed, 12 insertions(+)

New commits:
commit 16ae7484b03149345751b7804cbc9ce3180565ec
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jul 31 22:10:19 2012 +0300

    Add declaration of the very deprecated FMGetATSFontRefFromFont
    
    Change-Id: I6a1b0ee2e7e012080774d29ea6ea5db5e9229d82

diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index c56ac0d..346fd6b 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -201,6 +201,12 @@ static void UpdateAttributesFromPSName( const String& rPSName, ImplDevFontAttrib
 
 // -----------------------------------------------------------------------
 
+#if MACOSX_SDK_VERSION >= 1070
+extern "C" {
+extern ATSFontRef FMGetATSFontRefFromFont(FMFont iFont);
+}
+#endif
+
 static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDFA )
 {
     // all ATSU fonts are device fonts that can be directly rotated
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index 18fe982..cd68245 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -128,6 +128,12 @@ inline FourCharCode GetTag(const char aTagName[5])
 static unsigned GetUShort( const unsigned char* p ){return((p[0]<<8)+p[1]);}
 static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
 
+#if MACOSX_SDK_VERSION >= 1070
+extern "C" {
+extern ATSFontRef FMGetATSFontRefFromFont(FMFont iFont);
+}
+#endif
+
 const ImplFontCharMap* ImplMacFontData::GetImplFontCharMap() const
 {
     // return the cached charmap