r16984 by jghali - #10385 (first part) : shifted line when using baseline offset + fixed linespacing

[scribus-commit]

Author: jghali
Date: Wed Nov 16 23:09:50 2011
New Revision: 16984

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16984
Log:
#10385 (first part) : shifted line when using baseline offset + fixed linespacing

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16984&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Wed Nov 16 23:09:50 2011
@@ -1736,7 +1736,7 @@
 				double diff = 0;
 				if (current.startOfCol || DropCmode)
 					diff = realAsce - (current.yPos - lastLineY);
-				else
+				else if (style.lineSpacingMode() != ParagraphStyle::FixedLineSpacing)
 					diff = charStyle.font().realCharAscent(QChar('l'), hlcsize10) * scaleV + offset - (current.yPos - lastLineY);
 				if (diff >= 1 || (!DropCmode && diff > 0))
 				{