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/source/outdev/font.cxx | |
| 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/source/outdev/font.cxx')
| -rw-r--r-- | vcl/source/outdev/font.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 45e8a7a5c91b..5763c8ec5c14 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -55,8 +55,6 @@ FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const aFontMetric.SetItalic( rData.GetItalic() ); aFontMetric.SetAlignment( TextAlign::ALIGN_TOP ); aFontMetric.SetWidthType( rData.GetWidthType() ); - aFontMetric.SetScalableFlag( rData.IsScalable() ); - aFontMetric.SetBuiltInFontFlag( rData.IsBuiltInFont() ); aFontMetric.SetQuality( rData.GetQuality() ); aFontMetric.SetMapNames( rData.GetMapNames() ); } @@ -194,12 +192,8 @@ FontMetric OutputDevice::GetFontMetric() const aMetric.SetOrientation( pFontInstance->mnOwnOrientation ); else aMetric.SetOrientation( xFontMetric->GetOrientation() ); - if( !pFontInstance->mxFontMetric->IsKernable() ) - aMetric.SetKerning( maFont.GetKerning() & ~FontKerning::FontSpecific ); // set remaining metric fields - aMetric.SetBuiltInFontFlag( xFontMetric->IsBuiltInFont() ); - aMetric.SetScalableFlag( xFontMetric->IsScalable() ); aMetric.SetFullstopCenteredFlag( xFontMetric->IsFullstopCentered() ); aMetric.SetBulletOffset( xFontMetric->GetBulletOffset() ); aMetric.SetAscent( ImplDevicePixelToLogicHeight( xFontMetric->GetAscent() + mnEmphasisAscent ) ); @@ -560,7 +554,7 @@ void OutputDevice::ImplRefreshFontData( const bool bNewFontLists ) { if( mpPDFWriter ) { - mpFontCollection = pSVData->maGDIData.mpScreenFontList->Clone( true ); + mpFontCollection = pSVData->maGDIData.mpScreenFontList->Clone(); mpFontCache = new ImplFontCache(); } else @@ -1104,9 +1098,7 @@ bool OutputDevice::ImplNewFont() const // enable kerning array if requested if ( maFont.GetKerning() & FontKerning::FontSpecific ) { - // TODO: test if physical font supports kerning and disable if not - if( pFontInstance->mxFontMetric->IsKernable() ) - mbKerning = true; + mbKerning = true; } else { |