r14207 by fschmid - Create the list of used patterns correctly.

[scribus-commit]

Revision: 14207
Author: fschmid
Date: 2009-10-21T14:19:47.936630Z
Commit message: Create the list of used patterns correctly.

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

Diffs:
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 14206)
+++ scribus/scribusdoc.cpp	(revision 14207)
@@ -2690,22 +2690,31 @@
 	{
 		if ((!results.contains(MasterItems.at(c)->pattern())) && (MasterItems.at(c)->GrType == 8))
 			results.append(MasterItems.at(c)->pattern());
-		if (!results.contains(MasterItems.at(c)->strokePattern()))
-			results.append(MasterItems.at(c)->strokePattern());
+		if (!MasterItems.at(c)->strokePattern().isEmpty())
+		{
+			if (!results.contains(MasterItems.at(c)->strokePattern()))
+				results.append(MasterItems.at(c)->strokePattern());
+		}
 	}
 	for (int c = 0; c < DocItems.count(); ++c)
 	{
 		if ((!results.contains(DocItems.at(c)->pattern())) && (DocItems.at(c)->GrType == 8))
 			results.append(DocItems.at(c)->pattern());
-		if (!results.contains(DocItems.at(c)->strokePattern()))
-			results.append(DocItems.at(c)->strokePattern());
+		if (!MasterItems.at(c)->strokePattern().isEmpty())
+		{
+			if (!results.contains(DocItems.at(c)->strokePattern()))
+				results.append(DocItems.at(c)->strokePattern());
+		}
 	}
 	for (int c = 0; c < FrameItems.count(); ++c)
 	{
 		if ((!results.contains(FrameItems.at(c)->pattern())) && (FrameItems.at(c)->GrType == 8))
 			results.append(FrameItems.at(c)->pattern());
-		if (!results.contains(FrameItems.at(c)->strokePattern()))
-			results.append(FrameItems.at(c)->strokePattern());
+		if (!MasterItems.at(c)->strokePattern().isEmpty())
+		{
+			if (!results.contains(FrameItems.at(c)->strokePattern()))
+				results.append(FrameItems.at(c)->strokePattern());
+		}
 	}
 	for (int c = 0; c < results.count(); ++c)
 	{