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 /vcl/source/font/PhysicalFontFace.cxx | |
| parent | 5d4f1f6f630d4382679087a4fb0da364c9c9692b (diff) | |
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 'vcl/source/font/PhysicalFontFace.cxx')
| -rw-r--r-- | vcl/source/font/PhysicalFontFace.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx index 1e50b0cafece..9540604f137f 100644 --- a/vcl/source/font/PhysicalFontFace.cxx +++ b/vcl/source/font/PhysicalFontFace.cxx @@ -50,9 +50,9 @@ sal_Int32 PhysicalFontFace::CompareIgnoreSize( const PhysicalFontFace& rOther ) else if( GetWeight() > rOther.GetWeight() ) return 1; - if( GetItalic() < rOther.GetItalic() ) + if( GetSlantType() < rOther.GetSlantType() ) return -1; - else if( GetItalic() > rOther.GetItalic() ) + else if( GetSlantType() > rOther.GetSlantType() ) return 1; sal_Int32 nRet = GetFamilyName().compareTo( rOther.GetFamilyName() ); @@ -143,18 +143,18 @@ bool PhysicalFontFace::IsBetterMatch( const FontSelectPattern& rFSD, FontMatchSt } // if requiring custom matrix to fake italic, prefer upright font - FontItalic ePatternItalic = rFSD.maItalicMatrix != ItalicMatrix() ? ITALIC_NONE : rFSD.GetItalic(); + FontItalic ePatternItalic = rFSD.maItalicMatrix != ItalicMatrix() ? ITALIC_NONE : rFSD.GetSlantType(); if ( ePatternItalic == ITALIC_NONE ) { - if( GetItalic() == ITALIC_NONE ) + if( GetSlantType() == ITALIC_NONE ) nMatch += 900; } else { - if( ePatternItalic == GetItalic() ) + if( ePatternItalic == GetSlantType() ) nMatch += 900; - else if( GetItalic() != ITALIC_NONE ) + else if( GetSlantType() != ITALIC_NONE ) nMatch += 600; } |