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>

6 files changed, 11 insertions, 11 deletions

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index eb1582298103..edd303cebad2 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 0072c0972c41..aaaaac311269 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 8c76759da585..ab7fa400e5fd 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 3bb5055ac2db..2bb72059beaf 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 33f06df2faab..f83eb879b43d 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 19965a336f67..580c0ff3d923 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 )