r16295 by fschmid - Final fix for Bug #9606: "Loading a color set breaks document colors", now already existing colors are kept.

[scribus-commit]

Author: fschmid
Date: Sat Jan 22 22:55:18 2011
New Revision: 16295

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16295
Log:
Final fix for Bug #9606: "Loading a color set breaks document colors", now already existing colors are kept.

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

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16295&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 Sat Jan 22 22:55:18 2011
@@ -1863,8 +1863,8 @@
 		color.fromQColor(QColor(attrs.valueAsString("RGB")));
 	color.setSpotColor( attrs.valueAsBool("Spot", false) );
 	color.setRegistrationColor( attrs.valueAsBool("Register", false) );
-	QString name = attrs.valueAsString("NAME");
-	colors.insert((name.isEmpty()) ? color.name() : name, color);
+	QString name = attrs.valueAsString("NAME", color.name());
+	colors.tryAddColor(name, color);
 	return true;
 }