r16168 by fschmid - Fixed Bug #9624: "Colours, gradients and patterns in the Group tab don't work"

[scribus-commit]

Author: fschmid
Date: Mon Dec 27 08:43:51 2010
New Revision: 16168

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16168
Log:
Fixed Bug #9624: "Colours, gradients and patterns in the Group tab don't work"

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16168&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Mon Dec 27 08:43:51 2010
@@ -2919,7 +2919,7 @@
 		{
 			currItem->GrStartX = attrs.valueAsDouble("GRSTARTX", 0.0);
 			currItem->GrStartY = attrs.valueAsDouble("GRSTARTY", 0.0);
-			currItem->GrEndX   = attrs.valueAsDouble("GRENDX", 0.0);
+			currItem->GrEndX   = attrs.valueAsDouble("GRENDX", currItem->width());
 			currItem->GrEndY   = attrs.valueAsDouble("GRENDY", 0.0);
 			GrColor = attrs.valueAsString("GRCOLOR","");
 			if (!GrColor.isEmpty())

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16168&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp Mon Dec 27 08:43:51 2010
@@ -1850,7 +1850,7 @@
 	{
 		currItem->GrStartX = ScCLocale::toDoubleC(obj->attribute("GRSTARTX"), 0.0);
 		currItem->GrStartY = ScCLocale::toDoubleC(obj->attribute("GRSTARTY"), 0.0);
-		currItem->GrEndX = ScCLocale::toDoubleC(obj->attribute("GRENDX"), 0.0);
+		currItem->GrEndX = ScCLocale::toDoubleC(obj->attribute("GRENDX"), currItem->width());
 		currItem->GrEndY = ScCLocale::toDoubleC(obj->attribute("GRENDY"), 0.0);
 		GrColor = obj->attribute("GRCOLOR","");
 		if (!GrColor.isEmpty())

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16168&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Mon Dec 27 08:43:51 2010
@@ -3696,7 +3696,7 @@
 		{
 			currItem->GrStartX = attrs.valueAsDouble("GRSTARTX", 0.0);
 			currItem->GrStartY = attrs.valueAsDouble("GRSTARTY", 0.0);
-			currItem->GrEndX   = attrs.valueAsDouble("GRENDX", 0.0);
+			currItem->GrEndX   = attrs.valueAsDouble("GRENDX", currItem->width());
 			currItem->GrEndY   = attrs.valueAsDouble("GRENDY", 0.0);
 			currItem->GrFocalX = attrs.valueAsDouble("GRFOCALX", 0.0);
 			currItem->GrFocalY = attrs.valueAsDouble("GRFOCALY", 0.0);
@@ -3782,7 +3782,7 @@
 		currItem->stroke_gradient.clearStops();
 	currItem->GrStrokeStartX = attrs.valueAsDouble("GRSTARTXS", 0.0);
 	currItem->GrStrokeStartY = attrs.valueAsDouble("GRSTARTYS", 0.0);
-	currItem->GrStrokeEndX   = attrs.valueAsDouble("GRENDXS", 0.0);
+	currItem->GrStrokeEndX   = attrs.valueAsDouble("GRENDXS", currItem->width());
 	currItem->GrStrokeEndY   = attrs.valueAsDouble("GRENDYS", 0.0);
 	currItem->GrStrokeFocalX = attrs.valueAsDouble("GRFOCALXS", 0.0);
 	currItem->GrStrokeFocalY = attrs.valueAsDouble("GRFOCALYS", 0.0);
@@ -3817,7 +3817,7 @@
 		currItem->mask_gradient.clearStops();
 	currItem->GrMaskStartX = attrs.valueAsDouble("GRSTARTXM", 0.0);
 	currItem->GrMaskStartY = attrs.valueAsDouble("GRSTARTYM", 0.0);
-	currItem->GrMaskEndX   = attrs.valueAsDouble("GRENDXM", 0.0);
+	currItem->GrMaskEndX   = attrs.valueAsDouble("GRENDXM", currItem->width());
 	currItem->GrMaskEndY   = attrs.valueAsDouble("GRENDYM", 0.0);
 	currItem->GrMaskFocalX = attrs.valueAsDouble("GRFOCALXM", 0.0);
 	currItem->GrMaskFocalY = attrs.valueAsDouble("GRFOCALYM", 0.0);