fpspreadsheet: Fix xlsx chart reader sometimes ignoring colors.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9203 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/fpspreadsheet/examples/other/chart/write_demos.lpg

@@ -2,6 +2,11 @@
 <CONFIG>
   <ProjectGroup FileVersion="2">
     <Targets>
+      <Target FileName="areachart_write_demo.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
       <Target FileName="barchart_write_demo.lpi">
         <BuildModes>
           <Mode Name="Default"/>

components/fpspreadsheet/source/common/xlsxooxmlchart.pas

@@ -211,7 +211,7 @@ function HTMLColorStr(AValue: TsColor): string;
 var
   rgb: TRGBA absolute AValue;
 begin
-  Result := Lowercase(Format('%.2x%.2x%.2x', [rgb.r, rgb.g, rgb.b]));
+  Result := Format('%.2x%.2x%.2x', [rgb.r, rgb.g, rgb.b]);
 end;
 
 
@@ -587,9 +587,8 @@ var
   n: Integer;
   child: TDOMNode;
 begin
-  if ANode = nil then
+  while Assigned(ANode) do
-    exit;
+  begin
-
     nodeName := ANode.NodeName;
     case nodeName of
       'a:schemeClr':
@@ -644,6 +643,8 @@ begin
           end;
         end;
     end;
+    ANode := ANode.NextSibling;
+  end;
 end;
 
 procedure TsSpreadOOXMLChartReader.ReadChartGradientFillProps(ANode: TDOMNode;
@@ -3235,12 +3236,16 @@ begin
 
   Result := Format(
     indent + '<%0:s sz="%d" spc="-1" %s%s%s%s>' + LE +
+    indent + '  <a:solidFill>' + LE +
+    indent + '    <a:srgbClr val="%s"/>' + LE +
+    indent + '  </a:solidFill>' + LE +
     indent + '  <a:latin typeface="%s"/>' + LE +
     indent + '</%0:s>',
     [
       ANodeName,
       round(AFont.Size * 100),
       bold, italic, strike, underline,
+      HTMLColorStr(AFont.Color),
       fontName
     ]
   );