#10618: crash on ungrouping table

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17359 11d20701-8431-0410-a711-e3c959e3b870

1 files changed, 16 insertions, 2 deletions

diff --git a/scribus/canvasmode_create.cpp b/scribus/canvasmode_create.cpp
index db5aa05..3c1ddc7 100644
--- a/scribus/canvasmode_create.cpp
+++ b/scribus/canvasmode_create.cpp
@@ -464,11 +464,25 @@ void CreateMode::selectPage(QMouseEvent *m)
 void CreateMode::SetupDrawNoResize(int nr)

 {

 	PageItem* currItem = m_doc->Items->at(nr);

-	//	currItem->setFont(Doc->toolSettings.defFont);

-	//	currItem->setFontSize(Doc->toolSettings.defSize);

 	m_doc->m_Selection->delaySignalsOn();

 	m_doc->m_Selection->clear();

 	m_doc->m_Selection->addItem(currItem);

+	// #10618 : Select table items if needed otherwise

+	// a crash will be triggered if user tries to ungroup

+	if (currItem->Groups.count() > 0)
+	{
+		for (int i = 0; i < m_doc->Items->count(); ++i)
+		{
+			PageItem* item = m_doc->Items->at(i);
+			if (item->Groups.count() == 0)
+				continue;
+			if (item->Groups.top() != currItem->Groups.top())
+				continue;
+			if (item->ItemNr != currItem->ItemNr)
+				m_doc->m_Selection->addItem(item, true);
+			item->isSingleSel = false;
+		}
+	}

 	m_doc->m_Selection->delaySignalsOff();

 //	emit DocChanged();

 	currItem->Sizing =  false /*currItem->asLine() ? false : true*/;