diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-29 08:34:29 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-29 13:38:48 +0000 |
| commit | 74314b11a4b5a2887bd1ff19bdcfb3572b09240c (patch) | |
| tree | 1683bdd2da904ca935d1bc1077f127a2715399ff /vcl/quartz | |
| parent | 63ca9554f24194521cfbc7fa90bfef37ea7759c1 (diff) | |
Drop a bunch of font metrics flags
These flags mean nothing these days, there are either always true or
always false, since we no longer support bitmap or Type 1 fonts.
Change-Id: Ie14ca480225a6346d868a44e58e7666c3a06931d
Reviewed-on: https://gerrit.libreoffice.org/31346
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/ctfonts.cxx | 11 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 10 |
2 files changed, 0 insertions, 21 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index d5f29b5c073d..7677a0403d40 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -138,11 +138,6 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricDataRef& rxFontMetric ) const // it also makes the calculation of the stretch factor simple rxFontMetric->SetWidth( lrint( CTFontGetSize( aCTFontRef ) * mfFontStretch) ); - // all CoreText fonts are scalable - rxFontMetric->SetScalableFlag( true ); - rxFontMetric->SetTrueTypeFlag( true ); // Not sure, but this field is used only for Windows so far - rxFontMetric->SetKernableFlag( true ); - UniChar nKashidaCh = 0x0640; CGGlyph nKashidaGid = 0; if (CTFontGetGlyphsForCharacters(aCTFontRef, &nKashidaCh, &nKashidaGid, 1)) @@ -297,8 +292,6 @@ FontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFont { // all CoreText fonts are device fonts that can rotate just fine FontAttributes rDFA; - rDFA.SetOrientationFlag( true ); - rDFA.SetBuiltInFontFlag( true ); rDFA.SetQuality( 0 ); // reset the font attributes @@ -309,10 +302,6 @@ FontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFont rDFA.SetItalic( ITALIC_NONE ); rDFA.SetSymbolFlag( false ); - // all scalable fonts on this platform are subsettable - rDFA.SetEmbeddableFlag( false ); - rDFA.SetSubsettableFlag( true ); - // get font name #ifdef MACOSX const OUString aUILang = Application::GetSettings().GetUILanguageTag().getLanguage(); diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 0333bbf0f6c2..e46ad771ace8 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -777,16 +777,6 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV rGlyphWidths.clear(); rUnicodeEnc.clear(); - if( !pFontData->CanSubset() ) - { - if( pFontData->CanEmbed() ) - { - // get individual character widths - OSL_FAIL("not implemented for non-subsettable fonts!\n"); - } - return; - } - std::vector<unsigned char> aBuffer; if( !GetRawFontData( pFontData, aBuffer, nullptr ) ) return; |