r14235 by jghali - fix pageitem resources not being collected correctly

[scribus-commit]

Revision: 14235
Author: jghali
Date: 2009-10-26T20:10:58.703052Z
Commit message: fix pageitem resources not being collected correctly

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

Diffs:
Index: scribus/pageitem.cpp
===================================================================
--- scribus/pageitem.cpp	(revision 14234)
+++ scribus/pageitem.cpp	(revision 14235)
@@ -4141,7 +4141,6 @@
 
 void PageItem::getNamedResources(ResourceCollection& lists) const
 {
-	lists.collectColor(lineColor());
 	if (GrType == 0)
 		lists.collectColor(fillColor());
 	else if (GrType < 8)
@@ -4152,7 +4151,9 @@
 			lists.collectColor(cstops.at(cst)->name);
 		}
 	}
-	else if (GrTypeStroke > 0)
+	if (GrTypeStroke == 0)
+		lists.collectColor(lineColor());
+	else if (GrTypeStroke < 8)
 	{
 		QList<VColorStop*> cstops = stroke_gradient.colorStops();
 		for (uint cst = 0; cst < stroke_gradient.Stops(); ++cst)
@@ -4183,6 +4184,7 @@
 		}
 	}
 	lists.collectPattern(pattern());
+	lists.collectPattern(strokePattern());
 	lists.collectLineStyle(customLineStyle());
 	if (prevInChain() == NULL)
 		itemText.getNamedResources(lists);