r14594 by jghali - #8751 : incorrect export of empty pdf fields

scribus-commit scribus-commit at lists.scribus.net
Mon Feb 1 05:48:20 CET 2010


Revision: 14594
Author: jghali
Date: 2010-01-30T13:25:59.112429Z
Commit message: #8751 : incorrect export of empty pdf fields

Changeset: 
M  /trunk/Scribus/scribus/pdflib_core.cpp

Diffs:
Index: scribus/pdflib_core.cpp
===================================================================
--- scribus/pdflib_core.cpp	(revision 14593)
+++ scribus/pdflib_core.cpp	(revision 14594)
@@ -943,9 +943,11 @@
 		{
 			if (pgit->isAnnotation())
 			{
+				int annotType  = pgit->annotation().Type();
+				bool mustEmbed = ((annotType >= 2) && (annotType <= 6) && (annotType != 4));
 				if (pgit->annotation().Type() == 4)
 					StdFonts.insert("/ZapfDingbats", "");
-				if (pgit->itemText.length() > 0)
+				if (pgit->itemText.length() > 0 || mustEmbed)
 				{
 					if (Options.Version < PDFOptions::PDFVersion_14)
 						StdFonts.insert(ind2PDFabr[pgit->annotation().Font()], "");
@@ -965,9 +967,11 @@
 		{
 			if (pgit->isAnnotation())
 			{
+				int annotType  = pgit->annotation().Type();
+				bool mustEmbed = ((annotType >= 2) && (annotType <= 6) && (annotType != 4));
 				if (pgit->annotation().Type() == 4)
 					StdFonts.insert("/ZapfDingbats", "");
-				if (pgit->itemText.length() > 0)
+				if (pgit->itemText.length() > 0 || mustEmbed)
 				{
 					if (Options.Version < PDFOptions::PDFVersion_14)
 						StdFonts.insert(ind2PDFabr[pgit->annotation().Font()], "");
@@ -987,9 +991,11 @@
 		{
 			if (pgit->isAnnotation())
 			{
+				int annotType  = pgit->annotation().Type();
+				bool mustEmbed = ((annotType >= 2) && (annotType <= 6) && (annotType != 4));
 				if (pgit->annotation().Type() == 4)
 					StdFonts.insert("/ZapfDingbats", "");
-				if (pgit->itemText.length() > 0)
+				if (pgit->itemText.length() > 0 || mustEmbed)
 				{
 					if (Options.Version < PDFOptions::PDFVersion_14)
 						StdFonts.insert(ind2PDFabr[pgit->annotation().Font()], "");




More information about the scribus-commit mailing list