r18879 by fschmid - Fixed Bug #12122: Crash during VIVA XML import

[scribus-commit]

Author: fschmid
Date: Thu Mar  6 19:51:57 2014
New Revision: 18879

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18879
Log:
Fixed Bug #12122: Crash during VIVA XML import

Modified:
    trunk/Scribus/scribus/plugins/import/viva/importviva.cpp

Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18879&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp Thu Mar  6 19:51:57 2014
@@ -894,7 +894,11 @@
 			{
 				QDomElement eog = obg.toElement();
 				if (eog.tagName() == "vo:object")
-					GElements.append(parseObjectXML(eog));
+				{
+					PageItem *gItem = parseObjectXML(eog);
+					if (gItem != NULL)
+						GElements.append(gItem);
+				}
 				else if (eog.tagName() == "vo:transformation")
 				{
 					for(QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
@@ -2177,7 +2181,7 @@
 {
 	if (pAttrs.fontSize.valid)
 	{
-		tmpCStyle.setFontSize(pAttrs.fontSize.value.toInt() * 10);
+		tmpCStyle.setFontSize(pAttrs.fontSize.value.toDouble() * 10);
 		if (pAttrs.lineSpacing.valid)
 		{
 			if (pAttrs.fontSize.value.toInt() > parseUnit(pAttrs.lineSpacing.value))