r18850 by fschmid - Fixed Bug #11968: Crop/ignore empty lines during import of office and some DTP formats

scribus-commit scribus-commit at lists.scribus.net
Wed Feb 26 21:29:51 UTC 2014


Author: fschmid
Date: Wed Feb 26 21:29:51 2014
New Revision: 18850

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18850
Log:
Fixed Bug #11968: Crop/ignore empty lines during import of office and some DTP formats
additional fix: ignore lines with only spaces too.

Modified:
    trunk/Scribus/scribus/text/storytext.cpp

Modified: trunk/Scribus/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18850&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp (original)
+++ trunk/Scribus/scribus/text/storytext.cpp Wed Feb 26 21:29:51 2014
@@ -452,13 +452,13 @@
 	for ( int i = static_cast<int>(length()) - 1; i >= 0; --i )
 	{
 		ScText *it = d->at(i);
-		if ((it->ch != SpecialChars::PARSEP))
-			break;
-		else
+		if ((it->ch == SpecialChars::PARSEP) || (it->ch.isSpace()))
 		{
 			pos--;
 			posCount++;
 		}
+		else
+			break;
 	}
 	if (posCount > 0)
 	{




More information about the scribus-commit mailing list