From 352ff51e1a6583e6f60e054dd37e005291ae2a1c Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 23 Aug 2022 14:29:21 +0300
Subject: [PATCH 1/2] [PE] Fix Bug 58557

---
 .../main/app/view/ShapeSettingsAdvanced.js           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
index adeeb4432..cad1f7e97 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
@@ -710,8 +710,10 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
 
                 value = props.asc_getRot();
                 this.spnAngle.setValue((value==undefined || value===null) ? '' : Math.floor(value*180/3.14159265358979+0.5), true);
-                this.chFlipHor.setValue(props.asc_getFlipH());
-                this.chFlipVert.setValue(props.asc_getFlipV());
+                value = props.asc_getFlipH();
+                this.chFlipHor.setValue((value==undefined || value===null) ? 'indeterminate' : value);
+                value = props.asc_getFlipV();
+                this.chFlipVert.setValue((value==undefined || value===null) ? 'indeterminate' : value);
 
                 this._changedProps = new Asc.asc_CShapeProperty();
             }
@@ -742,8 +744,10 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
                 this._changedProps.asc_putDescription(this.textareaAltDescription.val());
 
             this._changedProps.asc_putRot(this.spnAngle.getNumberValue() * 3.14159265358979 / 180);
-            this._changedProps.asc_putFlipH(this.chFlipHor.getValue()=='checked');
-            this._changedProps.asc_putFlipV(this.chFlipVert.getValue()=='checked');
+            if (this.chFlipHor.getValue()!=='indeterminate')
+                this._changedProps.asc_putFlipH(this.chFlipHor.getValue()==='checked');
+            if (this.chFlipVert.getValue()!=='indeterminate')
+                this._changedProps.asc_putFlipV(this.chFlipVert.getValue()==='checked');
 
             Common.localStorage.setItem("pe-settings-shaperatio", (this.btnRatio.pressed) ? 1 : 0);
             return { shapeProps: this._changedProps} ;

From 8662ab8fa44b65d76d415a9ffcb642905aedea7f Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 23 Aug 2022 15:09:52 +0300
Subject: [PATCH 2/2] Fix Bug 58635 + fix for hy language

---
 .../template/PivotSettingsAdvanced.template   | 24 ++++++++++---------
 .../main/app/view/ChartSettingsDlg.js         |  2 +-
 .../main/app/view/PivotSettingsAdvanced.js    |  4 ++--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template
index f9621da56..f782fa415 100644
--- a/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template
+++ b/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template
@@ -1,55 +1,57 @@
 <div id="id-adv-pivot-layout" class="settings-panel active">
     <div class="inner-content">
-        <table cols="1" style="width: 100%;">
+        <table cols="2" style="width: 100%;">
             <tr>
-                <td class="padding-large">
+                <td colspan="2" class="padding-large">
                     <label class="header"><%= scope.txtName %></label>
                     <div id="pivot-adv-name"></div>
                 </td>
             </tr>
             <tr>
-                <td class="padding-small">
+                <td colspan="2" class="padding-small">
                     <label class="header"><%= scope.textGrandTotals %></label>
                 </td>
             </tr>
             <tr>
-                <td class="padding-small">
+                <td colspan="2" class="padding-small">
                     <div id="pivot-adv-chk-show-rows"></div>
                 </td>
             </tr>
             <tr>
-                <td class="padding-large">
+                <td colspan="2" class="padding-large">
                     <div id="pivot-adv-chk-show-columns"></div>
                 </td>
             </tr>
             <tr>
-                <td class="padding-small">
+                <td colspan="2" class="padding-small">
                     <label class="header"><%= scope.textDisplayFields %></label>
                 </td>
             </tr>
             <tr>
-                <td class="padding-small">
+                <td colspan="2" class="padding-small">
                     <div id="pivot-adv-radio-down"></div>
                 </td>
             </tr>
             <tr>
-                <td class="padding-small">
+                <td colspan="2" class="padding-small">
                     <div id="pivot-adv-radio-over"></div>
                 </td>
             </tr>
             <tr>
                 <td class="padding-large">
-                    <label id="pivot-adv-label-wrap" class="input-label" style="margin-top: 4px;"></label>
+                    <label id="pivot-adv-label-wrap" class="input-label"></label>
+                </td>
+                <td class="padding-large">
                     <div id="pivot-adv-spin-wrap" style="float: right; width: 85px;"></div>
                 </td>
             </tr>
             <tr>
-                <td class="padding-small">
+                <td colspan="2" class="padding-small">
                     <div id="pivot-adv-chk-show-headers"></div>
                 </td>
             </tr>
             <tr>
-                <td class="padding-small">
+                <td colspan="2" class="padding-small">
                     <div id="pivot-adv-chk-autofit-col-width"></div>
                 </td>
             </tr>
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
index f946e9a0e..acc8f926b 100644
--- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
@@ -50,7 +50,7 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
 
     SSE.Views.ChartSettingsDlg = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
-            contentWidth: 322,
+            contentWidth: 327,
             height: 535,
             toggleGroup: 'chart-settings-dlg-group',
             storageName: 'sse-chart-settings-adv-category'
diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js
index 3a0d8919d..00072fa9e 100644
--- a/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js
+++ b/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js
@@ -50,8 +50,8 @@ define([    'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
 
     SSE.Views.PivotSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
-            contentWidth: 300,
-            height: 395,
+            contentWidth: 310,
+            height: 440,
             toggleGroup: 'pivot-adv-settings-group',
             storageName: 'sse-pivot-adv-settings-category'
         },