r19278 by craig - #11568: Dont allow grouped item deletion

scribus-commit scribus-commit at lists.scribus.net
Tue Jun 24 20:45:41 UTC 2014


Author: craig
Date: Tue Jun 24 20:45:41 2014
New Revision: 19278

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19278
Log:
#11568: Dont allow grouped item deletion

Modified:
    trunk/Scribus/scribus/ui/outlinepalette.cpp

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19278&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Tue Jun 24 20:45:41 2014
@@ -250,19 +250,25 @@
 						case 1: //PageItem on master page
 							{
 								PageItem* pageItem = item->PageItemObject;
-								Selection s(this, false);
-								s.addItem(pageItem);
-								ScribusDoc* d=item->DocObject;
-								d->itemSelection_DeleteItem(&s);
+								if (!pageItem->isGroupChild())
+								{
+									Selection s(this, false);
+									s.addItem(pageItem);
+									ScribusDoc* d=item->DocObject;
+									d->itemSelection_DeleteItem(&s);
+								}
 							}
 							break;
 						case 3: //PageItem on normal page
 							{
 								PageItem* pageItem = item->PageItemObject;
-								Selection s(this, false);
-								s.addItem(pageItem);
-								ScribusDoc* d=item->DocObject;
-								d->itemSelection_DeleteItem(&s);
+								if (!pageItem->isGroupChild())
+								{
+									Selection s(this, false);
+									s.addItem(pageItem);
+									ScribusDoc* d=item->DocObject;
+									d->itemSelection_DeleteItem(&s);
+								}
 							}
 							break;
 						default:




More information about the scribus-commit mailing list