v1.0.81: точное совпадение класса XWPFParagraph/XWPFTable — фикс SDTParagraph дублирований

This commit is contained in:
2026-06-21 08:59:18 +04:00
parent 18d1a07aad
commit edd2eca0c2
+5 -4
View File
@@ -70,20 +70,21 @@
<cfloop from="0" to="#bodyElements.size() - 1#" index="bi"> <cfloop from="0" to="#bodyElements.size() - 1#" index="bi">
<cfset var be = bodyElements.get(bi)> <cfset var be = bodyElements.get(bi)>
<cfset var beClass = be.getClass().getName()> <cfset var beClass = be.getClass().getName()>
<cfif beClass CONTAINS "XWPFParagraph"> <cfif beClass EQ "org.apache.poi.xwpf.usermodel.XWPFParagraph">
<cfset var para = be> <cfset var para = be>
<cfset var text = para.getText()> <cfset var text = para.getText()>
<cfif len(trim(text))> <cfset var trimText = trim(text)>
<cfif len(trimText) AND len(trimText) LTE 2000>
<cfset var style = ""> <cfset var style = "">
<cftry><cfset style = para.getStyle()><cfcatch></cfcatch></cftry> <cftry><cfset style = para.getStyle()><cfcatch></cfcatch></cftry>
<cfset var el = structNew()> <cfset var el = structNew()>
<cfset el.type = "paragraph"> <cfset el.type = "paragraph">
<cfset el.style = style> <cfset el.style = style>
<cfset el.text = trim(text)> <cfset el.text = trimText>
<cfset el.page = 0> <cfset el.page = 0>
<cfset arrayAppend(out.elements, el)> <cfset arrayAppend(out.elements, el)>
</cfif> </cfif>
<cfelseif beClass CONTAINS "XWPFTable"> <cfelseif beClass EQ "org.apache.poi.xwpf.usermodel.XWPFTable">
<cfset var table = be> <cfset var table = be>
<cfset var rows = []> <cfset var rows = []>
<cfset var rowsArr = table.getRows()> <cfset var rowsArr = table.getRows()>