summaryrefslogtreecommitdiff
path: root/vcl/win/gdi/salgdi3.cxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-01-01 17:52:50 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-01-01 18:51:23 +0000
commit264e6c04afaff96dda6cd510c1da90bb519a1f66 (patch)
tree8ad63fa1ad70136ee105b91a054f128bd4522281 /vcl/win/gdi/salgdi3.cxx
parent820eeba6772a356cf57b9d1f4d114122f6a63abb (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/win/gdi/salgdi3.cxx')
-rw-r--r--vcl/win/gdi/salgdi3.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/win/gdi/salgdi3.cxx b/vcl/win/gdi/salgdi3.cxx
index 9e290beae7a1..8d69c6026b95 100644
--- a/vcl/win/gdi/salgdi3.cxx
+++ b/vcl/win/gdi/salgdi3.cxx
@@ -995,7 +995,7 @@ const void * GrFontData::getTable(unsigned int name, size_t *len) const
ImplWinFontData::ImplWinFontData( const ImplFontAttributes& rDFS,
int nHeight, BYTE eWinCharSet, BYTE nPitchAndFamily )
-: PhysicalFontFace( rDFS, 0 ),
+: PhysicalFontFace( rDFS ),
mnId( 0 ),
mbHasKoreanRange( false ),
mbHasCJKSupport( false ),