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-19 00:13:49 +0000 |
| commit | 2a3caade0d3e0a1c47b57658230c6efb7e9a96f1 (patch) | |
| tree | d0a01922ba9b4dadc7245113825104f018b63440 /vcl/quartz | |
| parent | 447c313586e9b36acff393feae15f5e1b63861ae (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: I08160992834f3732738b40aae9264df00443795a
Reviewed-on: https://gerrit.libreoffice.org/21576
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/ctfonts.cxx | 6 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 573f8ef26a1a..724f8c7cb585 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -87,9 +87,9 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD ) } // fake italic - if (((pReqFont->GetSlantType() == ITALIC_NORMAL) || - (pReqFont->GetSlantType() == ITALIC_OBLIQUE)) && - (mpFontData->GetSlantType() == ITALIC_NONE)) + if (((pReqFont->GetItalic() == ITALIC_NORMAL) || + (pReqFont->GetItalic() == ITALIC_OBLIQUE)) && + (mpFontData->GetItalic() == ITALIC_NONE)) { aMatrix = CGAffineTransformConcat(aMatrix, CGAffineTransformMake(1, 0, toRadian(120), 1, 0, 0)); } diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index d911d809b0c2..f35e895f95aa 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -442,7 +442,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac << " for " << pReqFont->GetFamilyName() << ", " << pReqFont->GetStyleName() << " weight=" << pReqFont->GetWeight() - << " slant=" << pReqFont->GetSlantType() + << " slant=" << pReqFont->GetItalic() << " size=" << pReqFont->mnHeight << "x" << pReqFont->mnWidth << " orientation=" << pReqFont->mnOrientation ); |