r19504 by jghali - #12688: Symbol dependency calculation problem

[scribus-commit]

Author: jghali
Date: Sat Sep 13 20:54:00 2014
New Revision: 19504

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19504
Log:
#12688: Symbol dependency calculation problem

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19504&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sat Sep 13 20:54:00 2014
@@ -3978,13 +3978,12 @@
 		for (int c = 0; c < results.count(); ++c)
 		{
 			QStringList pats = getUsedPatternsHelper(results[c], results2);
-			if (!pats.isEmpty())
-			{
-				for (int cc = 0; cc < pats.count(); cc++)
-				{
-					if (!results2.contains(pats[cc]))
-						results2.append(pats[cc]);
-				}
+			if (pats.isEmpty())
+				continue;
+			for (int cc = 0; cc < pats.count(); cc++)
+			{
+				if (!results2.contains(pats[cc]))
+					results2.append(pats[cc]);
 			}
 		}
 		return results2;
@@ -4031,13 +4030,12 @@
 		for (int c = 0; c < pats.count(); ++c)
 		{
 			QStringList pp = getUsedPatternsHelper(pats[c], results);
-			if (!pp.isEmpty())
-			{
-				for (int cc = 0; cc < pp.count(); cc++)
-				{
-					if (!results.contains(pp[cc]))
-						results.append(pp[cc]);
-				}
+			if (pp.isEmpty())
+				continue;
+			for (int cc = 0; cc < pp.count(); cc++)
+			{
+				if (!results.contains(pp[cc]))
+					results.append(pp[cc]);
 			}
 		}
 	}
@@ -4056,8 +4054,6 @@
 		for (int c = 0; c < pats.count(); ++c)
 		{
 			pp = getUsedPatternsHelper(pats[c], results);
-			if (!pp.isEmpty())
-				results += pp;
 		}
 		pats = results;
 		results.clear();