Fix iOS bit-rot and unify with OS X CoreText code

Adapt to the fairly pointless privatisations here, too. Unify with the
OS X CoreText code. Yeah, probably should unify physically, i.e. use
the same source files for both, with as little ifdefs as possible.

Change-Id: I63bc477f0c979769bb995db37a3c4194e8091b30

3 files changed, 9 insertions, 11 deletions

diff --git a/vcl/inc/ios/salcoretextfontutils.hxx b/vcl/inc/ios/salcoretextfontutils.hxx
index d1ee1b8435cd..6293392e8cd1 100644
--- a/vcl/inc/ios/salcoretextfontutils.hxx
+++ b/vcl/inc/ios/salcoretextfontutils.hxx
@@ -20,7 +20,7 @@
 #ifndef _VCL_IOS_CORETEXT_SALCORETEXTFONTUTILS_HXX
 #define _VCL_IOS_CORETEXT_SALCORETEXTFONTUTILS_HXX
 
-class ImplCoreTextFontData;
+class CoreTextPhysicalFontFace;
 class ImplDevFontList;
 
 #include <boost/unordered_map.hpp>
@@ -30,11 +30,11 @@ class ImplDevFontList;
 #include "outfont.hxx"
 #include "impfont.hxx"
 
-class ImplCoreTextFontData : public PhysicalFontFace
+class CoreTextPhysicalFontFace : public PhysicalFontFace
 {
 public:
-    ImplCoreTextFontData(const ImplDevFontAttributes&, CTFontRef font);
-    virtual ~ImplCoreTextFontData();
+    CoreTextPhysicalFontFace(const ImplDevFontAttributes&, CTFontRef font);
+    virtual ~CoreTextPhysicalFontFace();
     virtual PhysicalFontFace* Clone() const;
     virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const;
     virtual sal_IntPtr GetFontId() const { return (sal_IntPtr)m_CTFontRef;};
@@ -70,10 +70,10 @@ public:
     ~SystemFontList();
 
     void AnnounceFonts( ImplDevFontList& ) const;
-    ImplCoreTextFontData* GetFontDataFromRef( CTFontRef ) const;
+    CoreTextPhysicalFontFace* GetFontDataFromRef( CTFontRef ) const;
 
 private:
-    typedef boost::unordered_map<CTFontRef,ImplCoreTextFontData*> CoreTextFontContainer;
+    typedef boost::unordered_map<CTFontRef,CoreTextPhysicalFontFace*> CoreTextFontContainer;
     CoreTextFontContainer m_aFontContainer;
 
     void InitGlyphFallbacks();
diff --git a/vcl/inc/ios/salcoretextstyle.hxx b/vcl/inc/ios/salcoretextstyle.hxx
index 37a8de3208cb..eafba5144226 100644
--- a/vcl/inc/ios/salcoretextstyle.hxx
+++ b/vcl/inc/ios/salcoretextstyle.hxx
@@ -23,7 +23,7 @@
 #include "ios/salgdicommon.hxx"
 
 class FontSelectPattern;
-class ImplCoreTextFontData;
+class CoreTextPhysicalFontFace;
 
 class CoreTextStyleInfo
 {
@@ -31,6 +31,7 @@ public:
     CoreTextStyleInfo();
     ~CoreTextStyleInfo();
     CTFontRef GetFont() const { return m_CTFont; };
+    CoreTextPhysicalFontFace* GetFontFace() const { return m_font_face; };
     long GetFontStretchedSize() const;
     float GetFontStretchFactor() const { return m_stretch_factor; };
     CTParagraphStyleRef GetParagraphStyle() const { return m_CTParagraphStyle; } ;
@@ -50,8 +51,7 @@ private:
     CTParagraphStyleRef m_CTParagraphStyle;
     CTFontRef m_CTFont;
     CGColorRef m_color;
-    const ImplCoreTextFontData* m_font_data;
-
+    CoreTextPhysicalFontFace* m_font_face;
 };
 
 #endif // _VCL_AQUA_CORETEXT_SALCORETEXTSTYLE_HXX
diff --git a/vcl/inc/ios/salgdi.h b/vcl/inc/ios/salgdi.h
index 51099beb90d6..ac00f8c7918e 100644
--- a/vcl/inc/ios/salgdi.h
+++ b/vcl/inc/ios/salgdi.h
@@ -62,8 +62,6 @@ protected:
     RGBAColor maLineColor; //< pen color RGBA
     RGBAColor maFillColor; //< brush color RGBA
 
-    ImplCoreTextFontData* m_pCoreTextFontData; //< Device Font settings
-
     bool mbNonAntialiasedText; //< allows text to be rendered without antialiasing
 
     // Graphics types