r13934 by fschmid - Fixed Bug #8393: "Import problem of old scribus-documents"

[scribus-commit]

Revision: 13934
Author: fschmid
Date: 2009-08-28T12:08:16.915278Z
Commit message: Fixed Bug #8393: "Import problem of old scribus-documents"

Changeset: 
M  /branches/Version135/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
M  /branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp

Diffs:
Index: scribus/plugins/fileloader/scribus12format/scribus12format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(revision 13933)
+++ scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(revision 13934)
@@ -799,6 +799,8 @@
 		OB->Pcolor2 = obj->attribute("PCOLOR2");
 		OB->TxtFill = obj->attribute("TXTFILL", "Black");
 	}
+	if (OB->Pwidth == 0.0)
+		OB->Pcolor2 = CommonStrings::None;
 	OB->Shade = obj->attribute("SHADE").toInt();
 	OB->Shade2 = obj->attribute("SHADE2").toInt();
 	OB->FillRule = obj->attribute("fillRule", "1").toInt();
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 13933)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 13934)
@@ -2219,6 +2219,10 @@
 	currItem->setCornerRadius(ScCLocale::toDoubleC(obj->attribute("RADRECT"), 0.0));
 	currItem->ClipEdited = obj->attribute("CLIPEDIT", "0").toInt();
 	currItem->setFillColor(Pcolor);
+	if (currItem->lineWidth() == 0.0)
+		currItem->setLineColor(CommonStrings::None);
+	else
+		currItem->setLineColor(Pcolor2);
 	currItem->setLineColor(Pcolor2);
 	currItem->setFillShade(Pshade);
 	currItem->setLineShade(Pshade2);