diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-26 17:19:55 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-26 19:06:20 +0200 |
| commit | f238648cea537e5c40824270df8f91b50af392de (patch) | |
| tree | db62f7d460d0efadae32ca98a29025cae40645b0 /vcl | |
| parent | 91a3723922b5fecf0b18346d7d31a9ee685a0b43 (diff) | |
Ifdef out methods for iOS that are actually in coretext/salgdi.cxx
A bit scary that the linker didn't notice the duplicate symbols, but
instead apparently just picked the first (or an arbitrary) one. Need
to look into that. Anyway, now when the correct SetTextColor is linked
in the coloured text in the demo document shows up in all its glory.
The code that is partially shared between the headless, OS X CoreText
and iOS backends should to be refactored a bit, I guess.
Change-Id: Id341298f72dc253380d9b2319032e0a9a8bdd0f6
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index f3abe767e306..0fc35290d704 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -358,11 +358,15 @@ void SvpSalGraphics::SetROPFillColor( SalROPColor nROPColor ) } } +#ifndef IOS + void SvpSalGraphics::SetTextColor( SalColor nSalColor ) { m_aTextColor = basebmp::Color( nSalColor ); } +#endif + void SvpSalGraphics::drawPixel( long nX, long nY ) { if( m_bUseLineColor ) @@ -699,6 +703,8 @@ sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong ) return sal_False; } +#ifndef IOS + SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const { SystemFontData aSysFontData; @@ -707,18 +713,16 @@ SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const if (nFallbacklevel < 0 ) nFallbacklevel = 0; aSysFontData.nSize = sizeof( SystemFontData ); -#ifdef IOS - aSysFontData.rCTFont = NULL; -#else aSysFontData.nFontId = 0; aSysFontData.nFontFlags = 0; -#endif aSysFontData.bFakeBold = false; aSysFontData.bFakeItalic = false; aSysFontData.bAntialias = true; return aSysFontData; } +#endif + SystemGraphicsData SvpSalGraphics::GetGraphicsData() const { return SystemGraphicsData(); |