r16147 by fschmid - Fixed Bug #9606: "Loading a color set breaks documents colors", loaded colors are now merged into current color set.

[scribus-commit]

Author: fschmid
Date: Wed Dec 22 12:31:13 2010
New Revision: 16147

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16147
Log:
Fixed Bug #9606: "Loading a color set breaks documents colors", loaded colors are now merged into current color set.

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=16147&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 Dec 22 12:31:13 2010
@@ -571,8 +571,8 @@
 
 	m_Doc->GroupCounter = 1;
 	m_Doc->LastAuto = 0;
-	m_Doc->PageColors.clear();
-	m_Doc->Layers.clear();
+//	m_Doc->PageColors.clear();
+//	m_Doc->Layers.clear();
 
 	bool firstElement = true;
 	bool success = true;