r21274 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Mon May 2 20:58:00 UTC 2016


Author: jghali
Date: Mon May  2 20:58:00 2016
New Revision: 21274

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21274
Log:
Collect properly resources related to paragraph effect charstyle when collecting paragraph style resources

Modified:
    trunk/Scribus/scribus/styles/paragraphstyle.cpp

Modified: trunk/Scribus/scribus/styles/paragraphstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21274&path=/trunk/Scribus/scribus/styles/paragraphstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/styles/paragraphstyle.cpp	(original)
+++ trunk/Scribus/scribus/styles/paragraphstyle.cpp	Mon May  2 20:58:00 2016
@@ -236,6 +236,15 @@
 	for (const Style *sty = parentStyle(); sty != NULL; sty = sty->parentStyle())
 		lists.collectStyle(sty->name());
 	charStyle().getNamedResources(lists);
+
+	QString parEffectStyle = peCharStyleName();
+	if (parEffectStyle.length() > 0)
+	{
+		const CharStyle *peCharStyle = dynamic_cast<const CharStyle*>(m_cstyleContext.resolve(parEffectStyle));
+		if (peCharStyle)
+			peCharStyle->getNamedResources(lists);
+		lists.collectCharStyle(parEffectStyle);
+	}
 }
 
 




More information about the scribus-commit mailing list