[Libwpg-cvs] libwpg/src/conv/raw wpg2raw.cpp,1.20,1.21

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpg/libwpg/src/conv/raw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21256/src/conv/raw

Modified Files:
	wpg2raw.cpp 
Log Message:
moving the brush style information out from the WPGBrush class (making the class meager so that it can be removed at one point)

Index: wpg2raw.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- wpg2raw.cpp	4 Dec 2008 23:17:39 -0000	1.20
+++ wpg2raw.cpp	5 Dec 2008 00:53:49 -0000	1.21
@@ -140,19 +140,10 @@
 	libwpg::WPGBrush tmpBrush = brush;
 	printf("RawPainter::setStyle(%s)\n", getPropString(propList).cstr());
 
-	printf("  Brush style: ");
-
-	if (tmpBrush.style == "none" || tmpBrush.style == "solid" || tmpBrush.style == "bitmap" || tmpBrush.style == "gradient")
-		printf(tmpBrush.style.cstr());
-	else
-		printf("unknown");
-
-	printf("\n");
-
 	printf("  Foreground color: RGB %s Opacity %f\n", tmpBrush.foreColor.cstr(), tmpBrush.foreOpacity);
 	printf("  Background color: RGB %s Opacity %f\n", tmpBrush.backColor.cstr(), tmpBrush.backOpacity);
 
-	if(tmpBrush.style == "gradient")
+	if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "gradient")
 	for(unsigned c = 0; c < tmpBrush.gradient.count(); c++)
 		printf("  Gradient stop %d: %f   RGB %s  Opacity %f\n", c+1,
 			tmpBrush.gradient.stopOffset(c), tmpBrush.gradient.stopColor(c).cstr(), tmpBrush.gradient.stopOpacity(c));