r20269 by jghali - fix charstyle being incorrect applied when changing paragraph effect charstyle

[scribus-commit]

Author: jghali
Date: Thu Jul 23 10:58:22 2015
New Revision: 20269

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20269
Log:
fix charstyle being incorrect applied when changing paragraph effect charstyle

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20269&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Thu Jul 23 10:58:22 2015
@@ -1630,12 +1630,11 @@
 				if (style.hasDropCap() || style.hasBullet() || style.hasNum())
 				{
 					const QString& curParent(style.hasParent() ? style.parent() : style.name());
-					CharStyle newStyle;
+					CharStyle newStyle(charStyle);
 					if (style.peCharStyleName().isEmpty())
 						newStyle.setParent(m_Doc->paragraphStyle(curParent).charStyle().name());
 					else if (charStyle.name() != style.peCharStyleName())
 						newStyle.setParent(m_Doc->charStyle(style.peCharStyleName()).name());
-					newStyle.applyCharStyle(charStyle);
 					charStyle.setStyle(newStyle);
 					itemText.setCharStyle(a, 1 , charStyle);
 				}