[de] Implement set/get rtl direction with paragraph properties

ONLYOFFICE · Jan 31, 2025 · 3d288ac · 3d288ac
1 parent b6f7198
commit 3d288ac
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/common/apiCommon.js b/common/apiCommon.js
@@ -2680,6 +2680,7 @@ function (window, undefined) {
 	function asc_CParagraphProperty(obj) {
 
 		if (obj) {
+			this.Bidi = undefined !== obj.Bidi ? obj.Bidi : undefined;
 			this.ContextualSpacing = (undefined != obj.ContextualSpacing) ? obj.ContextualSpacing : null;
 			this.Ind = (undefined != obj.Ind && null != obj.Ind) ? new asc_CParagraphInd(obj.Ind) : null;
 			this.KeepLines = (undefined != obj.KeepLines) ? obj.KeepLines : null;
@@ -2741,6 +2742,7 @@ function (window, undefined) {
 			//
 			//    PageBreakBefore : false,              // начинать параграф с новой страницы
 
+			this.Bidi = undefined;
 			this.ContextualSpacing = undefined;
 			this.Ind = new asc_CParagraphInd();
 			this.KeepLines = undefined;
@@ -2776,7 +2778,13 @@ function (window, undefined) {
 			this.CanEditInlineCC = true;
 		}
 	}
-
+
+	asc_CParagraphProperty.prototype.asc_getRtlDirection = function() {
+		return this.Bidi;
+	};
+	asc_CParagraphProperty.prototype.asc_putRtlDirection = function(v) {
+		this.Bidi = v;
+	};
 	asc_CParagraphProperty.prototype.asc_getContextualSpacing = function () {
 		return this.ContextualSpacing;
 	};
@@ -6515,6 +6523,8 @@ function (window, undefined) {
 
 	window["Asc"]["asc_CParagraphProperty"] = window["Asc"].asc_CParagraphProperty = asc_CParagraphProperty;
 	prot = asc_CParagraphProperty.prototype;
+	prot["get_RtlDirection"] = prot["asc_getRtlDirection"] = prot.asc_getRtlDirection;
+	prot["put_RtlDirection"] = prot["asc_putRtlDirection"] = prot.asc_putRtlDirection;
 	prot["get_ContextualSpacing"] = prot["asc_getContextualSpacing"] = prot.asc_getContextualSpacing;
 	prot["put_ContextualSpacing"] = prot["asc_putContextualSpacing"] = prot.asc_putContextualSpacing;
 	prot["get_Ind"] = prot["asc_getInd"] = prot.asc_getInd;

diff --git a/word/Editor/Document.js b/word/Editor/Document.js
@@ -7060,6 +7060,18 @@ CDocument.prototype.GoToPage = function(nPageAbs)
 
 	return nCurPage;
 };
+CDocument.prototype.SetParagraphBidi = function(isRtl)
+{
+	let paragraphs = this.GetSelectedParagraphs();
+	for (let i = 0; i < paragraphs.length; ++i)
+	{
+		paragraphs[i].SetParagraphBidi(isRtl);
+	}
+
+	this.Recalculate();
+	this.UpdateInterface();
+	this.UpdateSelection();
+};
 CDocument.prototype.SetParagraphAlign = function(Align)
 {
 	var SelectedInfo = this.GetSelectedElementsInfo();

diff --git a/word/Editor/Styles.js b/word/Editor/Styles.js
@@ -16668,9 +16668,7 @@ CParaPr.prototype.Compare = function(ParaPr)
 	var Result_ParaPr    = new CParaPr();
 	Result_ParaPr.Locked = false;
 
-	if (undefined !== this.Bidi)
-		Result_ParaPr.Bidi = this.Bidi;
-	else
+	if (ParaPr.Bidi === this.Bidi)
 		Result_ParaPr.Bidi = ParaPr.Bidi;
 
 	if (ParaPr.ContextualSpacing === this.ContextualSpacing)

diff --git a/word/api.js b/word/api.js
@@ -3535,15 +3535,7 @@ background-repeat: no-repeat;\
 			return;
 
 		logicDocument.StartAction(AscDFH.historydescription_Document_SetParagraphBidi);
-
-		let paragraphs = logicDocument.GetSelectedParagraphs();
-		for (let i = 0; i < paragraphs.length; ++i)
-		{
-			paragraphs[i].SetParagraphBidi(isRtl);
-		}
-
-		logicDocument.Recalculate();
-		logicDocument.UpdateInterface();
+		logicDocument.SetParagraphBidi(isRtl);
 		logicDocument.FinalizeAction();
 	};
 	asc_docs_api.prototype._addRemoveSpaceBeforeAfterParagraph = function(event)
@@ -4089,6 +4081,9 @@ background-repeat: no-repeat;\
 
 			if (undefined !== Props.SuppressLineNumbers)
 				oLogicDocument.SetParagraphSuppressLineNumbers(Props.SuppressLineNumbers);
+
+			if (undefined !== Props.Bidi)
+				oLogicDocument.SetParagraphBidi(Props.Bidi);
 
 			// TODO: как только разъединят настройки параграфа и текста переделать тут
 			var TextPr = new AscCommonWord.CTextPr();
@@ -4134,7 +4129,7 @@ background-repeat: no-repeat;\
 
 			if (undefined !== Props.Ligatures)
 				TextPr.Ligatures = Props.Ligatures;
-
+			
 			oLogicDocument.AddToParagraph(new AscCommonWord.ParaTextPr(TextPr));
 			oLogicDocument.Recalculate();
 			oLogicDocument.UpdateInterface();