r18732 by fschmid - Fixed Bug #11972: Frame indicators are missing in imported VIVA XML files

[scribus-commit]

Author: fschmid
Date: Thu Jan 16 20:40:07 2014
New Revision: 18732

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18732
Log:
Fixed Bug #11972: Frame indicators are missing in imported VIVA XML files

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

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18732&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Thu Jan 16 20:40:07 2014
@@ -1911,6 +1911,8 @@
 					}
 					else
 						no_stroke = true;
+					if (lineTransparency() > 0.9)
+						no_stroke = true;
 				}
 				else
 				{

Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18732&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 Jan 16 20:40:07 2014
@@ -1141,7 +1141,7 @@
 							else
 								opa = 1.0 - (eo.text().toDouble() / 100.0);
 							fillOpacity = 1.0 - ((1.0 - fillOpacity) * (1.0 - opa));
-							strokeOpacity = 1.0 - ((1.0 - strokeOpacity) * (1.0 * opa));
+							strokeOpacity = 1.0 - ((1.0 - strokeOpacity) * (1.0 - opa));
 						}
 						else if (eo.tagName() == "vo:cornerRadius")
 							cornerRadius = parseUnit(eo.text());
@@ -1403,10 +1403,26 @@
 		}
 		else
 			item->FrameType = 3;
-		item->setFillColor(fillColor);
-		item->setLineColor(strokeColor);
-		item->setFillShade(fillTint);
-		item->setLineShade(strokeTint);
+		if (fillTint == 0)
+		{
+			item->setFillColor(CommonStrings::None);
+			item->setFillShade(100);
+		}
+		else
+		{
+			item->setFillColor(fillColor);
+			item->setFillShade(fillTint);
+		}
+		if (strokeTint == 0)
+		{
+			item->setLineColor(CommonStrings::None);
+			item->setLineShade(100);
+		}
+		else
+		{
+			item->setLineColor(strokeColor);
+			item->setLineShade(strokeTint);
+		}
 		if (baseType == 1)
 			item->setFillTransparency(imageOpacity);
 		else