r16327 by fschmid - Shape Importer: parse the "nofill" attribute correctly.

[scribus-commit]

Author: fschmid
Date: Sun Jan 30 21:51:56 2011
New Revision: 16327

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16327
Log:
Shape Importer: parse the "nofill" attribute correctly.

Modified:
    trunk/Scribus/scribus/plugins/import/shape/importshape.cpp

Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16327&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp Sun Jan 30 21:51:56 2011
@@ -447,16 +447,21 @@
 			{
 				if (!((params == "foreground") || (params == "background") || (params == "fg") || (params == "bg") || (params == "none") || (params == "default") || (params == "inverse")))
 				{
-					fill.setNamedColor( params );
-					FillCol = "FromDia"+fill.name();
-					ScColor tmp;
-					tmp.fromQColor(fill);
-					tmp.setSpotColor(false);
-					tmp.setRegistrationColor(false);
-					QString fNam = m_Doc->PageColors.tryAddColor(FillCol, tmp);
-					if (fNam == FillCol)
-						importedColors.append(FillCol);
-					FillCol = fNam;
+					if (params == "nofill")
+						FillCol = CommonStrings::None;
+					else
+					{
+						fill.setNamedColor( params );
+						FillCol = "FromDia"+fill.name();
+						ScColor tmp;
+						tmp.fromQColor(fill);
+						tmp.setSpotColor(false);
+						tmp.setRegistrationColor(false);
+						QString fNam = m_Doc->PageColors.tryAddColor(FillCol, tmp);
+						if (fNam == FillCol)
+							importedColors.append(FillCol);
+						FillCol = fNam;
+					}
 				}
 			}
 			else if (command == "stroke")