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

v1.7.9

This commit is contained in:
csh 2025-02-28 13:41:23 +08:00
parent 39b7549665
commit c05b646104
5 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
funcext/TSOffice/TOfficeObj.tsf
View File

@ -1,4 +1,4 @@
// Version 1.7.8 // Version 1.7.9
Function TOfficeObj(n); Function TOfficeObj(n);
Begin Begin
case lowercase(n) of case lowercase(n) of

14
funcext/TSOffice/TSDocxFile.tsf
View File

@ -1,4 +1,4 @@
// Version 1.7.8 // Version 1.7.9
Type TSDocxFile = Class Type TSDocxFile = Class
///Version: V1.0 2022-09-20 ///Version: V1.0 2022-09-20
///适用于 Microsoft Word docx格式文件 ///适用于 Microsoft Word docx格式文件
@ -607,16 +607,20 @@ Type TSDocxFile = Class
DocPrId_ := 0; DocPrId_ := 0;
ps := Paragraphs(); ps := Paragraphs();
for i:=0 to length(ps)-1 do Begin for i:=0 to length(ps)-1 do Begin
node := class(TSXml).GetNode(ps[i].node_, 'w:r/w:drawing/wp:inline/wp:docPr'); runs := ps[i].GetRuns();
for j:=0 to length(runs)-1 do Begin
node := class(TSXml).GetNode(runs[j].node_, 'w:drawing/wp:inline/wp:docPr');
if not ifObj(node) then if not ifObj(node) then
node := class(TSXml).GetNode(ps[i].node_, 'w:r/w:pict/v:shape/v:textbox/w:txbxContent/wp:docPr'); node := class(TSXml).GetNode(runs[j].node_, 'w:drawing/wp:anchor/wp:docPr');
if not ifObj(node) then if not ifObj(node) then
node := class(TSXml).GetNode(ps[i].node_, 'w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp:docPr'); node := class(TSXml).GetNode(runs[j].node_, 'w:pict/v:shape/v:textbox/w:txbxContent/wp:docPr');
if not ifObj(node) then
node := class(TSXml).GetNode(runs[j].node_, 'mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp:docPr');
if ifObj(node) then Begin if ifObj(node) then Begin
id := class(TSXml).SafeStrToIntDef(node.GetAttribute('id'), 0); id := class(TSXml).SafeStrToIntDef(node.GetAttribute('id'), 0);
if id > DocPrId_ then if id > DocPrId_ then
DocPrId_ := id; DocPrId_ := id;
break; End;
End; End;
End; End;
End; End;

2
funcext/TSOffice/TSXlsxFile.tsf
View File

@ -1,4 +1,4 @@
// Version 1.7.8 // Version 1.7.9
Type TSXlsxFile = Class Type TSXlsxFile = Class
///Version: V1.0 2022-08-08 ///Version: V1.0 2022-08-08
///适用于 Microsoft Excel? 2007 及以上版本创建的电子表格文档。支持 XLSX / XLSM / XLTM / XLTX 等多种文档格式。 ///适用于 Microsoft Excel? 2007 及以上版本创建的电子表格文档。支持 XLSX / XLSM / XLTM / XLTX 等多种文档格式。

2
funcext/TSOffice/document/TTableContent.tsf
View File

@ -118,7 +118,7 @@ Type TTableContent = class
tab := TOfficeObj('TTabStop'); tab := TOfficeObj('TTabStop');
tab.Val := 'right'; tab.Val := 'right';
tab.leader := 'dot'; tab.leader := 'dot';
tab.Position := 8306; tab.Position := TOfficeApi().Get("TTableContent-tab-position") ?: 8306;
p.Format.Tabs.Add(0, tab); p.Format.Tabs.Add(0, tab);
if first then Begin if first then Begin
//fldCharType //fldCharType

11
更新日志.md
View File

@ -1,12 +1,21 @@
# 更新日志 # 更新日志
## 2025-2-28
### V1.7.9
#### word
1. **feat**：支持目录自定义宽度`TOfficeApi().Get("TTableContent-tab-position")`
2. **fix**：插入图片id计算错误，导致`office 2016 16.0.4266`版本不兼容
## 2025-1-22 ## 2025-1-22
### V1.7.8 ### V1.7.8
❗解决`TSDocxFile`和`TSXlsxFile`内存泄露 ❗解决`TSDocxFile`和`TSXlsxFile`内存泄露
### word #### word
1. **fix**：`CreateTable`由于`fieldnames.tsf`差异报错 1. **fix**：`CreateTable`由于`fieldnames.tsf`差异报错