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

[scribus-commit]

Author: jghali
Date: Tue Nov 15 22:59:56 2011
New Revision: 16981

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

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=16981&path=/branches/Version135/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/pageitem_textframe.cpp (original)
+++ branches/Version135/Scribus/scribus/pageitem_textframe.cpp Tue Nov 15 22:59:56 2011
@@ -1571,7 +1571,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))