r18966 by jghali - #12175: Pressing Ctrl+A inside of a cell crashes Scribus

[scribus-commit]

Author: jghali
Date: Mon Mar 31 15:05:03 2014
New Revision: 18966

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18966
Log:
#12175: Pressing Ctrl+A inside of a cell crashes Scribus

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18966&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Mar 31 15:05:03 2014
@@ -5289,9 +5289,11 @@
 
 void ScribusMainWindow::SelectAll(bool docWideSelect)
 {
-	if (doc->appMode == modeEdit)
+	if (doc->appMode == modeEdit || doc->appMode == modeEditTable)
 	{
 		PageItem *currItem = doc->m_Selection->itemAt(0);
+		if (doc->appMode == modeEditTable)
+			currItem = currItem->asTable()->activeCell().textFrame();
 		PageItem *nextItem = currItem;
 		nextItem->itemText.selectAll();
 		while (nextItem != 0)
@@ -5356,11 +5358,13 @@
 
 void ScribusMainWindow::deselectAll()
 {
-	if (doc->appMode == modeEdit)
+	if (doc->appMode == modeEdit || doc->appMode == modeEditTable)
 	{
 		if (doc->m_Selection->isEmpty())
 			return;
 		PageItem *currItem = doc->m_Selection->itemAt(0);
+		if (doc->appMode == modeEditTable)
+			currItem = currItem->asTable()->activeCell().textFrame();
 		if (currItem->asTextFrame())
 		{
 			currItem->itemText.deselectAll();