r16982 by jghali - #10378: baseline offset shifts first line from top frame border

[scribus-commit]

Author: jghali
Date: Tue Nov 15 23:01:46 2011
New Revision: 16982

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16982
Log:
#10378: baseline offset shifts first line from top frame border

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16982&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Tue Nov 15 23:01:46 2011
@@ -1735,7 +1735,7 @@
 			{
 				double diff = 0;
 				if (current.startOfCol || DropCmode)
-					diff = realAsce * scaleV + offset - (current.yPos - lastLineY);
+					diff = realAsce - (current.yPos - lastLineY);
 				else
 					diff = charStyle.font().realCharAscent(QChar('l'), hlcsize10) * scaleV + offset - (current.yPos - lastLineY);
 				if (diff >= 1 || (!DropCmode && diff > 0))