r18739 by fschmid - Fixed Bug #11982: Severe problems with a complex VSD file from Microsoft

[scribus-commit]

Author: fschmid
Date: Fri Jan 17 19:42:15 2014
New Revision: 18739

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18739
Log:
Fixed Bug #11982: Severe problems with a complex VSD file from Microsoft

Modified:
    trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp

Modified: trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18739&path=/trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp Fri Jan 17 19:42:15 2014
@@ -752,37 +752,40 @@
 		double rot = 0;
 		if (propList["libwpg:rotate"])
 			rot = propList["libwpg:rotate"]->getDouble();
-		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX + x, baseY + y, w, h, 0, CurrColorFill, CurrColorStroke, true);
-		PageItem *ite = m_Doc->Items->at(z);
-		CurrFillTrans = 0;
-		CurrStrokeTrans = 0;
-		finishItem(ite);
-		applyShadow(ite);
-		if (rot != 0)
-		{
-			int rm = m_Doc->RotMode();
-			m_Doc->RotMode(2);
-			m_Doc->RotateItem(rot, ite);
-			m_Doc->RotMode(rm);
-		}
-		if (propList["fo:padding-left"])
-			ite->setTextToFrameDistLeft(valueAsPoint(propList["fo:padding-left"]));
-		if (propList["fo:padding-right"])
-			ite->setTextToFrameDistRight(valueAsPoint(propList["fo:padding-right"]));
-		if (propList["fo:padding-top"])
-			ite->setTextToFrameDistTop(valueAsPoint(propList["fo:padding-top"]));
-		if (propList["fo:padding-bottom"])
-			ite->setTextToFrameDistBottom(valueAsPoint(propList["fo:padding-bottom"]));
-		if (propList["fo:column-count"])
-			ite->setColumns(propList["fo:column-count"]->getInt());
-		if (propList["fo:column-gap"])
-			ite->setColumnGap(valueAsPoint(propList["fo:column-gap"]));
-		ite->setFirstLineOffset(FLOPFontAscent);
-		actTextItem = ite;
-		QString pStyle = CommonStrings::DefaultParagraphStyle;
-		ParagraphStyle newStyle;
-		newStyle.setParent(pStyle);
-		textStyle = newStyle;
+		if ((w != 0) && (h != 0))
+		{
+			int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Rectangle, baseX + x, baseY + y, w, h, 0, CurrColorFill, CurrColorStroke, true);
+			PageItem *ite = m_Doc->Items->at(z);
+			CurrFillTrans = 0;
+			CurrStrokeTrans = 0;
+			finishItem(ite);
+			applyShadow(ite);
+			if (rot != 0)
+			{
+				int rm = m_Doc->RotMode();
+				m_Doc->RotMode(2);
+				m_Doc->RotateItem(rot, ite);
+				m_Doc->RotMode(rm);
+			}
+			if (propList["fo:padding-left"])
+				ite->setTextToFrameDistLeft(valueAsPoint(propList["fo:padding-left"]));
+			if (propList["fo:padding-right"])
+				ite->setTextToFrameDistRight(valueAsPoint(propList["fo:padding-right"]));
+			if (propList["fo:padding-top"])
+				ite->setTextToFrameDistTop(valueAsPoint(propList["fo:padding-top"]));
+			if (propList["fo:padding-bottom"])
+				ite->setTextToFrameDistBottom(valueAsPoint(propList["fo:padding-bottom"]));
+			if (propList["fo:column-count"])
+				ite->setColumns(propList["fo:column-count"]->getInt());
+			if (propList["fo:column-gap"])
+				ite->setColumnGap(valueAsPoint(propList["fo:column-gap"]));
+			ite->setFirstLineOffset(FLOPFontAscent);
+			actTextItem = ite;
+			QString pStyle = CommonStrings::DefaultParagraphStyle;
+			ParagraphStyle newStyle;
+			newStyle.setParent(pStyle);
+			textStyle = newStyle;
+		}
 	}
 }
 
@@ -845,6 +848,8 @@
 {
 	if (!doProcessing)
 		return;
+	if (actTextItem == NULL)
+		return;
 	int posT = actTextItem->itemText.length();
 	if (posT > 0)
 	{
@@ -859,6 +864,8 @@
 void RawVsdPainter::startTextSpan(const ::WPXPropertyList &propList)
 {
 	if (!doProcessing)
+		return;
+	if (actTextItem == NULL)
 		return;
 	textCharStyle = textStyle.charStyle();
 	if (propList["fo:font-size"])