r18855 by fschmid - ODG-Importer: Better import of connection lines.

[scribus-commit]

Author: fschmid
Date: Fri Feb 28 18:41:26 2014
New Revision: 18855

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18855
Log:
ODG-Importer: Better import of connection lines.

Modified:
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18855&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Fri Feb 28 18:41:26 2014
@@ -637,12 +637,6 @@
 		return retObj;
 	if (e.hasAttribute("svg:d"))
 	{
-		double x1 = parseUnit(e.attribute("svg:x1"));
-		double y1 = parseUnit(e.attribute("svg:y1"));
-		double x2 = parseUnit(e.attribute("svg:x2"));
-		double y2 = parseUnit(e.attribute("svg:y2"));
-		double w = fabs(x2 - x1);
-		double h = fabs(y2 - y1);
 		FPointArray pArray;
 		pArray.svgInit();
 		pArray.parseSVG(e.attribute("svg:d"));
@@ -652,14 +646,7 @@
 			retObj = m_Doc->Items->at(z);
 			retObj->PoLine = pArray.copy();
 			QTransform mat;
-			double vx = 0;
-			double vy = 0;
-			double vw = 1;
-			double vh = 1;
-			parseViewBox(e, &vx, &vy, &vw, &vh);
-			double sx = (vw != 0.0) ? (w / vw) : w;
-			double sy = (vh != 0.0) ? (h / vh) : h;
-			mat.scale(sx, sy);
+			mat.scale(72.0 / 2540.0, 72.0 / 2540.0);
 			retObj->PoLine.map(mat);
 			if (e.hasAttribute("draw:transform"))
 				parseTransform(&retObj->PoLine, e.attribute("draw:transform"));