r19544 by jghali - #12730: Character Style > Based On: "empty" entry is duplicated

[scribus-commit]

Author: jghali
Date: Wed Oct  1 19:52:16 2014
New Revision: 19544

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19544
Log:
#12730: Character Style > Based On: "empty" entry is duplicated

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=19544&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  1 19:52:16 2014
@@ -283,9 +283,11 @@
 		}
 		if (tagName == "CHARSTYLE")
 		{
-			readParagraphStyle(m_Doc, reader, vg);
+			CharStyle cstyle;
 			StyleSet<CharStyle> temp;
-			temp.create(vg.charStyle());
+			ScXmlStreamAttributes attrs = reader.scAttributes();
+			readNamedCharacterStyleAttrs(m_Doc, attrs, cstyle);
+			temp.create(cstyle);
 			m_Doc->redefineCharStyles(temp, false);
 		}
 		if (tagName == "TableStyle")