r18514 by fschmid - Fixed Bug #11752: PDF Vector import causes sig11 crash

[scribus-commit]

Author: fschmid
Date: Sat Sep 28 08:14:09 2013
New Revision: 18514

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18514
Log:
Fixed Bug #11752: PDF Vector import causes sig11 crash

Modified:
    trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18514&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp Sat Sep 28 08:14:09 2013
@@ -269,7 +269,8 @@
 		if ((Elements.count() == 1) && (!(importerFlags & LoadSavePlugin::lfCreateDoc)))
 		{
 			PageItem *gr = Elements[0];
-			m_Doc->resizeGroupToContents(gr);
+			if (gr->isGroup())
+				m_Doc->resizeGroupToContents(gr);
 		}
 		if ((Elements.count() > 1) && (!(importerFlags & LoadSavePlugin::lfCreateDoc)))
 		{

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18514&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sat Sep 28 08:14:09 2013
@@ -15366,6 +15366,8 @@
 void ScribusDoc::resizeGroupToContents(PageItem* group)
 {
 	PageItem_Group* currItem = group->asGroupFrame();
+	if (currItem == NULL)
+		return;
 	QPainterPath input1 = currItem->PoLine.toQPainterPath(true);
 	input1.translate(currItem->xPos(), currItem->yPos());
 	if (currItem->fillEvenOdd())