r18753 by fschmid - Fixed Bug #11997: Editing and then deleting an item from "Inline Frames" crashes Scribus

[scribus-commit]

Author: fschmid
Date: Sun Jan 19 20:30:47 2014
New Revision: 18753

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18753
Log:
Fixed Bug #11997: Editing and then deleting an item from "Inline Frames" crashes Scribus

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/propertiespalette.cpp
    trunk/Scribus/scribus/ui/propertiespalette_table.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18753&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Jan 19 20:30:47 2014
@@ -9008,6 +9008,7 @@
 	doc->maxCanvasCoordinate = doc->stored_maxCanvasCoordinate;
 	view->setScale(storedViewScale);
 	view->hideInlinePage();
+	propertiesPalette->unsetItem();
 	if (m_WasAutoSave)
 	{
 		doc->setAutoSave(true);

Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18753&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp Sun Jan 19 20:30:47 2014
@@ -308,7 +308,8 @@
 
 	if (m_doc)
 	{
-		currentItem = m_doc->m_Selection->itemAt(0);
+		if (m_doc->m_Selection->count() > 0)
+			currentItem = m_doc->m_Selection->itemAt(0);
 	/*	if (m_doc->m_Selection->count() > 1)
 		{
 			int lowestItem = 999999;

Modified: trunk/Scribus/scribus/ui/propertiespalette_table.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18753&path=/trunk/Scribus/scribus/ui/propertiespalette_table.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_table.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_table.cpp Sun Jan 19 20:30:47 2014
@@ -90,8 +90,10 @@
 
 void PropertiesPalette_Table::unsetItem()
 {
-	if ((m_item) && (m_item->isTable()))
-		disconnect(m_item->asTable(), SIGNAL(selectionChanged()), this, SLOT(handleCellSelectionChanged()));
+	disconnect(this, SLOT(handleCellSelectionChanged()));
+
+//	if ((m_item) && (m_item->isTable()))
+//		disconnect(m_item->asTable(), SIGNAL(selectionChanged()), this, SLOT(handleCellSelectionChanged()));
 	m_item = 0;
 }