diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-17 01:00:00 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-16 16:16:19 +0000 |
| commit | 26371f105bc44e04469ec03fc5bb12505e651c6b (patch) | |
| tree | f60eb9388f3a736d966137ef40fca336fb4277e9 /vcl/source/font/PhysicalFontFace.cxx | |
| parent | 2dd0b4317372b8022efe3911b38b4fa02956d8b9 (diff) | |
vcl: FontAttributes::GetSlantType() -> FontAttributes::GetItalic()
This brings FontAttributes into line with ImplFont and Font, which is
important to the refactoring work I am doing.
Change-Id: I2a2ca2f18fc7b5be45d6f350c0328fad62bf2bc9
Reviewed-on: https://gerrit.libreoffice.org/21517
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
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 9540604f137f..1e50b0cafece 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( GetSlantType() < rOther.GetSlantType() ) + if( GetItalic() < rOther.GetItalic() ) return -1; - else if( GetSlantType() > rOther.GetSlantType() ) + else if( GetItalic() > rOther.GetItalic() ) 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.GetSlantType(); + FontItalic ePatternItalic = rFSD.maItalicMatrix != ItalicMatrix() ? ITALIC_NONE : rFSD.GetItalic(); if ( ePatternItalic == ITALIC_NONE ) { - if( GetSlantType() == ITALIC_NONE ) + if( GetItalic() == ITALIC_NONE ) nMatch += 900; } else { - if( ePatternItalic == GetSlantType() ) + if( ePatternItalic == GetItalic() ) nMatch += 900; - else if( GetSlantType() != ITALIC_NONE ) + else if( GetItalic() != ITALIC_NONE ) nMatch += 600; } |