r18744 by jghali - fix xps export issue with groups and resized symbol items

scribus-commit scribus-commit at lists.scribus.net
Sat Jan 18 19:44:48 UTC 2014


Author: jghali
Date: Sat Jan 18 19:44:48 2014
New Revision: 18744

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18744
Log:
fix xps export issue with groups and resized symbol items

Modified:
    trunk/Scribus/scribus/plugins/xpsexport/xpsexplugin.cpp

Modified: trunk/Scribus/scribus/plugins/xpsexport/xpsexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18744&path=/trunk/Scribus/scribus/plugins/xpsexport/xpsexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/xpsexport/xpsexplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/xpsexport/xpsexplugin.cpp Sat Jan 18 19:44:48 2014
@@ -471,6 +471,7 @@
 					}
 					FPointArray path = Item->PoLine.copy();
 					path.scale(conversionFactor, conversionFactor);
+					path.scale(Item->groupWidth / Item->width(), Item->groupHeight / Item->height());
 					SetClipAttr(ob, &path, Item->fillRule);
 					QTransform mpx;
 					mpx.translate(xOffset * conversionFactor, yOffset * conversionFactor);
@@ -1428,9 +1429,10 @@
 {
 	QDomElement ob = p_docu.createElement("Canvas");
 	FPointArray path = Item->PoLine.copy();
+	ScPattern pat = m_Doc->docPatterns[Item->pattern()];
 	path.scale(conversionFactor, conversionFactor);
+	path.scale(pat.width / Item->width(), pat.height / Item->height());
 	SetClipAttr(ob, &path, Item->fillRule);
-	ScPattern pat = m_Doc->docPatterns[Item->pattern()];
 	QTransform mpx;
 	mpx.translate(xOffset * conversionFactor, yOffset * conversionFactor);
 	mpx.scale(Item->width() / pat.width, Item->height() / pat.height);




More information about the scribus-commit mailing list