v1.8.2

funcext/TSOffice/TOfficeObj.tsf

@@ -1,4 +1,4 @@
-// Version 1.8.1
+// Version 1.8.2
 Function TOfficeObj(n);
 Begin
 	case lowercase(n) of
@@ -11143,16 +11143,33 @@ Type TParagraph = Class(DocObject, TParagraphImpl)
 	Begin
 		if ifObj(node_) then
 		begin
-			if ifObj(node_.FirstChildElement("w:r")) then return false;
 			sub_node := node_.FirstChildElement();
 			if not ifObj(sub_node) then return true;
-			// 兼容wps
 			sub_node2 := sub_node.NextElement();
-			if sub_node.GetName() = 'w:bookmarkStart' and ifObj(sub_node2) and sub_node2.GetName() = 'w:bookmarkEnd' then
-				return true;
+
+			sub_node_name := sub_node.GetName();
+			if sub_node_name = "w:r" then
+			begin
+				r_sub_node := sub_node.FirstChildElement();
+				if not ifObj(r_sub_node) then return true;
+				while ifObj(r_sub_node) do
+				begin
+					sub_node2_name := r_sub_node.GetName();
+					if sub_node2_name = 'w:t' and trim(r_sub_node.GetText()) <> '' then return fasle;
+					else if sub_node2_name in array('mc:AlternateContent', 'w:drawing', 'w:pict', 'w:object') then return false;
+					r_sub_node := r_sub_node.NextElement();	
+				end
+			end
 			// 兼容word
-			if sub_node.GetName() = 'w:pPr' and not ifObj(sub_node2) then
+			else if sub_node_name = 'w:pPr' and not ifObj(sub_node2) then
+			begin
 				return true;
+			end
+			// 兼容wps
+			else if sub_node_name = 'w:bookmarkStart' and ifObj(sub_node2) and sub_node2.GetName() = 'w:bookmarkEnd' then
+			begin
+				return true;
+			end
 		end
 		return false;
 	End;
@@ -14144,7 +14161,7 @@ Type TDocumentBody = Class(DocObject)
 							r[ind]['numId'] := arr[ii]['numId'];
 							r[ind]['ilvl'] := arr[ii]['ilvl'];
 							r[ind]['numArr'] := arr[ii]['numArr'];
-							ind++
+							ind++;
 						end
 					End;
 				End;