r17148 by fschmid - Fixed incorrect behaviour of drag&drop of items when some item was copied before.

[scribus-commit]

Author: fschmid
Date: Fri Dec 30 10:29:26 2011
New Revision: 17148

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17148
Log:
Fixed incorrect behaviour of drag&drop of items when some item was copied before.

Modified:
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17148&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Fri Dec 30 10:29:26 2011
@@ -811,7 +811,7 @@
 //	int ex = qRound(e->pos().x()/m_canvas->scale());// + Doc->minCanvasCoordinate.x());
 //		int ey = qRound(e->pos().y()/m_canvas->scale());// + Doc->minCanvasCoordinate.y());
 
-	if (ScMimeData::clipboardHasScribusElem())
+	if (ScMimeData::clipboardHasScribusElem() && (Doc->DraggedElem == 0))
 	{
 		text = ScMimeData::clipboardScribusElem();
 		url  = QUrl(text);