r16962 by jghali - #10346: Last line of paragraph at end of textframe disappears

[scribus-commit]

Author: jghali
Date: Sun Nov  6 00:13:15 2011
New Revision: 16962

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16962
Log:
#10346: Last line of paragraph at end of textframe disappears

Modified:
    branches/Version135/Scribus/scribus/pageitem_textframe.cpp

Modified: branches/Version135/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16962&path=/branches/Version135/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/pageitem_textframe.cpp (original)
+++ branches/Version135/Scribus/scribus/pageitem_textframe.cpp Sun Nov  6 00:13:15 2011
@@ -2119,12 +2119,6 @@
 						current.yPos = maxDY;
 					maxDX = 0;
 				}
-				if ( SpecialChars::isBreak(hl->ch) )
-				{
-					if (hl->ch == SpecialChars::PARSEP)
-						current.yPos += style.gapAfter();
-					current.hyphenCount = 0;
-				}
 				if (current.isEndOfCol(desc))
 				{
 					//check if realy line extends bottom margin
@@ -2199,6 +2193,12 @@
 					lastLineY = current.rowDesc;
 					current.mustLineEnd = current.colRight;
 					current.restartRowIndex = current.restartIndex;
+				}
+				if ( SpecialChars::isBreak(hl->ch) )
+				{
+					if (hl->ch == SpecialChars::PARSEP)
+						current.yPos += style.gapAfter();
+					current.hyphenCount = 0;
 				}
 				if (inOverflow)
 				{