r17962 by fschmid - Fixed Bug #11254: Vector import doesn't work after frame copy

scribus-commit scribus-commit at lists.scribus.net
Sun Dec 16 18:54:17 UTC 2012


Author: fschmid
Date: Sun Dec 16 18:54:17 2012
New Revision: 17962

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17962
Log:
Fixed Bug #11254: Vector import doesn't work after frame copy

Modified:
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17962&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sun Dec 16 18:54:17 2012
@@ -862,12 +862,14 @@
 //	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() && (Doc->DraggedElem == 0))
+//  Commented out to fix Bug #11254 (fs)
+/*	if (ScMimeData::clipboardHasScribusElem() && (Doc->DraggedElem == 0))
 	{
 		text = ScMimeData::clipboardScribusElem();
 		url  = QUrl(text);
 	}
-	else if (e->mimeData()->hasText())
+	else*/
+	if (e->mimeData()->hasText())
 	{
 		text = e->mimeData()->text();
 		url = QUrl(text);




More information about the scribus-commit mailing list