diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-01 17:52:50 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-01 18:51:23 +0000 |
| commit | 264e6c04afaff96dda6cd510c1da90bb519a1f66 (patch) | |
| tree | 8ad63fa1ad70136ee105b91a054f128bd4522281 /vcl/source/font | |
| parent | 820eeba6772a356cf57b9d1f4d114122f6a63abb (diff) | |
vcl: remove poor-man's RTTI in PhysicalFontFace
The *only* things relying on the in-built magic number are PDFFontCache
and PDFWriterImpl. PDFWriterImpl::emitBuiltinFont has as its first
parameter a const PhysicalFontFace*, but this is only called upon by
PDFWriterImpl::emitFonts, which instantiates an ImplPdfBuiltinFontData
object from a built-in font map... so basically it is always guaranteed
to get a ImplPdfBuiltinFontData object. ImplPdfBuiltinFontData derives
from PhysicalFontFace, so to prevent the need to check the class being
used is a ImplPdfBuiltinFontData, just make emitBuiltinFont require as
it's first parameter ImplPdfBuiltinFontData!
Unfortunately, we can't get around RTTI completely, because
PDFFontCache::FontIdentifier requires a way of distinguishing between
two different PhysicalFontFaces...
Change-Id: I74c8cd294580bbecd12dd2427ac405f97a7e7f7e
Reviewed-on: https://gerrit.libreoffice.org/21030
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/source/font')
| -rw-r--r-- | vcl/source/font/PhysicalFontFace.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx index c7c7ee283ab4..7bebc992297b 100644 --- a/vcl/source/font/PhysicalFontFace.cxx +++ b/vcl/source/font/PhysicalFontFace.cxx @@ -25,11 +25,10 @@ #include "PhysicalFontFace.hxx" -PhysicalFontFace::PhysicalFontFace( const ImplFontAttributes& rDFA, int nMagic ) +PhysicalFontFace::PhysicalFontFace( const ImplFontAttributes& rDFA ) : ImplFontAttributes( rDFA ) , mnWidth(0) , mnHeight(0) - , mnMagic( nMagic ) { // StarSymbol is a unicode font, but it still deserves the symbol flag if( !IsSymbolFont() ) |