diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-06-04 15:12:06 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-06-04 15:24:01 +0300 |
| commit | ac7d6300c6cf73da473273cfd4d1f6b6fb9eb6a1 (patch) | |
| tree | 8d96844b04315544e5e4f7321480269c2ad5c79e /vcl/headless | |
| parent | b50adb3f76db02add039d00ad9b597c6653eb2c4 (diff) | |
Make the iOS vcl CoreText code build again
Some refactoring was needed after the Coretext rework yesterday.
It does crash at run-time, though.
Also, remove the no longer used source files from our older CoreText
attempt.
Change-Id: I54d221ade846866d7a9457acd50219c74c68e8cf
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 2c4412fb2705..3b9b68e49538 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -75,44 +75,28 @@ bool SvpSalGraphics::drawAlphaRect( long /*nX*/, long /*nY*/, long /*nWidth*/, l return false; } +#ifdef MACOSX + SvpSalGraphics::SvpSalGraphics() : m_bUseLineColor( true ), m_aLineColor( COL_BLACK ), m_bUseFillColor( false ), m_aFillColor( COL_WHITE ), m_aDrawMode( basebmp::DrawMode_PAINT ), -#ifndef IOS m_aTextColor( COL_BLACK ), m_eTextFmt( basebmp::Format::EIGHT_BIT_GREY ), -#endif m_bClipSetup( false ) { -#ifndef IOS for( int i = 0; i < MAX_FALLBACK; ++i ) m_pServerFont[i] = NULL; -#else - mrContext = nil; - mfFakeDPIScale = 1.0; - m_style = new CoreTextStyleInfo(); -#endif } SvpSalGraphics::~SvpSalGraphics() { -#ifdef IOS - if(m_style) - { - delete m_style; - m_style = NULL; - } - if(mrContext) - { - CGContextRelease( mrContext ); - mrContext = NULL; - } -#endif } +#endif + void SvpSalGraphics::setDevice( basebmp::BitmapDeviceSharedPtr& rDevice ) { m_aOrigDevice = rDevice; |