diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 23:39:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 23:47:24 +0200 |
| commit | 0e8be4beac6dc73d02b798962cb41c31b0ff1b8a (patch) | |
| tree | d454168b9ee5e2d55c35175da26b0f59865597b5 /vcl | |
| parent | 565611a1c87ce368f4823a324564dddc4e7f2ed2 (diff) | |
Remove trivial CoreTextFontData::CreateTextStyle wrapper
Change-Id: Ic57551d9a3590769f97742d41f089dbb3ce248a9
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/quartz/salgdi.h | 1 | ||||
| -rw-r--r-- | vcl/quartz/ctfonts.cxx | 5 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index e9cddd80af3e..05f618045f03 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -63,7 +63,6 @@ public: ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE; sal_IntPtr GetFontId() const SAL_OVERRIDE; - CoreTextStyle* CreateTextStyle( const FontSelectPattern& ) const; int GetFontTable( const char pTagName[5], unsigned char* ) const; const FontCharMapPtr GetFontCharMap() const; diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 700c0e1a54cd..16cde931b610 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -223,11 +223,6 @@ PhysicalFontFace* CoreTextFontData::Clone() const return new CoreTextFontData( *this); } -CoreTextStyle* CoreTextFontData::CreateTextStyle( const FontSelectPattern& rFSD ) const -{ - return new CoreTextStyle( rFSD); -} - ImplFontEntry* CoreTextFontData::CreateFontInstance( /*const*/ FontSelectPattern& rFSD ) const { return new ImplFontEntry( rFSD); diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 99e10e8ec515..859fa952080f 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -435,7 +435,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac // update the text style mpFontData = static_cast<const CoreTextFontData*>( pReqFont->mpFontData ); - mpTextStyle = mpFontData->CreateTextStyle( *pReqFont ); + mpTextStyle = new CoreTextStyle( *pReqFont ); mpTextStyle->SetTextColor( maTextColor ); SAL_INFO("vcl.ct", |