From 7c3545a13809ba47079bab9c89c62546b14cfa72 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 11 Jan 2012 10:08:03 +0000 Subject: 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. --- vcl/generic/print/glyphset.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/generic/print') 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(); -- cgit