r15153 by jghali - #9129 related : outline palette not properly updated when pasting object to page

[scribus-commit]

Revision: 15153
Author: jghali
Date: 2010-06-02T21:16:13.959074Z
Commit message: #9129 related : outline palette not properly updated when pasting object to page

Changeset: 
M  /branches/Version135/Scribus/scribus/scribusview.cpp

Diffs:
Index: scribus/scribusview.cpp
===================================================================
--- scribus/scribusview.cpp	(revision 15152)
+++ scribus/scribusview.cpp	(revision 15153)
@@ -2270,9 +2270,8 @@
 		emit ItemGeom(gw, gh);
 		emit HaveSel(newObjects.itemAt(0)->itemType());
 	}
-	else
+	else if (newObjects.count() == 1)
 	{
-		Q_ASSERT(newObjects.count()==1);
 		PageItem *currItem = newObjects.itemAt(0);
 		if (Doc->useRaster)
 		{
@@ -2289,6 +2288,16 @@
 		}
 		currItem->emitAllToGUI();
 	}
+	else // newObjects.count() == 0
+	{
+		if (activeTransaction)
+		{
+			activeTransaction->cancel();
+			delete activeTransaction;
+			activeTransaction = NULL;
+		}
+		return;
+	}
 	newObjects.clear();
 	if (activeTransaction)
 	{
@@ -2296,6 +2305,7 @@
 		delete activeTransaction;
 		activeTransaction = NULL;
 	}
+	emit DocChanged();
 }
 
 void ScribusView::resizeEvent ( QResizeEvent * event )