diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-22 21:00:30 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-25 17:39:44 +0200 |
| commit | e5a7ee832b4385fa83a914f4d7d81ed860da0667 (patch) | |
| tree | 9eb387346572527f2f9f00cb2e13a295183b3a4f /include/vcl | |
| parent | 134447e78f00d7378406d0a3fa5a4c5d3a02032e (diff) | |
Return bool from InitFont and try to init the font
InitFont() is always called after ImplNewFont(). Calling
InitFont() without a call to ImplNewFont() doesn't make much
sense.
There are some places which don't need to set the SalGraphics
font, but these are fine with calling ImplNewFont() as is.
It now looks like Printer' and OutputDevice' InitFont() do the
same, after commit c766a05ae035 ("Antialias drawing is part of
the font selection") moved Antialias handling into the common
ImplNewFont() function.
Change-Id: I77b9a5b6dbed186a2b0868537930d6bf3fccd9d5
Reviewed-on: https://gerrit.libreoffice.org/62202
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/print.hxx | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index fe7507213256..8970fe0e3788 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1292,7 +1292,7 @@ protected: SAL_DLLPRIVATE long GetEmphasisAscent() const { return mnEmphasisAscent; } SAL_DLLPRIVATE long GetEmphasisDescent() const { return mnEmphasisDescent; } - virtual void InitFont() const; + SAL_DLLPRIVATE bool InitFont() const; virtual void SetFontOrientation( LogicalFontInstance* const pFontInstance ) const; virtual long GetFontExtLeading() const; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index ae3c773cf934..631c38a5ab42 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -261,7 +261,6 @@ protected: virtual void EmulateDrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) override; - virtual void InitFont() const override; virtual void SetFontOrientation( LogicalFontInstance* const pFontInstance ) const override; public: |