r17792 by jghali - #11010 : undo does not restore text frame linking

[scribus-commit]

Author: jghali
Date: Mon Oct  8 21:49:27 2012
New Revision: 17792

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17792
Log:
#11010 : undo does not restore text frame linking

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17792&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Mon Oct  8 21:49:27 2012
@@ -1297,7 +1297,6 @@
 		}
 	}
 }
-
 
 void PageItem::dropLinks()
 {

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17792&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Mon Oct  8 21:49:27 2012
@@ -10791,7 +10791,7 @@
 	selectedItemCount = delItems.count();
 
 	UndoTransaction* activeTransaction = NULL;
-	if ((selectedItemCount > 1) && UndoManager::undoEnabled())
+	if (UndoManager::undoEnabled())
 		activeTransaction = new UndoTransaction(undoManager->beginTransaction(Um::Group + "/" + Um::Selection, Um::IGroup,
 																			  Um::Delete, tooltip, Um::IDelete));
 
@@ -10801,24 +10801,7 @@
 		if ((currItem->asImageFrame()) && ((ScCore->fileWatcher->files().contains(currItem->Pfile) != 0) && (currItem->PictureIsAvailable)))
 			ScCore->fileWatcher->removeFile(currItem->Pfile);
 		if (currItem->asTextFrame())
-		{
 			currItem->dropLinks();
-			
-			/* this code will instead remove the contained text
-			// unlink after
-			currItem->unlink();
-			if (before != 0)
-			{
-				// unlink before
-				before->unlink();
-				// repair link
-				if (after != 0)
-				{
-					before->link(after);
-				}
-			}
-			*/
-		}
 		if (currItem->isWelded())
 			currItem->unWeld();
 		if (currItem->isBookmark)