r20641 by fschmid -

[scribus-commit]

Author: fschmid
Date: Wed Dec 30 09:19:00 2015
New Revision: 20641

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20641
Log:
Fixed accidential loading of paragraph style properties into charstyles.

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

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20641&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 30 09:19:00 2015
@@ -2467,10 +2467,10 @@
 	if (attrs.hasAttribute(SCOLOR))
 		newStyle.setStrokeColor(attrs.valueAsString(SCOLOR, CommonStrings::None));
 
-	static const QString BCOLOR("BCOLOR");
+	static const QString BCOLOR("BGCOLOR");
 	if (attrs.hasAttribute(BCOLOR))
 		newStyle.setBackColor(attrs.valueAsString(BCOLOR, CommonStrings::None));
-	static const QString BSHADE("BSHADE");
+	static const QString BSHADE("BGSHADE");
 	if (attrs.hasAttribute(BSHADE))
 		newStyle.setBackShade(attrs.valueAsInt(BSHADE, 100));
 

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20641&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	Wed Dec 30 09:19:00 2015
@@ -786,9 +786,9 @@
 	if ( ! style.isInhStrokeColor())
 		docu.writeAttribute("SCOLOR", style.strokeColor());
 	if ( ! style.isInhBackColor())
-		docu.writeAttribute("BCOLOR", style.backColor());
+		docu.writeAttribute("BGCOLOR", style.backColor());
 	if ( ! style.isInhBackShade())
-		docu.writeAttribute("BSHADE", style.backShade());
+		docu.writeAttribute("BGSHADE", style.backShade());
 	if ( ! style.isInhStrokeShade())
 		docu.writeAttribute("SSHADE", style.strokeShade());
 	if ( ! style.isInhShadowXOffset())

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20641&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Wed Dec 30 09:19:00 2015
@@ -5805,9 +5805,6 @@
 			newItem->setFillShade(docPrefsData.itemToolPrefs.textFillColorShade);
 			newItem->setLineColor(docPrefsData.itemToolPrefs.textLineColor);
 			newItem->setLineShade(docPrefsData.itemToolPrefs.textLineColorShade);
-			defaultParagraphStyle.setParent(CommonStrings::DefaultParagraphStyle);
-			defaultParagraphStyle.charStyle().setParent(CommonStrings::DefaultCharacterStyle);
-			newItem->itemText.setDefaultStyle(defaultParagraphStyle);
 			break;
 		case PageItem::Line:
 			newItem->PLineArt = Qt::PenStyle(docPrefsData.itemToolPrefs.lineStyle);