r21220 by jghali -

[scribus-commit]

Author: jghali
Date: Thu Apr 21 12:50:05 2016
New Revision: 21220

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21220
Log:
#13971: If you paste text in the table, the program will abort

Modified:
    trunk/Scribus/scribus/canvasmode_edittable.cpp
    trunk/Scribus/scribus/pageitem_table.cpp

Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21220&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_edittable.cpp	Thu Apr 21 12:50:05 2016
@@ -328,8 +328,8 @@
 	{
 		// Select text in active cell text frame.
 		activeFrame->itemText.deselectAll();
+		activeFrame->HasSel = false;
 		m_view->slotSetCurs(event->globalPos().x(), event->globalPos().y());
-		activeFrame->HasSel = false;
 
 		const int selectionStart = qMin(activeFrame->itemText.cursorPosition(), m_lastCursorPos);
 		const int selectionLength = qAbs(activeFrame->itemText.cursorPosition() - m_lastCursorPos);

Modified: trunk/Scribus/scribus/pageitem_table.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21220&path=/trunk/Scribus/scribus/pageitem_table.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_table.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_table.cpp	Thu Apr 21 12:50:05 2016
@@ -987,6 +987,7 @@
 	// Deselect previous active cell and its text.
 	m_activeCell.textFrame()->setSelected(false);
 	m_activeCell.textFrame()->itemText.deselectAll();
+	m_activeCell.textFrame()->HasSel = false;
 
 	// Set the new active cell and select it.
 	m_activeCell = newActiveCell;