r16225 by fschmid - Fixed crash when checking textflow in group items.

scribus-commit scribus-commit at lists.scribus.net
Sat Jan 8 11:52:57 CET 2011


Author: fschmid
Date: Sat Jan  8 10:52:57 2011
New Revision: 16225

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16225
Log:
Fixed crash when checking textflow in group items.

Modified:
    trunk/Scribus/scribus/pageitem.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16225&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sat Jan  8 10:52:57 2011
@@ -3714,8 +3714,10 @@
 	{
 		QRectF baseRect(getBoundingRect());
 		QList<PageItem*>* items = OnMasterPage.isEmpty() ? &m_Doc->DocItems : &m_Doc->MasterItems;
-		for(int idx = (allItems ? items->count()-1 : ItemNr-1); idx >= 0 ; --idx)
-		{
+		for(int idx = items->count()-1; idx >= 0 ; --idx)
+		{
+			if ((items->at(idx) == this) && (!allItems))
+				break;
 			if(idx != static_cast<int>(ItemNr)) // avoids itself
 			{
 				if(items->at(idx)->asTextFrame()) // do not bother with no text frames




More information about the scribus-commit mailing list