From 267caf2c704817ddb4b96b1e434c0d7aa8cc9443 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 24 Oct 2024 15:15:08 +0300
Subject: [PATCH 1/3] Fix Bug 71165

---
 apps/common/main/lib/view/ReviewPopover.js | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js
index 3c12292251..d171a84543 100644
--- a/apps/common/main/lib/view/ReviewPopover.js
+++ b/apps/common/main/lib/view/ReviewPopover.js
@@ -103,7 +103,7 @@ define([
             this.canRequestSendNotify = options.canRequestSendNotify;
             this.mentionShare = options.mentionShare;
             this.api = options.api;
-            this._state = {commentsVisible: false, reviewVisible: false};
+            this._state = {commentsVisible: false, reviewVisible: false, arrowCls: 'left'};
 
             _options.tpl = _.template(this.template)(_options);
 
@@ -777,6 +777,12 @@ define([
                     // LEFT CORNER
 
                     if (!_.isUndefined(posX)) {
+                        var isRtlSheet = !_.isUndefined(leftX) && (posX<leftX);
+                        if (isRtlSheet) {
+                            let tmp = posX;
+                            posX = leftX;
+                            leftX = tmp;
+                        }
 
                         sdkPanelRight = $('#id_vertical_scroll');
                         if (sdkPanelRight.length) {
@@ -800,7 +806,7 @@ define([
                             this.sdkBounds.width -= sdkPanelThumbsWidth;
                         }
 
-                        if (!Common.UI.isRTL()) {
+                        if (!isRtlSheet) {
                             leftPos = Math.min(sdkBoundsLeft + posX + this.arrow.width, sdkBoundsLeft + this.sdkBounds.width - this.$window.outerWidth() - 25);
                             leftPos = Math.max(sdkBoundsLeft + sdkPanelLeftWidth + this.arrow.width, leftPos);
                         } else {
@@ -808,15 +814,17 @@ define([
                             leftPos = Math.min(sdkBoundsLeft + this.sdkBounds.width - this.$window.outerWidth() - 25, leftPos);
                         }
 
+                        this._state.arrowCls = 'left';
                         arrowView.removeClass('right top bottom').addClass('left');
                         arrowView.css({left: ''});
 
                         if (!_.isUndefined(leftX)) {
                             windowWidth = this.$window.outerWidth();
                             if (windowWidth) {
-                                if ((posX + windowWidth > this.sdkBounds.width - this.arrow.width + 5) && (this.leftX > windowWidth) || (Common.UI.isRTL() && sdkBoundsLeft + this.leftX > windowWidth + this.arrow.width)) {
-                                    leftPos = sdkBoundsLeft + this.leftX - windowWidth - this.arrow.width;
+                                if ((posX + windowWidth > this.sdkBounds.width - this.arrow.width + 5) && (leftX > windowWidth) || (isRtlSheet && sdkBoundsLeft + leftX > windowWidth + this.arrow.width)) {
+                                    leftPos = sdkBoundsLeft + leftX - windowWidth - this.arrow.width;
                                     arrowView.removeClass('left').addClass('right');
+                                    this._state.arrowCls = 'right';
                                 } else {
                                     leftPos = sdkBoundsLeft + posX + this.arrow.width;
                                 }
@@ -963,8 +971,8 @@ define([
                                 arrowPosY = Math.min(arrowPosY, sdkBoundsHeight - (sdkPanelHeight + this.arrow.margin + this.arrow.height));
 
                                 arrowView.css({top: arrowPosY + 'px', left: ''});
-                                arrowView.removeClass('top bottom right');
-                                arrowView.addClass('left');
+                                arrowView.removeClass('top bottom right left');
+                                arrowView.addClass(this._state.arrowCls);
                                 this.scroller.scrollTop(scrollPos);
                             } else {
 
@@ -983,8 +991,8 @@ define([
                                 arrowPosY = Math.min(arrowPosY, outerHeight - this.arrow.margin - this.arrow.height);
 
                                 arrowView.css({top: arrowPosY + 'px', left: ''});
-                                arrowView.removeClass('top bottom right');
-                                arrowView.addClass('left');
+                                arrowView.removeClass('top bottom right left');
+                                arrowView.addClass(this._state.arrowCls);
                             }
                         }
                     }

From 19dd669cf2a0c3fae9b9aff721d12f160c666f50 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 24 Oct 2024 18:02:46 +0300
Subject: [PATCH 2/3] Bug 71165, fix comments in pe/pdf in rtl interface

---
 apps/common/main/lib/view/ReviewPopover.js | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js
index d171a84543..6d080aa2b0 100644
--- a/apps/common/main/lib/view/ReviewPopover.js
+++ b/apps/common/main/lib/view/ReviewPopover.js
@@ -104,6 +104,7 @@ define([
             this.mentionShare = options.mentionShare;
             this.api = options.api;
             this._state = {commentsVisible: false, reviewVisible: false, arrowCls: 'left'};
+            this.isDocEditor = !!window.DE;
 
             _options.tpl = _.template(this.template)(_options);
 
@@ -777,8 +778,9 @@ define([
                     // LEFT CORNER
 
                     if (!_.isUndefined(posX)) {
-                        var isRtlSheet = !_.isUndefined(leftX) && (posX<leftX);
-                        if (isRtlSheet) {
+                        let isOnSheet = !_.isUndefined(leftX),
+                            isRtl = isOnSheet ? posX < leftX : Common.UI.isRTL();
+                        if (isOnSheet && isRtl) {
                             let tmp = posX;
                             posX = leftX;
                             leftX = tmp;
@@ -806,25 +808,28 @@ define([
                             this.sdkBounds.width -= sdkPanelThumbsWidth;
                         }
 
-                        if (!isRtlSheet) {
+                        if (!isRtl) {
                             leftPos = Math.min(sdkBoundsLeft + posX + this.arrow.width, sdkBoundsLeft + this.sdkBounds.width - this.$window.outerWidth() - 25);
                             leftPos = Math.max(sdkBoundsLeft + sdkPanelLeftWidth + this.arrow.width, leftPos);
-                        } else {
+                        } else if (this.isDocEditor) {
                             leftPos = Math.max(sdkBoundsLeft + sdkPanelLeftWidth + 25, sdkBoundsLeft + this.sdkBounds.width - this.$window.outerWidth() - posX + 7);
                             leftPos = Math.min(sdkBoundsLeft + this.sdkBounds.width - this.$window.outerWidth() - 25, leftPos);
+                        } else {
+                            leftPos = Math.max(sdkBoundsLeft + sdkPanelLeftWidth, sdkBoundsLeft + posX - this.$window.outerWidth() - this.arrow.width - 25);
+                            leftPos = Math.min(sdkBoundsLeft + this.sdkBounds.width - this.$window.outerWidth() - 25, leftPos);
                         }
 
-                        this._state.arrowCls = 'left';
-                        arrowView.removeClass('right top bottom').addClass('left');
+                        this._state.arrowCls = isOnSheet && Common.UI.isRTL() ? 'right' : 'left';
+                        arrowView.removeClass('right top bottom').addClass(this._state.arrowCls);
                         arrowView.css({left: ''});
 
-                        if (!_.isUndefined(leftX)) {
+                        if (isOnSheet) {
                             windowWidth = this.$window.outerWidth();
                             if (windowWidth) {
-                                if ((posX + windowWidth > this.sdkBounds.width - this.arrow.width + 5) && (leftX > windowWidth) || (isRtlSheet && sdkBoundsLeft + leftX > windowWidth + this.arrow.width)) {
+                                if ((posX + windowWidth > this.sdkBounds.width - this.arrow.width + 5) && (leftX > windowWidth) || (isRtl && sdkBoundsLeft + leftX > windowWidth + this.arrow.width)) {
                                     leftPos = sdkBoundsLeft + leftX - windowWidth - this.arrow.width;
-                                    arrowView.removeClass('left').addClass('right');
-                                    this._state.arrowCls = 'right';
+                                    this._state.arrowCls = Common.UI.isRTL() ? 'left' : 'right';
+                                    arrowView.removeClass('left right').addClass(this._state.arrowCls);
                                 } else {
                                     leftPos = sdkBoundsLeft + posX + this.arrow.width;
                                 }

From 86b6684bd3afee5170f3f297f4f8659144fae4f5 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 24 Oct 2024 18:35:17 +0300
Subject: [PATCH 3/3] Fix Bug 71199

---
 apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
index 723d3c14e6..57e72d7157 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
@@ -672,7 +672,7 @@ define([
                 this.btnsCategory[4].setDisabled(null === margins);   // Margins
 
                 var shapetype = props.asc_getType();
-                this.btnsCategory[5].setDisabled(props.get_FromSmartArtInternal()
+                this.btnsCategory[5].setDisabled(props.get_FromSmartArtInternal() || props.get_FromSmartArt()
                     || shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
                     || shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
                     || shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'