r18608 by fschmid - Fixed Bug #11851: Text in imported Viva files remains invisible

[scribus-commit]

Author: fschmid
Date: Fri Nov 29 21:06:30 2013
New Revision: 18608

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18608
Log:
Fixed Bug #11851: Text in imported Viva files remains invisible

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=18608&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 Fri Nov 29 21:06:30 2013
@@ -1140,8 +1140,8 @@
 								opa = 0;
 							else
 								opa = 1.0 - (eo.text().toDouble() / 100.0);
-							fillOpacity = 1.0 - ((1.0 - fillOpacity) * opa);
-							strokeOpacity = 1.0 - ((1.0 - strokeOpacity) * opa);
+							fillOpacity = 1.0 - ((1.0 - fillOpacity) * (1.0 - opa));
+							strokeOpacity = 1.0 - ((1.0 - strokeOpacity) * (1.0 * opa));
 						}
 						else if (eo.tagName() == "vo:cornerRadius")
 							cornerRadius = parseUnit(eo.text());