diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-07-14 00:13:40 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-12 05:14:34 +0000 |
| commit | 5aaef82232f7f51ddd658f3ad34903f3fe7107d4 (patch) | |
| tree | baf9c17d92eb169bd3407d1d332ef0fc307a85b2 /vcl/inc/aqua/coretext | |
| parent | f49db879b7e6362a12450c87352f6ba72823c45e (diff) | |
coretext: use only the FontFace ref from the Style
Change-Id: I696065f6f60fb55eaa24e4a8b4cbff1e93856f04
Reviewed-on: https://gerrit.libreoffice.org/306
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'vcl/inc/aqua/coretext')
| -rw-r--r-- | vcl/inc/aqua/coretext/salcoretextstyle.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/aqua/coretext/salgdi.h | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/vcl/inc/aqua/coretext/salcoretextstyle.hxx b/vcl/inc/aqua/coretext/salcoretextstyle.hxx index 63139863f3eb..08186d198608 100644 --- a/vcl/inc/aqua/coretext/salcoretextstyle.hxx +++ b/vcl/inc/aqua/coretext/salcoretextstyle.hxx @@ -14,6 +14,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; } ; @@ -33,7 +34,7 @@ private: CTParagraphStyleRef m_CTParagraphStyle; CTFontRef m_CTFont; CGColorRef m_color; - const CoreTextPhysicalFontFace* m_font_face; + CoreTextPhysicalFontFace* m_font_face; }; diff --git a/vcl/inc/aqua/coretext/salgdi.h b/vcl/inc/aqua/coretext/salgdi.h index 8786526e7722..f3f44628b133 100644 --- a/vcl/inc/aqua/coretext/salgdi.h +++ b/vcl/inc/aqua/coretext/salgdi.h @@ -48,8 +48,6 @@ protected: RGBAColor maLineColor; //< pen color RGBA RGBAColor maFillColor; //< brush color RGBA - CoreTextPhysicalFontFace* m_font_face; //< Device Font settings - bool mbNonAntialiasedText; //< allows text to be rendered without antialiasing // Graphics types @@ -60,8 +58,6 @@ protected: RGBColor m_TextColor; - CoreTextStyleInfo* m_style; - public: AquaSalGraphics(); virtual ~AquaSalGraphics(); @@ -271,6 +267,8 @@ public: virtual SystemFontData GetSysFontData( int /* nFallbacklevel */ ) const; private: + CoreTextStyleInfo* m_style; + // differences between VCL, Quartz and kHiThemeOrientation coordinate systems // make some graphics seem to be vertically-mirrored from a VCL perspective bool IsFlipped() const { return mbWindow; }; |