[Libreoffice-commits] core.git: vcl/inc vcl/quartz vcl/source vcl/unx vcl/win
Chris Sherlock
chris.sherlock79 at gmail.com
Mon Jan 18 16:14:22 PST 2016
vcl/inc/fontattributes.hxx | 2 +-
vcl/inc/impfont.hxx | 2 --
vcl/quartz/ctfonts.cxx | 6 +++---
vcl/quartz/salgdi.cxx | 2 +-
vcl/source/font/PhysicalFontCollection.cxx | 6 +++---
vcl/source/font/PhysicalFontFace.cxx | 12 ++++++------
vcl/source/font/PhysicalFontFamily.cxx | 6 +++---
vcl/source/font/fontcache.cxx | 2 +-
vcl/source/font/fontselect.cxx | 2 +-
vcl/source/gdi/embeddedfontshelper.cxx | 4 ++--
vcl/source/gdi/pdfwriter_impl.cxx | 18 +++++++++---------
vcl/source/outdev/font.cxx | 4 ++--
vcl/unx/generic/fontmanager/fontconfig.cxx | 2 +-
vcl/unx/generic/fontmanager/fontsubst.cxx | 10 +++++-----
vcl/unx/generic/gdi/cairotextrender.cxx | 2 +-
vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 2 +-
vcl/unx/generic/glyphs/glyphcache.cxx | 4 ++--
vcl/unx/generic/print/genpspgraphics.cxx | 2 +-
vcl/win/gdi/salfont.cxx | 6 +++---
19 files changed, 46 insertions(+), 48 deletions(-)
New commits:
commit 2a3caade0d3e0a1c47b57658230c6efb7e9a96f1
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun Jan 17 01:00:00 2016 +1100
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 at libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/vcl/inc/fontattributes.hxx b/vcl/inc/fontattributes.hxx
index 17eddc6..cd53400 100644
--- a/vcl/inc/fontattributes.hxx
+++ b/vcl/inc/fontattributes.hxx
@@ -35,7 +35,7 @@ public:
const OUString& GetStyleName() const { return maStyleName; }
FontWeight GetWeight() const { return meWeight; }
- FontItalic GetSlantType() const { return meItalic; }
+ FontItalic GetItalic() const { return meItalic; }
FontPitch GetPitch() const { return mePitch; }
FontWidth GetWidthType() const { return meWidthType; }
rtl_TextEncoding GetCharSet() const { return meCharSet; }
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 54b4cf8..f9c006f 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -45,8 +45,6 @@ public:
FontWeight GetWeight() { if(meWeight==WEIGHT_DONTKNOW) AskConfig(); return meWeight; }
FontWeight GetWeightNoAsk() const { return meWeight; }
- FontItalic GetSlantType() { return GetItalic(); }
- FontItalic GetSlantType() const { return GetItalicNoAsk(); }
FontItalic GetItalic() { if(meItalic==ITALIC_DONTKNOW) AskConfig(); return meItalic; }
FontItalic GetItalicNoAsk() const { return meItalic; }
FontPitch GetPitch() { if(mePitch==PITCH_DONTKNOW) AskConfig(); return mePitch; }
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 573f8ef..724f8c7 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 d911d80..f35e895 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
);
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 0772310..61a8a9f 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -1273,7 +1273,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindFontFamily( FontSelectPattern& r
PhysicalFontFamily::CalcType( nSearchType, eSearchWeight, eSearchWidth, rFSD.GetFamilyType(), pFontAttr );
PhysicalFontFamily* pFoundData = FindFontFamilyByAttributes( nSearchType,
- eSearchWeight, eSearchWidth, rFSD.GetSlantType(), aSearchFamilyName );
+ eSearchWeight, eSearchWidth, rFSD.GetItalic(), aSearchFamilyName );
if( pFoundData )
{
@@ -1293,8 +1293,8 @@ PhysicalFontFamily* PhysicalFontCollection::FindFontFamily( FontSelectPattern& r
}
if( (nSearchType & ImplFontAttrs::Italic) &&
- ((rFSD.GetSlantType() == ITALIC_DONTKNOW) ||
- (rFSD.GetSlantType() == ITALIC_NONE)) &&
+ ((rFSD.GetItalic() == ITALIC_DONTKNOW) ||
+ (rFSD.GetItalic() == ITALIC_NONE)) &&
(pFoundData->GetTypeFaces() & FONT_FAMILY_ITALIC) )
{
rFSD.SetItalic( ITALIC_NORMAL );
diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx
index 9540604..1e50b0c 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;
}
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx
index 20a72e0..4787997 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -150,10 +150,10 @@ bool PhysicalFontFamily::AddFontFace( PhysicalFontFace* pNewFontFace )
mnTypeFaces |= FONT_FAMILY_NORMAL;
}
- if( pNewFontFace->GetSlantType() == ITALIC_NONE )
+ if( pNewFontFace->GetItalic() == ITALIC_NONE )
mnTypeFaces |= FONT_FAMILY_NONEITALIC;
- else if( (pNewFontFace->GetSlantType() == ITALIC_NORMAL)
- || (pNewFontFace->GetSlantType() == ITALIC_OBLIQUE) )
+ else if( (pNewFontFace->GetItalic() == ITALIC_NORMAL)
+ || (pNewFontFace->GetItalic() == ITALIC_OBLIQUE) )
mnTypeFaces |= FONT_FAMILY_ITALIC;
// reassign name (sharing saves memory)
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index 7f2e82b..39d4366 100644
--- a/vcl/source/font/fontcache.cxx
+++ b/vcl/source/font/fontcache.cxx
@@ -87,7 +87,7 @@ bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPattern& rA, const Fo
// check font face attributes
if( (rA.GetWeight() != rB.GetWeight())
- || (rA.GetSlantType() != rB.GetSlantType())
+ || (rA.GetItalic() != rB.GetItalic())
// || (rA.meFamily != rB.meFamily) // TODO: remove this mostly obsolete member
|| (rA.GetPitch() != rB.GetPitch()) )
return false;
diff --git a/vcl/source/font/fontselect.cxx b/vcl/source/font/fontselect.cxx
index 641e3c6..6f5f42b 100644
--- a/vcl/source/font/fontselect.cxx
+++ b/vcl/source/font/fontselect.cxx
@@ -155,7 +155,7 @@ size_t FontSelectPatternAttributes::hashCode() const
}
nHash += 11 * mnHeight;
nHash += 19 * GetWeight();
- nHash += 29 * GetSlantType();
+ nHash += 29 * GetItalic();
nHash += 37 * mnOrientation;
nHash += 41 * meLanguage;
if( mbVertical )
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 7b08e92b..d5c3087 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -245,7 +245,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString& familyName, FontFamil
// It is possible that it still may be needed to do at least some checks here
// for some encodings (can one font have more font files for more encodings?).
if(( family == FAMILY_DONTKNOW || f->GetFamilyType() == family )
- && ( italic == ITALIC_DONTKNOW || f->GetSlantType() == italic )
+ && ( italic == ITALIC_DONTKNOW || f->GetItalic() == italic )
&& ( weight == WEIGHT_DONTKNOW || f->GetWeight() == weight )
&& ( pitch == PITCH_DONTKNOW || f->GetPitch() == pitch ))
{ // Exact match, return it immediately.
@@ -253,7 +253,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString& familyName, FontFamil
break;
}
if(( f->GetFamilyType() == FAMILY_DONTKNOW || family == FAMILY_DONTKNOW || f->GetFamilyType() == family )
- && ( f->GetSlantType() == ITALIC_DONTKNOW || italic == ITALIC_DONTKNOW || f->GetSlantType() == italic )
+ && ( f->GetItalic() == ITALIC_DONTKNOW || italic == ITALIC_DONTKNOW || f->GetItalic() == italic )
&& ( f->GetWeight() == WEIGHT_DONTKNOW || weight == WEIGHT_DONTKNOW || f->GetWeight() == weight )
&& ( f->GetPitch() == PITCH_DONTKNOW || pitch == PITCH_DONTKNOW || f->GetPitch() == pitch ))
{ // Some fonts specify 'DONTKNOW' for some things, still a good match, if we don't find a better one.
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 72f4225..53e52f1 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()) );
@@ -8869,8 +8869,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;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 8fa55ca..0f7c783 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -80,7 +80,7 @@ FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const
aFontMetric.SetFamily( rData.GetFamilyType() );
aFontMetric.SetPitch( rData.GetPitch() );
aFontMetric.SetWeight( rData.GetWeight() );
- aFontMetric.SetItalic( rData.GetSlantType() );
+ aFontMetric.SetItalic( rData.GetItalic() );
aFontMetric.SetWidthType( rData.GetWidthType() );
aFontMetric.SetScalableFlag( rData.IsScalable() );
aFontMetric.SetBuiltInFontFlag( rData.IsBuiltInFont() );
@@ -202,7 +202,7 @@ FontMetric OutputDevice::GetFontMetric() const
aMetric.SetFamily( xFontMetric->GetFamilyType() );
aMetric.SetPitch( xFontMetric->GetPitch() );
aMetric.SetWeight( xFontMetric->GetWeight() );
- aMetric.SetItalic( xFontMetric->GetSlantType() );
+ aMetric.SetItalic( xFontMetric->GetItalic() );
aMetric.SetWidthType( xFontMetric->GetWidthType() );
if ( pFontInstance->mnOwnOrientation )
aMetric.SetOrientation( pFontInstance->mnOwnOrientation );
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index eb15822..edd303c 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -990,7 +990,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
if (!aLangAttrib.isEmpty())
FcPatternAddString(pPattern, FC_LANG, reinterpret_cast<FcChar8 const *>(aLangAttrib.getStr()));
- addtopattern(pPattern, rPattern.GetSlantType(), rPattern.GetWeight(),
+ addtopattern(pPattern, rPattern.GetItalic(), rPattern.GetWeight(),
rPattern.GetWidthType(), rPattern.GetPitch());
// query fontconfig for a substitute
diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx
index 0072c09..aaaaac3 100644
--- a/vcl/unx/generic/fontmanager/fontsubst.cxx
+++ b/vcl/unx/generic/fontmanager/fontsubst.cxx
@@ -123,7 +123,7 @@ namespace
(
rOrig.maTargetName == rNew.maSearchName &&
rOrig.GetWeight() == rNew.GetWeight() &&
- rOrig.GetSlantType() == rNew.GetSlantType() &&
+ rOrig.GetItalic() == rNew.GetItalic() &&
rOrig.GetPitch() == rNew.GetPitch() &&
rOrig.GetWidthType() == rNew.GetWidthType()
);
@@ -186,13 +186,13 @@ bool FcPreMatchSubstitution::FindFontSubstitute( FontSelectPattern &rFontSelData
const OString aSubstName(OUStringToOString(aOut.maSearchName,
RTL_TEXTENCODING_UTF8));
printf( "FcPreMatchSubstitution \"%s\" bipw=%d%d%d%d -> ",
- aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlantType(),
+ aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetItalic(),
rFontSelData.GetPitch(), rFontSelData.GetWidthType() );
if( !bHaveSubstitute )
printf( "no substitute available\n" );
else
printf( "\"%s\" bipw=%d%d%d%d\n", aSubstName.getStr(),
- aOut.GetWeight(), aOut.GetSlantType(), aOut.GetPitch(), aOut.GetWidthType() );
+ aOut.GetWeight(), aOut.GetItalic(), aOut.GetPitch(), aOut.GetWidthType() );
#endif
if( bHaveSubstitute )
@@ -234,13 +234,13 @@ bool FcGlyphFallbackSubstitution::FindFontSubstitute( FontSelectPattern& rFontSe
const OString aSubstName(OUStringToOString(aOut.maSearchName,
RTL_TEXTENCODING_UTF8));
printf( "FcGFSubstitution \"%s\" bipw=%d%d%d%d ->",
- aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlantType(),
+ aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetItalic(),
rFontSelData.GetPitch(), rFontSelData.GetWidthType() );
if( !bHaveSubstitute )
printf( "no substitute available\n" );
else
printf( "\"%s\" bipw=%d%d%d%d\n", aSubstName.getStr(),
- aOut.GetWeight(), aOut.GetSlantType(), aOut.GetPitch(), aOut.GetWidthType() );
+ aOut.GetWeight(), aOut.GetItalic(), aOut.GetPitch(), aOut.GetWidthType() );
#endif
if( bHaveSubstitute )
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 8c76759..ab7fa40 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -447,7 +447,7 @@ FontConfigFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes,
psp::FastPrintFontInfo aInfo;
aInfo.m_aFamilyName = rFontAttributes.GetFamilyName();
- aInfo.m_eItalic = rFontAttributes.GetSlantType();
+ aInfo.m_eItalic = rFontAttributes.GetItalic();
aInfo.m_eWeight = rFontAttributes.GetWeight();
aInfo.m_eWidth = rFontAttributes.GetWidthType();
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 3bb5055..2bb7205 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -516,7 +516,7 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FreetypeFontInfo* pFI )
mnLoadFlags |= FT_LOAD_IGNORE_TRANSFORM;
#endif
- mbArtItalic = (rFSD.GetSlantType() != ITALIC_NONE && pFI->GetFontAttributes().GetSlantType() == ITALIC_NONE);
+ mbArtItalic = (rFSD.GetItalic() != ITALIC_NONE && pFI->GetFontAttributes().GetItalic() == ITALIC_NONE);
mbArtBold = (rFSD.GetWeight() > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
if( mbArtBold )
{
diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx
index 33f06df..f83eb87 100644
--- a/vcl/unx/generic/glyphs/glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/glyphcache.cxx
@@ -86,7 +86,7 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData
nHash += rFontSelData.mnHeight;
nHash += rFontSelData.mnOrientation;
nHash += size_t(rFontSelData.mbVertical);
- nHash += rFontSelData.GetSlantType();
+ nHash += rFontSelData.GetItalic();
nHash += rFontSelData.GetWeight();
#if ENABLE_GRAPHITE
nHash += rFontSelData.meLanguage;
@@ -109,7 +109,7 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font
|| (rA.mbNonAntialiased != rB.mbNonAntialiased) )
return false;
- if( (rA.GetSlantType() != rB.GetSlantType())
+ if( (rA.GetItalic() != rB.GetItalic())
|| (rA.GetWeight() != rB.GetWeight()) )
return false;
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 19965a3..580c0ff 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -804,7 +804,7 @@ sal_uInt16 GenPspGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLeve
// determine which font attributes need to be emulated
bool bArtItalic = false;
bool bArtBold = false;
- if( pEntry->GetSlantType() == ITALIC_OBLIQUE || pEntry->GetSlantType() == ITALIC_NORMAL )
+ if( pEntry->GetItalic() == ITALIC_OBLIQUE || pEntry->GetItalic() == ITALIC_NORMAL )
{
FontItalic eItalic = m_pPrinterGfx->GetFontMgr().getFontItalic( nID );
if( eItalic != ITALIC_NORMAL && eItalic != ITALIC_OBLIQUE )
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index c8b63d2..1bd1423 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -168,7 +168,7 @@ ImplFontAttrCache::~ImplFontAttrCache()
write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.GetFamilyName(), RTL_TEXTENCODING_UTF8);
aCacheFile.WriteInt16(rDFA.GetWeight());
- aCacheFile.WriteInt16(rDFA.GetSlantType());
+ aCacheFile.WriteInt16(rDFA.GetItalic());
aCacheFile.WriteInt16(rDFA.GetPitch());
aCacheFile.WriteInt16(rDFA.GetWidthType());
aCacheFile.WriteInt16(rDFA.GetFamilyType());
@@ -549,7 +549,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon
pFontFamily = pFontCollection->FindFontFamilyByAttributes( ImplFontAttrs::Symbol,
rFontSelData.GetWeight(),
rFontSelData.GetWidthType(),
- rFontSelData.GetSlantType(),
+ rFontSelData.GetItalic(),
rFontSelData.maSearchName );
if( pFontFamily )
{
@@ -1309,7 +1309,7 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
rLogFont.lfWidth = (LONG)pFont->mnWidth;
rLogFont.lfUnderline = 0;
rLogFont.lfStrikeOut = 0;
- rLogFont.lfItalic = (pFont->GetSlantType()) != ITALIC_NONE;
+ rLogFont.lfItalic = (pFont->GetItalic()) != ITALIC_NONE;
rLogFont.lfEscapement = pFont->mnOrientation;
rLogFont.lfOrientation = rLogFont.lfEscapement;
rLogFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
More information about the Libreoffice-commits
mailing list