r21125 by fschmid -

[scribus-commit]

Author: fschmid
Date: Mon Mar 28 09:46:49 2016
New Revision: 21125

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21125
Log:
Fixed broken "Convert to Outline" function.

Modified:
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21125&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Mon Mar 28 09:46:49 2016
@@ -3011,13 +3011,14 @@
 {
 	ScribusView* m_view;
 	PageItem* m_item;
-	QList<PageItem*> m_group;
+	QList<PageItem*> &m_group;
 	int m_counter;
 
 public:
-	TextToPathPainter(ScribusView* view, PageItem* item)
+	TextToPathPainter(ScribusView* view, PageItem* item, QList<PageItem*> &group)
 		: m_view(view)
 		, m_item(item)
+		, m_group(group)
 		, m_counter(0)
 	{}
 
@@ -3027,8 +3028,12 @@
 		FPointArray outline = font().glyphOutline(gl.glyph);
 		if (outline.size() < 4)
 			return;
-		QTransform transform = matrix();
-		transform.scale(x(), y());
+		QTransform transform;
+		if (m_item->isPathText())
+			transform = matrix();
+		transform.translate(x(), y());
+		transform.translate(0, -(fontSize() * gl.scaleV));
+		transform.scale(gl.scaleH * fontSize() / 10.0, gl.scaleV * fontSize() / 10.0);
 		outline.map(transform);
 		uint z = m_view->Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, m_item->xPos(), m_item->yPos(), m_item->width(), m_item->height(), m_item->lineWidth(), m_item->lineColor(), m_item->fillColor());
 		PageItem* item = m_view->Doc->Items->at(z);
@@ -3141,7 +3146,7 @@
 				continue;
 			}
 
-			TextToPathPainter p(this, currItem);
+			TextToPathPainter p(this, currItem, newGroupedItems);
 			currItem->textLayout.render(&p);
 			if ((currItem->asPathText()) && (currItem->PoShow))
 			{