v1.2.3-patch1
This commit is contained in:
parent
7b0756e573
commit
6dda8f85bc
Binary file not shown.
Binary file not shown.
|
|
@ -184,7 +184,8 @@ public
|
||||||
if ifObj(r['obj']) then //对象,返回XML串
|
if ifObj(r['obj']) then //对象,返回XML串
|
||||||
return node.Data();
|
return node.Data();
|
||||||
key := r['attrName'] ? r['attrName'] : r['attrEx'] ? r['attrEx'] : 'val';
|
key := r['attrName'] ? r['attrName'] : r['attrEx'] ? r['attrEx'] : 'val';
|
||||||
return node.GetAttribute(key);//返回属性
|
value := node.GetAttribute(key);
|
||||||
|
return trystrtofloat(value, r) ? r : value;
|
||||||
End;
|
End;
|
||||||
return nil;
|
return nil;
|
||||||
End;
|
End;
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ Type xlsxStyles = Class
|
||||||
cellXfs_node := style_node.FirstChildElement('cellXfs');
|
cellXfs_node := style_node.FirstChildElement('cellXfs');
|
||||||
count := strtoint(cellXfs_node.GetAttribute('count'));
|
count := strtoint(cellXfs_node.GetAttribute('count'));
|
||||||
Id := strtoint(oldStyleId);
|
Id := strtoint(oldStyleId);
|
||||||
if Id < count-1 then return nil;
|
if Id > count-1 then return nil;
|
||||||
|
|
||||||
xf := getNode(cellXfs_node, 'xf', Id);
|
xf := getNode(cellXfs_node, 'xf', Id);
|
||||||
marshal := xf.marshal()[0];
|
marshal := xf.marshal()[0];
|
||||||
|
|
@ -97,7 +97,7 @@ Type xlsxStyles = Class
|
||||||
cellXfs_node := style_node.FirstChildElement('cellXfs');
|
cellXfs_node := style_node.FirstChildElement('cellXfs');
|
||||||
count := strtoint(cellXfs_node.GetAttribute('count'));
|
count := strtoint(cellXfs_node.GetAttribute('count'));
|
||||||
Id := strtoint(styleId);
|
Id := strtoint(styleId);
|
||||||
if Id < count-1 then return nil;
|
if Id > count-1 then return nil;
|
||||||
|
|
||||||
xf := getNode(cellXfs_node, 'xf', Id);
|
xf := getNode(cellXfs_node, 'xf', Id);
|
||||||
attrs := xf.Attributes();
|
attrs := xf.Attributes();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue