tinysoft
/
TSOffice
5
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

v1.4.6-patch2

This commit is contained in:
csh 2023-09-20 09:14:36 +08:00
parent f3094c148c
commit 493691b930
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
funcext/TSOffice/TOfficeObj.tsf
View File

@ -13944,7 +13944,7 @@ Type TDocumentBody = Class(DocObject)
End; End;
End; End;
if bHeadList then Begin //统计大纲显示（目录） if bHeadList then Begin //统计大纲显示（目录）
styleId := p.Format.Value('StyleId'); styleId := p.Format.Value('StyleId', 1);
if styleId <> '' then Begin if styleId <> '' then Begin
obj := docx.StyleObject().GetStyleById(styleId); obj := docx.StyleObject().GetStyleById(styleId);
if ifObj(obj) then Begin if ifObj(obj) then Begin

6
funcext/TSOffice/TSUtils/NodeInfo.tsf
View File

@ -154,7 +154,7 @@ public
return 1; return 1;
End End
Function Value(name); Function Value(name, nottransferable);
Begin Begin
if not ifObj(RootObj) then return nil; if not ifObj(RootObj) then return nil;
if NodeUri <> '' then if NodeUri <> '' then
@ -169,7 +169,7 @@ public
if istable(r) then if istable(r) then
begin begin
value := node.GetAttribute(r[1]); value := node.GetAttribute(r[1]);
return trystrtofloat(value, r) ? r : value; return nottransferable ? value : trystrtofloat(value, r) ? r : value;
end end
children := GetChildren(); children := GetChildren();
@ -186,7 +186,7 @@ public
key := r['attrName'] ? r['attrName'] : r['attrEx'] ? r['attrEx'] : 'val'; key := r['attrName'] ? r['attrName'] : r['attrEx'] ? r['attrEx'] : 'val';
value := node.GetAttribute(key); value := node.GetAttribute(key);
if r['nodeType'] = 'empty' and value = '' then return true; if r['nodeType'] = 'empty' and value = '' then return true;
return trystrtofloat(value, r) ? r : value; return nottransferable ? value : trystrtofloat(value, r) ? r : value;
End; End;
return nil; return nil;
End; End;

4
funcext/TSOffice/document/docxDocument.tsf
View File

@ -29,7 +29,7 @@ Type docxDocument = Class
markStart := p.FirstChildElement('w:bookmarkStart'); markStart := p.FirstChildElement('w:bookmarkStart');
if ifObj(markStart) then Begin if ifObj(markStart) then Begin
id := markStart.GetAttribute('w:id'); id := markStart.GetAttribute('w:id');
if ifstring(id) then Begin if ifstring(id) and id <> '' then Begin
iVal := strtoint(id); iVal := strtoint(id);
if bookmarkid_ <= iVal then if bookmarkid_ <= iVal then
bookmarkid_ := iVal + 1; bookmarkid_ := iVal + 1;
@ -48,4 +48,4 @@ private
body_; body_;
document_; document_;
bookmarkid_; bookmarkid_;
End; End;