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/gdi/pdfwriter_impl.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/gdi/pdfwriter_impl.cxx')
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 3197ed3ded0c..8f9f37151431 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -3532,9 +3532,9 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical aErrorComment.append( "GetEmbedFontData failed for font \"" ); aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) ); aErrorComment.append( '\"' ); - if( pFont->GetSlantType() == ITALIC_NORMAL ) + if( pFont->GetItalic() == ITALIC_NORMAL ) aErrorComment.append( " italic" ); - else if( pFont->GetSlantType() == ITALIC_OBLIQUE ) + else if( pFont->GetItalic() == ITALIC_OBLIQUE ) aErrorComment.append( " oblique" ); aErrorComment.append( " weight=" ); aErrorComment.append( sal_Int32(pFont->GetWeight()) ); @@ -3602,7 +3602,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical pRef->SetMapMode( MapMode( MAP_PIXEL ) ); Font aFont( pFont->GetFamilyName(), pFont->GetStyleName(), Size( 0, 1000 ) ); aFont.SetWeight( pFont->GetWeight() ); - aFont.SetItalic( pFont->GetSlantType() ); + aFont.SetItalic( pFont->GetItalic() ); aFont.SetPitch( pFont->GetPitch() ); pRef->SetFont( aFont ); pRef->ImplNewFont(); @@ -3817,7 +3817,7 @@ sal_Int32 PDFWriterImpl::emitFontDescriptor( const PhysicalFontFace* pFont, Font // possibly characters outside Adobe standard encoding // so set Symbolic flag sal_Int32 nFontFlags = (1<<2); - if( pFont->GetSlantType() == ITALIC_NORMAL || pFont->GetSlantType() == ITALIC_OBLIQUE ) + if( pFont->GetItalic() == ITALIC_NORMAL || pFont->GetItalic() == ITALIC_OBLIQUE ) nFontFlags |= (1 << 6); if( pFont->GetPitch() == PITCH_FIXED ) nFontFlags |= 1; @@ -3847,7 +3847,7 @@ sal_Int32 PDFWriterImpl::emitFontDescriptor( const PhysicalFontFace* pFont, Font aLine.append( ' ' ); aLine.append( (sal_Int32)(rInfo.m_aFontBBox.BottomRight().Y()+1) ); aLine.append( "]/ItalicAngle " ); - if( pFont->GetSlantType() == ITALIC_OBLIQUE || pFont->GetSlantType() == ITALIC_NORMAL ) + if( pFont->GetItalic() == ITALIC_OBLIQUE || pFont->GetItalic() == ITALIC_NORMAL ) aLine.append( "-30" ); else aLine.append( "0" ); @@ -4122,9 +4122,9 @@ bool PDFWriterImpl::emitFonts() aErrorComment.append( "CreateFontSubset failed for font \"" ); aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) ); aErrorComment.append( '\"' ); - if( pFont->GetSlantType() == ITALIC_NORMAL ) + if( pFont->GetItalic() == ITALIC_NORMAL ) aErrorComment.append( " italic" ); - else if( pFont->GetSlantType() == ITALIC_OBLIQUE ) + else if( pFont->GetItalic() == ITALIC_OBLIQUE ) aErrorComment.append( " oblique" ); aErrorComment.append( " weight=" ); aErrorComment.append( sal_Int32(pFont->GetWeight()) ); @@ -8870,8 +8870,8 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool // perform artificial italics if necessary if( ( m_aCurrentPDFState.m_aFont.GetItalic() == ITALIC_NORMAL || m_aCurrentPDFState.m_aFont.GetItalic() == ITALIC_OBLIQUE ) && - !( m_pReferenceDevice->mpFontInstance->maFontSelData.mpFontData->GetSlantType() == ITALIC_NORMAL || - m_pReferenceDevice->mpFontInstance->maFontSelData.mpFontData->GetSlantType() == ITALIC_OBLIQUE ) + !( m_pReferenceDevice->mpFontInstance->maFontSelData.mpFontData->GetItalic() == ITALIC_NORMAL || + m_pReferenceDevice->mpFontInstance->maFontSelData.mpFontData->GetItalic() == ITALIC_OBLIQUE ) ) { fSkew = M_PI/12.0; |