r14593 by jghali - #8751 : incorrect export of empty pdf fields
scribus-commit
scribus-commit at lists.scribus.net
Mon Feb 1 15:28:00 CET 2010
Revision: 14593
Author: jghali
Date: 2010-01-30T13:25:23.402652Z
Commit message: #8751 : incorrect export of empty pdf fields
Changeset:
M /branches/Version135/Scribus/scribus/pdflib_core.cpp
Diffs:
Index: scribus/pdflib_core.cpp
===================================================================
--- scribus/pdflib_core.cpp (revision 14592)
+++ scribus/pdflib_core.cpp (revision 14593)
@@ -911,9 +911,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()], "");
@@ -933,9 +935,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()], "");
@@ -955,9 +959,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