[SE] [pivot] fix bug 45567

ONLYOFFICE · Dec 13, 2024 · 07c731f · 07c731f
1 parent c24b653
commit 07c731f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/cell/model/PivotTables.js b/cell/model/PivotTables.js
@@ -10123,7 +10123,7 @@ PivotFormatsManager.prototype.checkReferenceValues = function(referenceInfo, val
  */
 CT_pivotTableDefinition.prototype.asc_convertNameToFormula = function(name) {
 	let result = '';
-	const reg = /^\w+$/;
+	const reg = new XRegExp('^[\\p{L}_][\\p{L}\\p{N}_]*$');
 	result = name.replace(/\'/g, "''");
 	if (!reg.test(result)) {
 		result = "'" + result + "'";

diff --git a/common/editorscommon.js b/common/editorscommon.js
@@ -3860,7 +3860,16 @@
 			this._reset();
 		}
 		const subSTR = formula.substring(start_pos);
-		const reg = /^(\w+|(?:\'.+?\'(?!\')))\[(\w+|(?:\'.+?\'(?!\')))\]/;
+		const reg = XRegExp.build('(?x) ^({{fieldName}})\\[({{itemName}})\\]', {
+			'fieldName': XRegExp.build('{{simple}}|{{quotes}}', {
+				'simple': '[\\p{L}_][\\p{L}\\p{N}_]*',
+				'quotes': "\\'.+?\\'(?!\\')",
+			}),
+			'itemName': XRegExp.build('{{simple}}|{{quotes}}', {
+				'simple': '[\\p{L}\\p{N}_]+',
+				'quotes': "\\'.+?\\'(?!\\')",
+			})
+		});
 		const match = reg.exec(subSTR);
 		if (match !== null && match[1] && match[2]) {
 			this.operand_str = match[0];