From fd4bd11c9ee401d92152b7d921a5ac05cc0a38cf Mon Sep 17 00:00:00 2001 From: csh Date: Tue, 29 Aug 2023 11:24:11 +0800 Subject: [PATCH] v1.4.4-patch2 --- funcext/TSOffice/TOfficeObj.tsf | 3 ++- funcext/TSOffice/document/TDocxStyles.tsf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/funcext/TSOffice/TOfficeObj.tsf b/funcext/TSOffice/TOfficeObj.tsf index 4f85ff3..23221ac 100644 --- a/funcext/TSOffice/TOfficeObj.tsf +++ b/funcext/TSOffice/TOfficeObj.tsf @@ -13009,7 +13009,7 @@ Type TDocumentBody = Class(DocObject) if not ifObj(node) then return false; reset_position := false; - if node = TOfficeApi().GetCurrentPosition() then + if node.Eq(TOfficeApi().GetCurrentPosition()) then reset_position := true; next := node.NextElement('w:p'); node_.DeleteChild(node); @@ -13916,6 +13916,7 @@ Type TDocumentBody = Class(DocObject) styleId := p.Format.Value('StyleId'); if styleId <> '' then Begin obj := docx.StyleObject().GetStyleById(styleId); + println("styleid = {}, obj = {}", styleid, obj); if ifObj(obj) then Begin level := obj.HeadingLevel(); iLevel := Class(TSXml).SafeStrToIntDef(level, -1); diff --git a/funcext/TSOffice/document/TDocxStyles.tsf b/funcext/TSOffice/document/TDocxStyles.tsf index 7dfd141..8911cad 100644 --- a/funcext/TSOffice/document/TDocxStyles.tsf +++ b/funcext/TSOffice/document/TDocxStyles.tsf @@ -60,7 +60,8 @@ Type TDocxStyles = Class ///返回：TDocxStyle对象 Function GetStyleById(id); Begin - return idMap_[ id ]; + newid := ifnumber(id) ? tostring(id) : id; + return idMap_[ newid ]; End; //返回全部LatentStyles对象列表