r18828 by fschmid - ODG-Importer: don't import lines with no stroke

scribus-commit scribus-commit at lists.scribus.net
Wed Feb 19 20:44:57 UTC 2014


Author: fschmid
Date: Wed Feb 19 20:44:57 2014
New Revision: 18828

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18828
Log:
ODG-Importer: don't import lines with no stroke

Modified:
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18828&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Wed Feb 19 20:44:57 2014
@@ -730,7 +730,7 @@
 	double x2 = e.attribute( "svg:x2" ).isEmpty() ? 0.0 : parseUnit( e.attribute( "svg:x2" ) );
 	double y2 = e.attribute( "svg:y2" ).isEmpty() ? 0.0 : parseUnit( e.attribute( "svg:y2" ) );
 	resovleStyle(tmpOStyle, e.attribute("draw:style-name"));
-	if ((tmpOStyle.fill_type == 0) && (tmpOStyle.stroke_type == 0))
+	if (tmpOStyle.stroke_type == 0)
 		return retObj;
 	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke, true);
 	retObj = m_Doc->Items->at(z);
@@ -860,7 +860,7 @@
 	ObjStyle tmpOStyle;
 	PageItem *retObj = NULL;
 	resovleStyle(tmpOStyle, e.attribute("draw:style-name"));
-	if ((tmpOStyle.fill_type == 0) && (tmpOStyle.stroke_type == 0))
+	if (tmpOStyle.stroke_type == 0)
 		return retObj;
 	int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None, tmpOStyle.CurrColorStroke, true);
 	retObj = m_Doc->Items->at(z);




More information about the scribus-commit mailing list