r16917 by jghali - #10323: the brown color is back (again and not for None color)

[scribus-commit]

Author: jghali
Date: Wed Oct 19 22:07:51 2011
New Revision: 16917

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16917
Log:
#10323: the brown color is back (again and not for None color)

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16917&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Wed Oct 19 22:07:51 2011
@@ -1872,7 +1872,11 @@
 	color.setSpotColor( attrs.valueAsBool("Spot", false) );
 	color.setRegistrationColor( attrs.valueAsBool("Register", false) );
 	QString name = attrs.valueAsString("NAME", color.name());
-	colors.tryAddColor(name, color);
+	// #10323 : break loading of doc which contain colors with different names
+	// and same definition
+	// colors.tryAddColor(name, color);
+	if (name.length() > 0 && !colors.contains(name))
+		colors.insert(name, color);
 	return true;
 }