r17257 by fschmid - Applied Patch from Bug 10528: "wrong line spacing between paragraphs calculation after overflow"

[scribus-commit]

Author: fschmid
Date: Sun Jan 29 09:58:40 2012
New Revision: 17257

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17257
Log:
Applied Patch from Bug 10528: "wrong line spacing between paragraphs calculation after overflow"

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17257&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Sun Jan 29 09:58:40 2012
@@ -2270,6 +2270,12 @@
 					double newXAdd = overflowWidth - style.rightMargin() + style.minGlyphExtension() * wide + hyphWidth;
 					if (current.isEndOfLine(newXAdd) || current.xPos + newXAdd >= current.colRight || realEnd >= current.mustLineEnd)
 					{
+						if (!current.afterOverflow)
+						{
+							current.addLine = true;
+							current.lastInRowLine = true;
+						}
+						//line must end before overflov
 						if (!current.addLine && !current.lastInRowLine)
 						{
 							if (current.afterOverflow)