diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-11 10:08:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-11 14:13:31 +0000 |
| commit | 7c3545a13809ba47079bab9c89c62546b14cfa72 (patch) | |
| tree | 46a59ca7581b5c9c3621eaa0fbd0735bbeb24db9 /vcl/generic | |
| parent | 67ddbfa97c567568eae5d5f0abe4dff8d5704f25 (diff) | |
align getFontFaceNumber with FC_FACE
getFontFaceNumber returns the index of the font in the collection,
font formats without indexes are now "0" rather than -1. All
existing code already converted < 0 to 0 anyway, so simplifys a
little.
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 4 | ||||
| -rw-r--r-- | vcl/generic/print/glyphset.cxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 2b99ca5fd181..23fb0d830045 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -2761,10 +2761,12 @@ bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin, int PrintFontManager::getFontFaceNumber( fontID nFontID ) const { - int nRet = -1; + int nRet = 0; PrintFont* pFont = getFont( nFontID ); if( pFont && pFont->m_eType == fonttype::TrueType ) nRet = static_cast< TrueTypeFontFile* >(pFont)->m_nCollectionEntry; + if (nRet < 0) + nRet = 0; return nRet; } diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index 08815505fd85..3255e81ee621 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -847,7 +847,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42 TrueTypeFont *pTTFont; OString aTTFileName (rGfx.GetFontMgr().getFontFileSysPath(mnFontID)); int nFace = rGfx.GetFontMgr().getFontFaceNumber(mnFontID); - sal_Int32 nSuccess = OpenTTFontFile(aTTFileName.getStr(), nFace < 0 ? 0 : nFace, &pTTFont); + sal_Int32 nSuccess = OpenTTFontFile(aTTFileName.getStr(), nFace, &pTTFont); if (nSuccess != SF_OK) return sal_False; FILE* pTmpFile = tmpfile(); |