r21255 by jghali -

[scribus-commit]

Author: jghali
Date: Fri Apr 29 22:06:41 2016
New Revision: 21255

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21255
Log:
#13998 related: try even harder to prevent embedding of OTF font with PS outline

Modified:
    trunk/Scribus/scribus/ui/tabpdfoptions.cpp

Modified: trunk/Scribus/scribus/ui/tabpdfoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21255&path=/trunk/Scribus/scribus/ui/tabpdfoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.cpp	(original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.cpp	Fri Apr 29 22:06:41 2016
@@ -483,7 +483,7 @@
 		{
 			QString fontName = m_docFonts.at(fe);
 			const ScFace fontFace = AllFonts[fontName];
-			if (Opts.EmbedList.contains(fontName) && (fontFace.type() != ScFace::OTF))
+			if (Opts.EmbedList.contains(fontName) && (!fontFace.isOTF()))
 				addFontItem(fontName, EmbedList);
 			else
 			{
@@ -1336,7 +1336,7 @@
 		QListWidgetItem* fontItem = selection[i];
 		QString currentFont = fontItem->text();
 		const ScFace fontFace = AllFonts[currentFont];
-		if ((fontFace.type() == ScFace::OTF) || (fontFace.subset()))
+		if (fontFace.isOTF() || fontFace.subset())
 			continue;
 		addFontItem(currentFont, EmbedList);
 		int currentRow = SubsetList->row(fontItem);
@@ -1392,7 +1392,7 @@
 		{
 			const QListWidgetItem* item = selection.at(i);
 			const ScFace face = AllFonts[item->text()];
-			if ((face.type() == ScFace::OTF) || (face.subset()))
+			if (face.isOTF() || face.subset())
 				enabledForEmbedding--;
 		}
 	}
@@ -1411,7 +1411,8 @@
 	for (int a = 0; a < m_docFonts.count(); ++a)
 	{
 		QString fontName = m_docFonts.at(a);
-		if (!AllFonts[fontName].subset())
+		const ScFace fontFace = AllFonts[fontName];
+		if (!fontFace.subset() && !fontFace.isOTF())
 		{
 			QListWidgetItem* item = addFontItem(fontName, EmbedList);
 			if (m_annotationFonts.contains(item->text()))