r21203 by fschmid -

[scribus-commit]

Author: fschmid
Date: Sun Apr 17 09:09:50 2016
New Revision: 21203

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21203
Log:
Fixed Bug #13646: Text flow around images stopped working!

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21203&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Sun Apr 17 09:09:50 2016
@@ -2356,7 +2356,7 @@
 		m_rotation = 0;
 		m_hasSoftShadow = false;
 		isEmbedded = true;
-		invalid = true;
+		invalid = false;
 		p->save();
 		p->translate(m_softShadowXOffset, m_softShadowYOffset);
 		DrawObj(p, QRectF());

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21203&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp	Sun Apr 17 09:09:50 2016
@@ -2776,7 +2776,7 @@
 							}
 							m_Doc->addPattern(currentPatternDefName, pat);
 							importedPatterns.append(currentPatternDefName);
-							double minx =  std::numeric_limits<double>::max();
+						/*	double minx =  std::numeric_limits<double>::max();
 							double miny =  std::numeric_limits<double>::max();
 							double maxx = -std::numeric_limits<double>::max();
 							double maxy = -std::numeric_limits<double>::max();
@@ -2790,7 +2790,7 @@
 							currItem->gYpos = currItem->yPos() - miny;
 							currItem->setXYPos(currItem->gXpos, currItem->gYpos, true);
 							m_Doc->docPatterns[currentPatternDefName].width = maxx - minx;
-							m_Doc->docPatterns[currentPatternDefName].height = maxy - miny;
+							m_Doc->docPatterns[currentPatternDefName].height = maxy - miny;*/
 						}
 					}
 					m_Doc->itemSelection_DeleteItem(tmpSel);