r21834 by jghali - disable "Paste" action added to context menu by r21831 when doc is in an edit mode

[scribus-commit]

Author: jghali
Date: Thu Mar 16 23:20:39 2017
New Revision: 21834

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21834
Log:
disable "Paste" action added to context menu by r21831 when doc is in an edit mode

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

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21834&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp	(original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp	Thu Mar 16 23:20:39 2017
@@ -502,7 +502,8 @@
 		menuEdit->addAction(m_ScMW->scrActions["itemDelete"]);
 
 //<<#14678
-	if (ScMimeData::clipboardHasScribusElem() || ScMimeData::clipboardHasScribusFragment() )
+	if ((ScMimeData::clipboardHasScribusElem() || ScMimeData::clipboardHasScribusFragment()) &&
+		!m_doc->inAnEditMode())
 	{
 		FPoint fp = m_doc->view()->m_canvas->globalToCanvas(QCursor::pos());
 		m_doc->view()->dragX = fp.x();