Fix getting first textPr for custT

ONLYOFFICE · Sep 17, 2024 · 17e8c46 · 17e8c46
1 parent 180cfe6
commit 17e8c46
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/common/Drawings/Format/Shape.js b/common/Drawings/Format/Shape.js
@@ -4305,7 +4305,7 @@
 				if (content) {
 					const item = content.Content[paragraphIndex];
 					if (item) {
-						return item.Get_FirstTextPr().FontSize;
+						return item.Get_FirstTextPr2().FontSize;
 					}
 				}
 			}
@@ -4343,7 +4343,7 @@
 					const deltaDepth = startDepth !== undefined ? node.depth - startDepth + 1 : 0;
 					for (let j = 0; j < pointContent.Content.length; j += 1) {
 						const oItem = oContent.Content[paragraphIndex];
-						const fontSize = oItem.Get_FirstTextPr().FontSize;
+						const fontSize = oItem.Get_FirstTextPr2().FontSize;
 						if (startDepth !== undefined) {
 							const indent = getSmartArtParagraphIndent(fontSize);
 							oItem.Set_Spacing({After: fontSize * bulletSpacingScale}, false);

diff --git a/common/SmartArts/SmartArtTree.js b/common/SmartArts/SmartArtTree.js
@@ -6211,6 +6211,9 @@ function HierarchyAlgorithm() {
 			this.applyTextMargins(editorShape);
 			this.applyHorizontalAlignment(editorShape);
 			this.applyVerticalAlignment(editorShape);
+			if (!editorShape.isCanFitFontSize()) {
+				editorShape.applyCustTSettings();
+			}
 		}
 	};
 	TextAlgorithm.prototype.getTextRotate = function () {
@@ -6347,9 +6350,6 @@ function HierarchyAlgorithm() {
 		}
 
 		editorShape.setPaddings(paddings, {bNotCopyToPoints: true});
-		if (!editorShape.isCanFitFontSize()) {
-			editorShape.applyCustTSettings();
-		}
 	};
 	function isParentWithChildren(nodes) {
 		if (nodes.length) {