r18730 by fschmid - Fixed Bug #11966: Background in VDX files interpreted as black

[scribus-commit]

Author: fschmid
Date: Wed Jan 15 16:26:11 2014
New Revision: 18730

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18730
Log:
Fixed Bug #11966: Background in VDX files interpreted as black

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

Modified: trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18730&path=/trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpub.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpub.cpp Wed Jan 15 16:26:11 2014
@@ -370,7 +370,8 @@
 		PageItem *ite = m_Doc->Items->at(z);
 		finishItem(ite);
 		applyFill(ite);
-		applyShadow(ite);
+		if (CurrColorFill != CommonStrings::None)
+			applyShadow(ite);
 	}
 //	qDebug() << "drawRectangle";
 //  printf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());
@@ -390,7 +391,8 @@
 		PageItem *ite = m_Doc->Items->at(z);
 		finishItem(ite);
 		applyFill(ite);
-		applyShadow(ite);
+		if (CurrColorFill != CommonStrings::None)
+			applyShadow(ite);
 	}
 //	qDebug() << "drawEllipse";
 //  printf("RawPainter::drawEllipse (%s)\n", getPropString(propList).cstr());
@@ -532,7 +534,8 @@
 			applyFill(ite);
 		}
 		applyFlip(ite);
-		applyShadow(ite);
+		if (CurrColorFill != CommonStrings::None)
+			applyShadow(ite);
 	}
 }
 
@@ -641,7 +644,8 @@
 			applyFill(ite);
 		}
 		applyFlip(ite);
-		applyShadow(ite);
+		if (CurrColorFill != CommonStrings::None)
+			applyShadow(ite);
 	}
 	else
 	{
@@ -723,7 +727,8 @@
 			}
 		}
 		applyFlip(ite);
-		applyShadow(ite);
+		if (CurrColorFill != CommonStrings::None)
+			applyShadow(ite);
 	}
 //	qDebug() << "drawGraphicObject";
 //  printf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr());

Modified: trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18730&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 Wed Jan 15 16:26:11 2014
@@ -399,7 +399,8 @@
 		PageItem *ite = m_Doc->Items->at(z);
 		finishItem(ite);
 		applyFill(ite);
-		applyShadow(ite);
+		if (CurrColorFill != CommonStrings::None)
+			applyShadow(ite);
 	}
 //	qDebug() << "drawRectangle";
 //  printf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());
@@ -419,7 +420,8 @@
 		PageItem *ite = m_Doc->Items->at(z);
 		finishItem(ite);
 		applyFill(ite);
-		applyShadow(ite);
+		if (CurrColorFill != CommonStrings::None)
+			applyShadow(ite);
 	}
 //	qDebug() << "drawEllipse";
 //  printf("RawPainter::drawEllipse (%s)\n", getPropString(propList).cstr());
@@ -535,7 +537,8 @@
 			finishItem(ite);
 			applyFill(ite);
 		}
-		applyShadow(ite);
+		if (CurrColorFill != CommonStrings::None)
+			applyShadow(ite);
 	}
 }
 
@@ -643,7 +646,8 @@
 			finishItem(ite);
 			applyFill(ite);
 		}
-		applyShadow(ite);
+		if (CurrColorFill != CommonStrings::None)
+			applyShadow(ite);
 	}
 	else
 	{