diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2015-12-31 15:20:12 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2015-12-31 22:49:16 +0000 |
| commit | e9598378b55cc05c95bd3f410c396bd44a74341d (patch) | |
| tree | 35cd6ae2245806117a337631a6d8b0ef9406c80f /vcl/quartz | |
| parent | e81c4d3ea00949cb4d8c3f44e09e70b19eebb826 (diff) | |
vcl: merge ImplDevFontAttributes with ImplFontAttributes
ImplFontAttributes handles device independent data, whilst
ImplDevFontAttributes handles device dependent data. However, there
is no real reason for the divide in classes, and in fact I'm not at
all a fan of using a pImpl directly - sort of defeats the purpose of
having one!
Change-Id: I2db22727e3479b14e3bc37dfad9136703bbdeb13
Reviewed-on: https://gerrit.libreoffice.org/21018
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/ctfonts.cxx | 6 | ||||
| -rw-r--r-- | vcl/quartz/ctfonts.hxx | 2 | ||||
| -rw-r--r-- | vcl/quartz/ctlayout.cxx | 2 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 1b7fe09fb999..980ffa24f581 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -273,10 +273,10 @@ int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResu return (int)nByteLength; } -ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFontEnabled ) +ImplFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFontEnabled ) { // all CoreText fonts are device fonts that can rotate just fine - ImplDevFontAttributes rDFA; + ImplFontAttributes rDFA; rDFA.SetOrientationFlag( true ); rDFA.SetBuiltInFontFlag( true ); rDFA.SetQuality( 0 ); @@ -414,7 +414,7 @@ static void CTFontEnumCallBack( const void* pValue, void* pContext ) CTFontDescriptorRef pFD = static_cast<CTFontDescriptorRef>(pValue); bool bFontEnabled; - ImplDevFontAttributes rDFA = DevFontFromCTFontDescriptor( pFD, &bFontEnabled ); + ImplFontAttributes rDFA = DevFontFromCTFontDescriptor( pFD, &bFontEnabled ); if( bFontEnabled) { diff --git a/vcl/quartz/ctfonts.hxx b/vcl/quartz/ctfonts.hxx index b896c6a9150e..1752f17c01a9 100644 --- a/vcl/quartz/ctfonts.hxx +++ b/vcl/quartz/ctfonts.hxx @@ -27,7 +27,7 @@ #include "sallayout.hxx" SystemFontList* GetCoretextFontList(); -ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef, bool* ); +ImplFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef, bool* ); #endif // INCLUDED_VCL_QUARTZ_CTFONTS_HXX diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx index 0eff2a0d17f1..f13d61747a62 100644 --- a/vcl/quartz/ctlayout.cxx +++ b/vcl/quartz/ctlayout.cxx @@ -492,7 +492,7 @@ int CTLayout::GetNextGlyphs( int nLen, sal_GlyphId* pOutGlyphIds, Point& rPos, i const PhysicalFontFace* pFallbackFont = nullptr; CTFontRef pFont = nullptr; CTFontDescriptorRef pFontDesc = nullptr; - ImplDevFontAttributes rDevFontAttr; + ImplFontAttributes rDevFontAttr; boost::ptr_vector<CTRunData>::const_iterator iter = m_vRunData.begin(); diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index f8b9fbff711e..0619b54e60df 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -63,7 +63,7 @@ CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc ) mpCharMap = rSrc.mpCharMap; } -CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPtr nFontId ) +CoreTextFontData::CoreTextFontData( const ImplFontAttributes& rDFA, sal_IntPtr nFontId ) : PhysicalFontFace( rDFA, 0 ) , mnFontId( nFontId ) , mbOs2Read( false ) |