diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-01-16 12:20:45 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-01-16 12:20:45 -0600 |
commit | 45654a1d4d96732912e6e4dc254c9612d3f241c0 (patch) | |
tree | 19f4ba915a56e53447980ce89fd46710167d7d23 /cppcanvas | |
parent | tdf#96949 Remove global static variable m_bPreferrFirstInterceptor and unused... (diff) | |
download | core-45654a1d4d96732912e6e4dc254c9612d3f241c0.tar.gz core-45654a1d4d96732912e6e4dc254c9612d3f241c0.zip |
revert vcl patch series that brok Mac and Windows
revert:
9bc2f3de8672e812f3a67541c6d7069b434a7e42
vcl: add comment about ImplFontMetric::{Get|Set}LineHeight()
26371f105bc44e04469ec03fc5bb12505e651c6b
vcl: FontAttributes::GetSlantType() -> FontAttributes::GetItalic()
2dd0b4317372b8022efe3911b38b4fa02956d8b9
vcl: font.hxx and metric.hxx cleanup, make ctors explicit and the dtor virtual
5ab13bf3ead3539e4ad847656da81e7eb6029652
vcl: tabify font.hxx
f99550dae55e40e49bf9c9875053fe2abb4c71ca
vcl: change Font::SetName() to Font::SetFamilyName()
2b297116cb6bb1061c43e5714e2609c8ee9f57d2
vcl: rename Font::GetName to Font::GetFamilyName
Change-Id: I23f38921187d66b970ca815eb30dda4222a2da62
Diffstat (limited to 'cppcanvas')
-rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 69a5d66f51ac..4a3dae4036e0 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -759,7 +759,7 @@ namespace cppcanvas if( rParms.mrParms.maFontName.is_initialized() ) aFontRequest.FontDescription.FamilyName = *rParms.mrParms.maFontName; else - aFontRequest.FontDescription.FamilyName = rFont.GetFamilyName(); + aFontRequest.FontDescription.FamilyName = rFont.GetName(); aFontRequest.FontDescription.StyleName = rFont.GetStyleName(); |