diff options
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 2 | ||||
| -rw-r--r-- | vcl/inc/vcl/sysdata.hxx | 4 | ||||
| -rw-r--r-- | vcl/ios/source/gdi/salgdi.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 30493f9e2e63..adea863a6837 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -511,7 +511,7 @@ namespace cairocanvas // when CGFont (Mac OS X 10.5 API) is provided by the AQUA VCL backend. font_face = cairo_quartz_font_face_create_for_atsu_font_id((ATSUFontID) rSysFontData.aATSUFontID); # else // iOS - font_face = cairo_quartz_font_face_create_for_cgfont( CTFontCopyGraphicsFont( (CTFontRef) rSysFontData.rCTFont, NULL ) ); + font_face = cairo_quartz_font_face_create_for_cgfont( CTFontCopyGraphicsFont( rSysFontData.rCTFont, NULL ) ); # endif #elif defined CAIRO_HAS_WIN32_SURFACE diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx index 81195b1de4d6..6f39cc9ee4b9 100644 --- a/vcl/inc/vcl/sysdata.hxx +++ b/vcl/inc/vcl/sysdata.hxx @@ -44,7 +44,7 @@ class NSView; #endif #ifdef IOS -typedef struct CGFont *CGFontRef; +typedef const struct __CTFont * CTFontRef; typedef struct CGContext *CGContextRef; typedef struct CGLayer *CGLayerRef; #ifdef __OBJC__ @@ -203,7 +203,7 @@ struct SystemFontData #elif defined( QUARTZ ) void* aATSUFontID; // native font object #elif defined( IOS ) - void* rCTFont; // native font object + CTFontRef rCTFont; // native font object #elif defined( UNX ) void* nFontId; // native font id int nFontFlags; // native font flags diff --git a/vcl/ios/source/gdi/salgdi.cxx b/vcl/ios/source/gdi/salgdi.cxx index f7f6bcdbcf26..32cc9fbbf89f 100644 --- a/vcl/ios/source/gdi/salgdi.cxx +++ b/vcl/ios/source/gdi/salgdi.cxx @@ -204,7 +204,7 @@ SystemFontData IosSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const CTFontRef font = CTFontCreateUIFontForLanguage(kCTFontSystemFontType, 0.0, NULL); font = (CTFontRef)CFRetain(font); - aSysFontData.rCTFont = (void*)font; + aSysFontData.rCTFont = font; CTFontRef italic_font = CTFontCreateCopyWithSymbolicTraits( font, 0.0, |