r17404 by jghali - #10645: When creating Master from Non-Master, first paragraph of styled type becomes underlined

[scribus-commit]

Author: jghali
Date: Thu Mar 29 20:50:43 2012
New Revision: 17404

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17404
Log:
#10645: When creating Master from Non-Master, first paragraph of styled type becomes underlined

Modified:
    branches/Version14x/Scribus/scribus/scribusXml.cpp

Modified: branches/Version14x/Scribus/scribus/scribusXml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17404&path=/branches/Version14x/Scribus/scribus/scribusXml.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusXml.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribusXml.cpp Thu Mar 29 20:50:43 2012
@@ -2376,7 +2376,8 @@
 		writer.writeAttribute("CSCALE", style.scaleH() / 10.0);
 	if ( ! style.isInhScaleV())
 		writer.writeAttribute("CSALEV", style.scaleV() / 10.0);
-	writer.writeAttribute("CSTYLE", style.effects() & 2047);
+	if ( ! style.isInhFeatures())
+		writer.writeAttribute("CSTYLE", style.effects() & 2047);
 }
 
 void ScriXmlDoc::WriteCStyle (ScXmlStreamWriter& writer, const CharStyle& style)