r22111 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Sat Jul 15 21:08:54 UTC 2017


Author: jghali
Date: Sat Jul 15 21:08:54 2017
New Revision: 22111

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22111
Log:
small refactoring

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22111&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Sat Jul 15 21:08:54 2017
@@ -16234,8 +16234,10 @@
 	for (uint i = 0; i < selectedItemCount; ++i)
 	{
 		PageItem *currItem = itemSelection->itemAt(i);
-		if (currItem != NULL && currItem->asTextFrame() && (currItem->nextInChain() != NULL || currItem->prevInChain() != NULL))
-				currItem->unlinkWithText(cutText);
+		if (!currItem || !currItem->asTextFrame())
+			continue;
+		if (currItem->nextInChain() || currItem->prevInChain())
+			currItem->unlinkWithText(cutText);
 	}
 	regionsChanged()->update(QRectF());
 	changed();




More information about the scribus-commit mailing list