From 31720084dd957431931dee2d4612aba95123a55e Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Wed, 22 Jan 2025 16:29:57 +0300
Subject: [PATCH 1/5] [PDF] Lock interface elements when delete/rotate page or
 edit text

---
 apps/common/main/lib/view/Draw.js             |  1 +
 .../main/app/controller/DocumentHolder.js     |  5 +-
 .../main/app/controller/DocumentHolderExt.js  | 22 ++++--
 apps/pdfeditor/main/app/controller/InsTab.js  | 10 ++-
 .../main/app/controller/RightMenu.js          | 13 ++++
 apps/pdfeditor/main/app/controller/Toolbar.js | 61 +++++++++++----
 .../main/app/view/DocumentHolderExt.js        | 64 ++++++++++-----
 apps/pdfeditor/main/app/view/InsTab.js        | 26 +++----
 apps/pdfeditor/main/app/view/Toolbar.js       | 78 ++++++++++---------
 9 files changed, 188 insertions(+), 92 deletions(-)

diff --git a/apps/common/main/lib/view/Draw.js b/apps/common/main/lib/view/Draw.js
index be816f7883..8bf18d6a6b 100644
--- a/apps/common/main/lib/view/Draw.js
+++ b/apps/common/main/lib/view/Draw.js
@@ -112,6 +112,7 @@ define([
                     ],
                     lock = (this.appPrefix === 'de-') ? [_set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode] :
                            (this.appPrefix === 'pe-') ? [_set.slideDeleted, _set.lostConnect, _set.noSlides] :
+                           (this.appPrefix === 'pdfe-') ? [_set.pageDeleted, _set.lostConnect] :
                                                         [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']],
                     me = this;
                 penOptions.forEach(function (props) {
diff --git a/apps/pdfeditor/main/app/controller/DocumentHolder.js b/apps/pdfeditor/main/app/controller/DocumentHolder.js
index eb6ae98035..62ce0d4fdf 100644
--- a/apps/pdfeditor/main/app/controller/DocumentHolder.js
+++ b/apps/pdfeditor/main/app/controller/DocumentHolder.js
@@ -281,7 +281,7 @@ define([
                     }
                 }
             }
-            if (this.mode && this.mode.isEdit && this.mode.isPDFEdit) {
+            if (this.mode && this.mode.isEdit && (this.mode.isPDFEdit || this.mode.isPDFAnnotate)) {
                 var i = -1,
                     in_equation = false,
                     locked = false;
@@ -292,12 +292,15 @@ define([
                     } else if (type === Asc.c_oAscTypeSelectElement.Paragraph) {
                         var value = selectedElements[i].get_ObjectValue();
                         value && (locked = locked || value.get_Locked());
+                    } else if (type === Asc.c_oAscTypeSelectElement.PdfPage) {
+                        this._state.pageDeleted = selectedElements[i].get_ObjectValue().asc_getDeleteLock();
                     }
                 }
                 if (in_equation) {
                     this._state.equationLocked = locked;
                     this.disableEquationBar();
                 }
+                this._state.pageDeleted && this.clearSelection();
             }
         },
 
diff --git a/apps/pdfeditor/main/app/controller/DocumentHolderExt.js b/apps/pdfeditor/main/app/controller/DocumentHolderExt.js
index f71b6d6aa7..ab44df406e 100644
--- a/apps/pdfeditor/main/app/controller/DocumentHolderExt.js
+++ b/apps/pdfeditor/main/app/controller/DocumentHolderExt.js
@@ -246,9 +246,15 @@ define([], function () {
 
             var menu_props = {};
             selectedElements && _.each(selectedElements, function(element, index) {
-                if (Asc.c_oAscTypeSelectElement.Annot == element.get_ObjectType()) {
+                var elType  = element.get_ObjectType(),
+                    elValue = element.get_ObjectValue();
+                if (Asc.c_oAscTypeSelectElement.Annot == elType) {
                     menu_props.annotProps = {};
-                    menu_props.annotProps.value = element.get_ObjectValue();
+                    menu_props.annotProps.value = elValue;
+                } else if (Asc.c_oAscTypeSelectElement.PdfPage == elType) {
+                    menu_props.pageProps = {};
+                    menu_props.pageProps.value = elValue;
+                    menu_props.pageProps.locked = (elValue) ? elValue.asc_getDeleteLock() : false;
                 }
             });
 
@@ -314,6 +320,10 @@ define([], function () {
                     menu_to_show = documentHolder.editPDFModeMenu;
                     menu_props.annotProps = {};
                     menu_props.annotProps.value = elValue;
+                } else if (Asc.c_oAscTypeSelectElement.PdfPage == elType) {
+                    menu_props.pageProps = {};
+                    menu_props.pageProps.value = elValue;
+                    menu_props.pageProps.locked = (elValue) ? elValue.asc_getDeleteLock() : false;
                 }
             });
             if (menu_to_show === null) {
@@ -362,7 +372,7 @@ define([], function () {
         };
 
         dh.onShowTextBar = function(bounds) {
-            if (this.mode && !(!this.mode.isPDFEdit && this.mode.isEdit)) return;
+            if (this.mode && !(!this.mode.isPDFEdit && this.mode.isEdit) || this._state.pageDeleted) return;
 
             if (_.isUndefined(this._XY)) {
                 this._XY = [
@@ -732,7 +742,7 @@ define([], function () {
         };
 
         dh.onShowAnnotBar = function(bounds, mouseOnTop) {
-            if (this.mode && !this.mode.isEdit) return;
+            if (this.mode && !this.mode.isEdit || this._state.pageDeleted) return;
 
             if (_.isUndefined(this._XY)) {
                 this._XY = [
@@ -824,7 +834,7 @@ define([], function () {
         };
 
         dh.onShowAnnotSelectBar = function(bounds, mouseOnTop) {
-            if (this.mode && !this.mode.isEdit) return;
+            if (this.mode && !this.mode.isEdit || this._state.pageDeleted) return;
 
             if (_.isUndefined(this._XY)) {
                 this._XY = [
@@ -946,7 +956,7 @@ define([], function () {
         };
 
         dh.onShowMathTrack = function(bounds) {
-            if (this.mode && !(this.mode.isPDFEdit && this.mode.isEdit)) return;
+            if (this.mode && !(this.mode.isPDFEdit && this.mode.isEdit) || this._state.pageDeleted) return;
 
             this.lastMathTrackBounds = bounds;
             if (!Common.Controllers.LaunchController.isScriptLoaded()) {
diff --git a/apps/pdfeditor/main/app/controller/InsTab.js b/apps/pdfeditor/main/app/controller/InsTab.js
index 0897adcc6d..605de1152d 100644
--- a/apps/pdfeditor/main/app/controller/InsTab.js
+++ b/apps/pdfeditor/main/app/controller/InsTab.js
@@ -927,7 +927,8 @@ define([
             var pr, i = -1, type,
                 paragraph_locked = false,
                 no_paragraph = true,
-                in_chart = false;
+                in_chart = false,
+                page_deleted = false;
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
@@ -944,6 +945,8 @@ define([
                     if (type == Asc.c_oAscTypeSelectElement.Chart) {
                         in_chart = true;
                     }
+                } else if (type == Asc.c_oAscTypeSelectElement.PdfPage) {
+                    page_deleted = pr.asc_getDeleteLock();
                 }
             }
 
@@ -961,6 +964,11 @@ define([
                 if (this._state.activated) this._state.no_paragraph = no_paragraph;
                 Common.Utils.lockControls(Common.enumLock.noParagraphSelected, no_paragraph, {array: this.view.lockedControls});
             }
+
+            if (page_deleted !== undefined && this._state.pagecontrolsdisable !== page_deleted) {
+                if (this._state.activated) this._state.pagecontrolsdisable = page_deleted;
+                Common.Utils.lockControls(Common.enumLock.pageDeleted, page_deleted, {array: this.view.lockedControls});
+            }
         },
 
         onApiCanAddHyperlink: function(value) {
diff --git a/apps/pdfeditor/main/app/controller/RightMenu.js b/apps/pdfeditor/main/app/controller/RightMenu.js
index c0b091a712..6258b1f3ed 100644
--- a/apps/pdfeditor/main/app/controller/RightMenu.js
+++ b/apps/pdfeditor/main/app/controller/RightMenu.js
@@ -145,10 +145,16 @@ define([
             }
             // this._settings[Common.Utils.documentSettingsType.Signature].locked = false;
 
+            var page_deleted = false;
             for (i=0; i<SelectedObjects.length; i++)
             {
                 var eltype = SelectedObjects[i].get_ObjectType(),
                     settingsType = this.getDocumentSettingsType(eltype);
+
+                if (eltype === Asc.c_oAscTypeSelectElement.PdfPage) {
+                    page_deleted = SelectedObjects[i].get_ObjectValue().asc_getDeleteLock();
+                }
+
                 if (settingsType===undefined || settingsType>=this._settings.length || this._settings[settingsType]===undefined)
                     continue;
 
@@ -167,6 +173,13 @@ define([
                 }
             }
 
+            if ( page_deleted ) { // all elements are locked if the page is locked
+                for (i=0; i<this._settings.length; i++)  {
+                    if (this._settings[i])
+                        this._settings[i].locked = true;
+                }
+            }
+
             var lastactive = -1, currentactive, priorityactive = -1,
                 activePane = this.rightmenu.GetActivePane();
             for (i=0; i<this._settings.length; i++) {
diff --git a/apps/pdfeditor/main/app/controller/Toolbar.js b/apps/pdfeditor/main/app/controller/Toolbar.js
index 1b8ae4a1ae..8bd3f43863 100644
--- a/apps/pdfeditor/main/app/controller/Toolbar.js
+++ b/apps/pdfeditor/main/app/controller/Toolbar.js
@@ -389,6 +389,7 @@ define([
 
             this.toolbar.setApi(this.api);
 
+            this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectAnnotate, this));
             this.api.asc_registerCallback('asc_onCanUndo', _.bind(this.onApiCanRevert, this, 'undo'));
             this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo'));
             this.api.asc_registerCallback('asc_onZoomChange', _.bind(this.onApiZoomChange, this));
@@ -527,6 +528,22 @@ define([
             }
         },
 
+        onApiFocusObjectAnnotate: function(selectedObjects) {
+            if (!this.editMode || !this.mode.isPDFAnnotate) return;
+
+            var i = -1,
+                page_deleted = false;
+            while (++i < selectedObjects.length) {
+                if (selectedObjects[i].get_ObjectType() == Asc.c_oAscTypeSelectElement.PdfPage) {
+                    page_deleted = selectedObjects[i].get_ObjectValue().asc_getDeleteLock();
+                }
+            }
+            if (page_deleted !== undefined && this._state.pagecontrolsdisable !== page_deleted) {
+                if (this._state.activated) this._state.pagecontrolsdisable = page_deleted;
+                this.toolbar.lockToolbar(Common.enumLock.pageDeleted, page_deleted);
+            }
+        },
+
         onApiFocusObject: function(selectedObjects) {
             if (!this.editMode || !this.mode.isPDFEdit) return;
 
@@ -542,7 +559,10 @@ define([
                 in_smartart = false,
                 in_smartart_internal = false,
                 in_annot = false,
-                annot_lock = false;
+                annot_lock = false,
+                page_deleted = false,
+                page_rotate = false,
+                page_edit_text = false;
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
@@ -586,68 +606,72 @@ define([
                     in_annot = true;
                     if (pr.asc_getCanEditText())
                         no_text = false;
+                } else if (type == Asc.c_oAscTypeSelectElement.PdfPage) {
+                    page_deleted = pr.asc_getDeleteLock();
+                    page_rotate = pr.asc_getRotateLock();
+                    page_edit_text = pr.asc_getEditLock();
                 }
             }
 
             if (this._state.prcontrolsdisable !== paragraph_locked) {
                 if (this._state.activated) this._state.prcontrolsdisable = paragraph_locked;
                 if (paragraph_locked!==undefined)
-                    this.toolbar.lockToolbar(Common.enumLock.paragraphLock, paragraph_locked, {array: toolbar.paragraphControls});
+                    toolbar.lockToolbar(Common.enumLock.paragraphLock, paragraph_locked, {array: toolbar.paragraphControls});
             }
 
             if (this._state.no_paragraph !== no_paragraph) {
                 if (this._state.activated) this._state.no_paragraph = no_paragraph;
-                this.toolbar.lockToolbar(Common.enumLock.noParagraphSelected, no_paragraph, {array: toolbar.paragraphControls});
-                // this.toolbar.lockToolbar(Common.enumLock.noParagraphSelected, no_paragraph, {array: [toolbar.btnCopyStyle]});
+                toolbar.lockToolbar(Common.enumLock.noParagraphSelected, no_paragraph, {array: toolbar.paragraphControls});
+                // toolbar.lockToolbar(Common.enumLock.noParagraphSelected, no_paragraph, {array: [toolbar.btnCopyStyle]});
             }
 
             if (this._state.no_text !== no_text) {
                 if (this._state.activated) this._state.no_text = no_text;
-                this.toolbar.lockToolbar(Common.enumLock.noTextSelected, no_text, {array: toolbar.paragraphControls});
+                toolbar.lockToolbar(Common.enumLock.noTextSelected, no_text, {array: toolbar.paragraphControls});
             }
 
             if (this._state.in_annot !== in_annot) {
                 if (this._state.activated) this._state.in_annot = in_annot;
-                this.toolbar.lockToolbar(Common.enumLock.inAnnotation, in_annot, {array: toolbar.paragraphControls});
+                toolbar.lockToolbar(Common.enumLock.inAnnotation, in_annot, {array: toolbar.paragraphControls});
             }
 
             if (this._state.no_object !== no_object ) {
                 if (this._state.activated) this._state.no_object = no_object;
-                this.toolbar.lockToolbar(Common.enumLock.noObjectSelected, no_object, {array: [toolbar.btnVerticalAlign ]});
+                toolbar.lockToolbar(Common.enumLock.noObjectSelected, no_object, {array: [toolbar.btnVerticalAlign ]});
             }
 
             var no_drawing_objects = this.api.asc_getSelectedDrawingObjectsCount()<1;
             if (this._state.no_drawing_objects !== no_drawing_objects ) {
                 if (this._state.activated) this._state.no_drawing_objects = no_drawing_objects;
-                this.toolbar.lockToolbar(Common.enumLock.noDrawingObjects, no_drawing_objects, {array: [toolbar.btnShapeAlign, toolbar.btnShapeArrange, toolbar.btnShapesMerge]});
+                toolbar.lockToolbar(Common.enumLock.noDrawingObjects, no_drawing_objects, {array: [toolbar.btnShapeAlign, toolbar.btnShapeArrange, toolbar.btnShapesMerge]});
             }
 
             if (shape_locked!==undefined && this._state.shapecontrolsdisable !== shape_locked) {
                 if (this._state.activated) this._state.shapecontrolsdisable = shape_locked;
-                this.toolbar.lockToolbar(Common.enumLock.shapeLock, shape_locked, {array: toolbar.shapeControls.concat(toolbar.paragraphControls)});
+                toolbar.lockToolbar(Common.enumLock.shapeLock, shape_locked, {array: toolbar.shapeControls.concat(toolbar.paragraphControls)});
             }
 
             if (shape_locked===undefined && !this._state.no_drawing_objects) { // several tables selected
-                this.toolbar.lockToolbar(Common.enumLock.shapeLock, false, {array: toolbar.shapeControls});
+                toolbar.lockToolbar(Common.enumLock.shapeLock, false, {array: toolbar.shapeControls});
             }
 
             if (this._state.in_equation !== in_equation) {
                 if (this._state.activated) this._state.in_equation = in_equation;
-                this.toolbar.lockToolbar(Common.enumLock.inEquation, in_equation, {array: [toolbar.btnSuperscript, toolbar.btnSubscript]});
+                toolbar.lockToolbar(Common.enumLock.inEquation, in_equation, {array: [toolbar.btnSuperscript, toolbar.btnSubscript]});
             }
 
             if (this._state.no_columns !== no_columns) {
                 if (this._state.activated) this._state.no_columns = no_columns;
-                this.toolbar.lockToolbar(Common.enumLock.noColumns, no_columns, {array: [toolbar.btnColumns]});
+                toolbar.lockToolbar(Common.enumLock.noColumns, no_columns, {array: [toolbar.btnColumns]});
             }
 
             if (this._state.in_smartart !== in_smartart) {
-                this.toolbar.lockToolbar(Common.enumLock.inSmartart, in_smartart, {array: toolbar.paragraphControls});
+                toolbar.lockToolbar(Common.enumLock.inSmartart, in_smartart, {array: toolbar.paragraphControls});
                 this._state.in_smartart = in_smartart;
             }
 
             if (this._state.in_smartart_internal !== in_smartart_internal) {
-                this.toolbar.lockToolbar(Common.enumLock.inSmartartInternal, in_smartart_internal, {array: toolbar.paragraphControls});
+                toolbar.lockToolbar(Common.enumLock.inSmartartInternal, in_smartart_internal, {array: toolbar.paragraphControls});
                 this._state.in_smartart_internal = in_smartart_internal;
 
                 toolbar.mnuArrangeFront.setDisabled(in_smartart_internal);
@@ -655,7 +679,14 @@ define([
                 toolbar.mnuArrangeForward.setDisabled(in_smartart_internal);
                 toolbar.mnuArrangeBackward.setDisabled(in_smartart_internal);
             }
-            this.toolbar.lockToolbar(Common.enumLock.cantMergeShape, !this.api.asc_canMergeSelectedShapes(), { array: [this.toolbar.btnShapesMerge] });
+            toolbar.lockToolbar(Common.enumLock.cantMergeShape, !this.api.asc_canMergeSelectedShapes(), { array: [toolbar.btnShapesMerge] });
+
+            if (page_deleted !== undefined && this._state.pagecontrolsdisable !== page_deleted) {
+                if (this._state.activated) this._state.pagecontrolsdisable = page_deleted;
+                toolbar.lockToolbar(Common.enumLock.pageDeleted, page_deleted);
+            }
+            toolbar.lockToolbar(Common.enumLock.pageRotate, page_rotate, {array: [toolbar.btnRotatePage]});
+            toolbar.lockToolbar(Common.enumLock.pageEditText, page_edit_text, {array: [toolbar.btnEditText]});
         },
 
         onApiZoomChange: function(percent, type) {},
diff --git a/apps/pdfeditor/main/app/view/DocumentHolderExt.js b/apps/pdfeditor/main/app/view/DocumentHolderExt.js
index d9b6f3d59f..7b50fd9e5b 100644
--- a/apps/pdfeditor/main/app/view/DocumentHolderExt.js
+++ b/apps/pdfeditor/main/app/view/DocumentHolderExt.js
@@ -60,9 +60,10 @@ define([], function () {
             this.viewPDFModeMenu = new Common.UI.Menu({
                 cls: 'shifted-right',
                 initMenu: function (value) {
+                    var disabled = (value.pageProps!==undefined && value.pageProps.locked);
                     me.menuPDFViewCopy.setDisabled(!(me.api && me.api.can_CopyCut()));
-                    me.menuAddComment.setVisible(me.mode && me.mode.canComments);
-                    me.menuRemoveComment.setVisible(value && value.annotProps && value.annotProps.value);
+                    me.menuAddComment.setVisible(me.mode && me.mode.canComments || disabled);
+                    me.menuRemoveComment.setVisible(value && value.annotProps && value.annotProps.value || disabled);
                 },
                 items: [
                     me.menuPDFViewCopy,
@@ -107,9 +108,10 @@ define([], function () {
             this.editPDFModeMenu = new Common.UI.Menu({
                 cls: 'shifted-right',
                 initMenu: function (value) {
+                    var disabled = (value.pageProps!==undefined && value.pageProps.locked);
                     me.menuPDFEditCopy.setDisabled(!(me.api && me.api.can_CopyCut()));
-                    me.menuEditAddComment.setVisible(me.mode && me.mode.canComments);
-                    me.menuEditRemoveComment.setVisible(value && value.annotProps && value.annotProps.value);
+                    me.menuEditAddComment.setVisible(me.mode && me.mode.canComments || disabled);
+                    me.menuEditRemoveComment.setVisible(value && value.annotProps && value.annotProps.value || disabled);
                 },
                 items: [
                     me.menuPDFEditCopy,
@@ -352,6 +354,8 @@ define([], function () {
                         me.tableMenu.items[i].setVisible(!isEquation);
                     }
 
+                    var disabled = (value.pageProps!==undefined && value.pageProps.locked);
+
                     var align = value.tableProps.value.get_CellsVAlign();
                     var cls = '';
                     switch (align) {
@@ -371,28 +375,28 @@ define([], function () {
                     me.menuTableCellBottom.setChecked(align == Asc.c_oAscVertAlignJc.Bottom);
 
                     if (me.api) {
-                        me.mnuTableMerge.setDisabled(value.tableProps.locked || !me.api.CheckBeforeMergeCells());
-                        me.mnuTableSplit.setDisabled(value.tableProps.locked || !me.api.CheckBeforeSplitCells());
+                        me.mnuTableMerge.setDisabled(value.tableProps.locked || disabled || !me.api.CheckBeforeMergeCells());
+                        me.mnuTableSplit.setDisabled(value.tableProps.locked || disabled || !me.api.CheckBeforeSplitCells());
                     }
-                    me.menuTableDistRows.setDisabled(value.tableProps.locked);
-                    me.menuTableDistCols.setDisabled(value.tableProps.locked);
+                    me.menuTableDistRows.setDisabled(value.tableProps.locked || disabled);
+                    me.menuTableDistCols.setDisabled(value.tableProps.locked || disabled);
 
-                    me.tableMenu.items[5].setDisabled(value.tableProps.locked);
-                    me.tableMenu.items[6].setDisabled(value.tableProps.locked);
+                    me.tableMenu.items[5].setDisabled(value.tableProps.locked || disabled);
+                    me.tableMenu.items[6].setDisabled(value.tableProps.locked || disabled);
 
-                    me.menuTableCellAlign.setDisabled(value.tableProps.locked);
+                    me.menuTableCellAlign.setDisabled(value.tableProps.locked || disabled);
 
                     me.menuTableSaveAsPicture.setVisible(!isEquation);
                     menuTableSaveAsPictureSeparator.setVisible(!isEquation);
 
                     me.menuTableAdvanced.setVisible(!isEquation);
-                    me.menuTableAdvanced.setDisabled(value.tableProps.locked);
+                    me.menuTableAdvanced.setDisabled(value.tableProps.locked || disabled);
                     menuTableSettingsSeparator.setVisible(me.menuTableAdvanced.isVisible());
 
                     var cancopy = me.api && me.api.can_CopyCut();
                     me.menuTableCopy.setDisabled(!cancopy);
-                    me.menuTableCut.setDisabled(value.tableProps.locked || !cancopy);
-                    me.menuTablePaste.setDisabled(value.tableProps.locked);
+                    me.menuTableCut.setDisabled(value.tableProps.locked || disabled || !cancopy);
+                    me.menuTablePaste.setDisabled(value.tableProps.locked || disabled);
 
                     // hyperlink properties
                     var text = null;
@@ -412,12 +416,13 @@ define([], function () {
                         me.menuAddHyperlinkTable.hyperProps.value.put_Text(text);
                     }
                     if (!_.isUndefined(value.paraProps)) {
-                        me.menuAddHyperlinkTable.setDisabled(value.paraProps.locked);
-                        menuHyperlinkTable.setDisabled(value.paraProps.locked);
-                        me._currentParaObjDisabled = value.paraProps.locked;
+                        me.menuAddHyperlinkTable.setDisabled(value.paraProps.locked || disabled);
+                        menuHyperlinkTable.setDisabled(value.paraProps.locked || disabled);
+                        me._currentParaObjDisabled = value.paraProps.locked || disabled;
                     }
 
                     me.menuAddCommentTable.setVisible(me.mode && me.mode.canComments);
+                    me.menuAddCommentTable.setDisabled(disabled);
 
                     //equation menu
                     var eqlen = 0;
@@ -771,7 +776,8 @@ define([], function () {
                         imgdisabled = (value.imgProps!==undefined && value.imgProps.locked),
                         shapedisabled = (value.shapeProps!==undefined && value.shapeProps.locked),
                         chartdisabled = (value.chartProps!==undefined && value.chartProps.locked),
-                        disabled = imgdisabled || shapedisabled || chartdisabled,
+                        page_deleted = (value.pageProps!==undefined && value.pageProps.locked),
+                        disabled = imgdisabled || shapedisabled || chartdisabled || page_deleted,
                         pluginGuid = (value.imgProps) ? value.imgProps.value.asc_getPluginGuid() : null,
                         inSmartartInternal = value.shapeProps && value.shapeProps.value.get_FromSmartArtInternal(),
                         lastSeparator = menuImgSaveAsPictureSeparator;
@@ -826,6 +832,7 @@ define([], function () {
                     /** coauthoring begin **/
                     me.menuAddCommentImg.setVisible(me.mode && me.mode.canComments);
                     !me.menuAddCommentImg.isVisible() && lastSeparator.setVisible(false);
+                    me.menuAddCommentImg.setDisabled(page_deleted);
                     /** coauthoring end **/
                     me.menuImgShapeAlign.setDisabled(disabled);
                     if (!disabled) {
@@ -1037,8 +1044,9 @@ define([], function () {
                 initMenu: function(value){
                     var isInShape = (value.shapeProps && !_.isNull(value.shapeProps.value));
                     var isInChart = (value.chartProps && !_.isNull(value.chartProps.value));
+                    var page_deleted = (value.pageProps!==undefined && value.pageProps.locked);
 
-                    var disabled = (value.paraProps!==undefined  && value.paraProps.locked) ||
+                    var disabled = (value.paraProps!==undefined  && value.paraProps.locked) || page_deleted ||
                         (isInShape && value.shapeProps.locked);
                     var isEquation= (value.mathProps && value.mathProps.value);
                     me._currentParaObjDisabled = disabled;
@@ -1107,6 +1115,7 @@ define([], function () {
 
                     /** coauthoring begin **/
                     me.menuAddCommentPara.setVisible(me.mode && me.mode.canComments);
+                    me.menuAddCommentPara.setDisabled(page_deleted);
                     /** coauthoring end **/
 
                     menuCommentParaSeparator.setVisible(/** coauthoring begin **/ me.menuAddCommentPara.isVisible() || /** coauthoring end **/ me.menuAddHyperlinkPara.isVisible() || menuHyperlinkPara.isVisible());
@@ -1201,6 +1210,19 @@ define([], function () {
                 restoreHeightAndTop: true,
                 scrollToCheckedItem: false,
                 initMenu: function(value) {
+                    if (me.api) {
+                        var i = -1,
+                            page_deleted = false,
+                            page_rotate = false,
+                            selectedElements = me.api.getSelectedElements();
+                        while (++i < selectedElements.length) {
+                            if (selectedElements[i].get_ObjectType() === Asc.c_oAscTypeSelectElement.PdfPage) {
+                                page_deleted = selectedElements[i].get_ObjectValue().asc_getDeleteLock();
+                                page_rotate = selectedElements[i].get_ObjectValue().asc_getRotateLock();
+                            }
+                        }
+                    }
+
                     me.mnuRotatePageRight.options.value = me.mnuRotatePageLeft.options.value = value.pageNum;
                     me.mnuRotatePageRight.setVisible(value.isPageSelect===true);
                     me.mnuRotatePageLeft.setVisible(value.isPageSelect===true);
@@ -1208,7 +1230,9 @@ define([], function () {
                     menuPageNewSeparator.setVisible(value.isPageSelect===true);
                     menuPageDelSeparator.setVisible(value.isPageSelect===true);
 
-                    me.mnuDeletePage.setDisabled(me._pagesCount<2);
+                    me.mnuRotatePageRight.setDisabled(page_rotate || page_deleted);
+                    me.mnuRotatePageLeft.setDisabled(page_rotate || page_deleted);
+                    me.mnuDeletePage.setDisabled(me._pagesCount<2 || page_deleted);
                 },
                 items: [
                     me.mnuNewPageBefore,
diff --git a/apps/pdfeditor/main/app/view/InsTab.js b/apps/pdfeditor/main/app/view/InsTab.js
index 998169d857..a91f8df561 100644
--- a/apps/pdfeditor/main/app/view/InsTab.js
+++ b/apps/pdfeditor/main/app/view/InsTab.js
@@ -132,7 +132,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-inserttable',
                     caption: me.capInsertTable,
-                    lock: [_set.lostConnect, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
                     menu: new Common.UI.Menu({
                         cls: 'shifted-left',
                         items: [
@@ -153,7 +153,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-insertchart',
                     caption: me.capInsertChart,
-                    lock: [_set.lostConnect, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
                     menu: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
@@ -165,7 +165,7 @@ define([
                     id: 'tlbtn-insertsmartart',
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-smart-art',
-                    lock: [_set.lostConnect, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
                     caption: me.capBtnInsSmartArt,
                     menu: true,
                     action: 'insert-smartart',
@@ -180,7 +180,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-insertequation',
                     caption: me.capInsertEquation,
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.paragraphLock, _set.lostConnect, _set.disableOnStart],
                     split: true,
                     menu: new Common.UI.Menu({cls: 'menu-shapes'}),
                     action: 'insert-equation',
@@ -195,7 +195,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-symbol',
                     caption: me.capBtnInsSymbol,
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected],
+                    lock: [_set.pageDeleted, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected],
                     menu: new Common.UI.Menu({
                         style: 'min-width: 100px;',
                         items: [
@@ -218,7 +218,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-big-inserthyperlink',
                     caption: me.capInsertHyperlink,
-                    lock: [_set.hyperlinkLock, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected],
+                    lock: [_set.hyperlinkLock, _set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -230,7 +230,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-textart',
                     caption: me.capInsertTextArt,
-                    lock: [_set.lostConnect, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
                     menu: new Common.UI.Menu({
                         cls: 'menu-shapes',
                         items: [
@@ -261,7 +261,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-datetime',
                     caption: me.capBtnDateTime,
-                    lock: [_set.lostConnect, _set.paragraphLock, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.lostConnect, _set.paragraphLock, _set.disableOnStart],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -273,7 +273,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-pagenum',
                     caption: me.capBtnSlideNum,
-                    lock: [_set.lostConnect, _set.paragraphLock, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.lostConnect, _set.paragraphLock, _set.disableOnStart],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -288,7 +288,7 @@ define([
                     menuWidth: 330,
                     style: 'width: 140px;',
                     enableKeyEvents: true,
-                    lock: [_set.lostConnect, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: '-16, 0'
@@ -324,11 +324,11 @@ define([
 
                 if (this.toolbar && this.toolbar.$el) {
                     this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg').add(this.toolbar.$el.find('.slot-insertimg')), 'tlbtn-insertimage-', 'toolbar__icon btn-insertimage', this.capInsertImage,
-                        [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], false, true, undefined, '1', 'bottom', 'small', undefined, 'insert-image');
+                        [Common.enumLock.pageDeleted, Common.enumLock.lostConnect, Common.enumLock.disableOnStart], false, true, undefined, '1', 'bottom', 'small', undefined, 'insert-image');
                     this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext').add(this.toolbar.$el.find('.slot-instext')), 'tlbtn-inserttext-', 'toolbar__icon btn-big-text', this.capInsertText,
-                        [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], true, true, true, '1', 'bottom', 'small', undefined, 'insert-text');
+                        [Common.enumLock.pageDeleted, Common.enumLock.lostConnect, Common.enumLock.disableOnStart], true, true, true, '1', 'bottom', 'small', undefined, 'insert-text');
                     this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape').add(this.toolbar.$el.find('.slot-insertshape')), 'tlbtn-insertshape-', 'toolbar__icon btn-insertshape', this.capInsertShape,
-                        [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], false, true, true, '1', 'bottom', 'small', undefined, 'insert-shape');
+                        [Common.enumLock.pageDeleted, Common.enumLock.lostConnect, Common.enumLock.disableOnStart], false, true, true, '1', 'bottom', 'small', undefined, 'insert-shape');
                     this.btnsAddPage = Common.Utils.injectButtons($host.find('.slot-inspage').add(this.toolbar.$el.find('.slot-inspage')), 'tlbtn-insertpage-', 'toolbar__icon btn-blankpage', this.capInsPage,
                         [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], true, true, false, '1', 'bottom', 'small', undefined, 'insert-page');
                 }
diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js
index 5c11d2a2fd..51f864d011 100644
--- a/apps/pdfeditor/main/app/view/Toolbar.js
+++ b/apps/pdfeditor/main/app/view/Toolbar.js
@@ -95,7 +95,10 @@ define([
         inEquation: 'in-equation',
         inAnnotation: 'in-annotation',
         singlePage: 'single-page',
-        cantMergeShape: 'merge-shape-lock'
+        cantMergeShape: 'merge-shape-lock',
+        pageRotate: 'page-rotate',
+        pageDeleted: 'page-deleted',
+        pageEditText: 'page-edit-text'
     };
     for (var key in enumLock) {
         if (enumLock.hasOwnProperty(key)) {
@@ -144,7 +147,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     style: 'min-width: 45px;',
                     iconCls: 'toolbar__icon btn-big-magic-wand',
-                    lock: [_set.lostConnect, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.pageEditText, _set.lostConnect, _set.disableOnStart],
                     caption: this.capBtnRecognize,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
@@ -158,7 +161,7 @@ define([
                     menuCls: 'scrollable-menu',
                     menuStyle: 'min-width: 325px;',
                     hint: this.tipFontName,
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     store: new Common.Collections.Fonts(),
                     dataHint: '1',
                     dataHintDirection: 'top'
@@ -170,7 +173,7 @@ define([
                     cls: 'input-group-nr',
                     menuStyle: 'min-width: 55px;',
                     hint: this.tipFontSize,
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     data: [
                         {value: 8, displayValue: "8"},
                         {value: 9, displayValue: "9"},
@@ -200,7 +203,7 @@ define([
                     id: 'id-toolbar-btn-incfont',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-incfont',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     dataHint: '1',
                     dataHintDirection: 'top'
                 });
@@ -211,7 +214,7 @@ define([
                     id: 'id-toolbar-btn-decfont',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-decfont',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     dataHint: '1',
                     dataHintDirection: 'top'
                 });
@@ -222,7 +225,7 @@ define([
                     id: 'id-toolbar-btn-bold',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-bold',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     enableToggle: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom'
@@ -234,7 +237,7 @@ define([
                     id: 'id-toolbar-btn-italic',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-italic',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     enableToggle: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom'
@@ -246,7 +249,7 @@ define([
                     id: 'id-toolbar-btn-underline',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-underline',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     enableToggle: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom'
@@ -258,7 +261,7 @@ define([
                     id: 'id-toolbar-btn-strikeout',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-strikeout',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     enableToggle: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom'
@@ -270,7 +273,7 @@ define([
                     id: 'id-toolbar-btn-superscript',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-superscript',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inEquation],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inEquation],
                     enableToggle: true,
                     toggleGroup: 'superscriptGroup',
                     dataHint: '1',
@@ -283,7 +286,7 @@ define([
                     id: 'id-toolbar-btn-subscript',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-subscript',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inEquation],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inEquation],
                     enableToggle: true,
                     toggleGroup: 'superscriptGroup',
                     dataHint: '1',
@@ -299,7 +302,7 @@ define([
                     enableToggle: true,
                     allowDepress: true,
                     split: true,
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inAnnotation],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: '0, -16',
@@ -323,7 +326,7 @@ define([
                     id: 'id-toolbar-btn-fontcolor',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-fontcolor',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     split: true,
                     menu: true,
                     colors: colorsconfig.colors,
@@ -346,7 +349,7 @@ define([
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-change-case',
                     action: 'change-case',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     menu: new Common.UI.Menu({
                         items: [
                             {caption: this.mniSentenceCase, value: Asc.c_oAscChangeTextCaseType.SentenceCase},
@@ -368,7 +371,7 @@ define([
                     id: 'id-toolbar-btn-clearstyle',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-clearstyle',
-                    lock: [ _set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.disableOnStart],
+                    lock: [ _set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.disableOnStart],
                     dataHint: '1',
                     dataHintDirection: 'bottom'
                 });
@@ -379,7 +382,7 @@ define([
                     id: 'id-toolbar-btn-markers',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon ' + (!Common.UI.isRTL() ? 'btn-setmarkers' : 'btn-setmarkers-rtl'),
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
                     enableToggle: true,
                     toggleGroup: 'markersGroup',
                     split: true,
@@ -395,7 +398,7 @@ define([
                     id: 'id-toolbar-btn-numbering',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon ' + (!Common.UI.isRTL() ? 'btn-numbering' : 'btn-numbering-rtl'),
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
                     enableToggle: true,
                     toggleGroup: 'markersGroup',
                     split: true,
@@ -427,7 +430,7 @@ define([
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-align-left',
                     icls: 'btn-align-left',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.disableOnStart, _set.inAnnotation],
                     menu: new Common.UI.Menu({
                         items: [
                             {
@@ -480,7 +483,7 @@ define([
                 this.btnVerticalAlign = new Common.UI.Button({
                     id: 'id-toolbar-btn-valign',
                     cls: 'btn-toolbar',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.noObjectSelected, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.noObjectSelected, _set.disableOnStart, _set.inAnnotation],
                     iconCls: 'toolbar__icon btn-align-middle',
                     icls: 'btn-align-middle',
                     menu: new Common.UI.Menu({
@@ -527,7 +530,7 @@ define([
                     id: 'id-toolbar-btn-decoffset',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-decoffset',
-                    lock: [_set.decIndentLock, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.decIndentLock, _set.pageDeleted, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
                     dataHint: '1',
                     dataHintDirection: 'top'
                 });
@@ -549,7 +552,7 @@ define([
                     id: 'id-toolbar-btn-linespace',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-linespace',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.disableOnStart, _set.inAnnotation],
                     menu: new Common.UI.Menu({
                         style: 'min-width: 60px;',
                         items: [
@@ -573,7 +576,7 @@ define([
                     id: 'id-toolbar-btn-columns',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-columns-two',
-                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.noColumns, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.noColumns, _set.disableOnStart, _set.inAnnotation],
                     menu: new Common.UI.Menu({
                         cls: 'ppm-toolbar shifted-right',
                         items: [
@@ -645,7 +648,7 @@ define([
                     id: 'id-toolbar-btn-shape-align',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-shape-align-left',
-                    lock: [_set.shapeLock, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart],
+                    lock: [_set.shapeLock, _set.pageDeleted, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart],
                     menu: new Common.UI.Menu({
                         cls: 'shifted-right',
                         items: [
@@ -699,7 +702,7 @@ define([
                     id: 'id-toolbar-btn-shape-arrange',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-arrange-front',
-                    lock: [_set.lostConnect, _set.noDrawingObjects, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart],
                     menu: new Common.UI.Menu({
                         items: [
                             this.mnuArrangeFront = new Common.UI.MenuItem({
@@ -747,7 +750,7 @@ define([
                     id: 'id-toolbar-btn-merge-shapes',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-combine-shapes',
-                    lock: [_set.shapeLock, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart, _set.cantMergeShape],
+                    lock: [_set.shapeLock, _set.pageDeleted, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart, _set.cantMergeShape],
                     menu: new Common.UI.Menu({
                         cls: 'shifted-right',
                         items: [
@@ -790,7 +793,7 @@ define([
                     id: 'id-toolbar-btn-delpage',
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-rem-comment',
-                    lock: [_set.lostConnect, _set.disableOnStart, _set.singlePage],
+                    lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart, _set.singlePage],
                     caption: this.capBtnDelPage,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
@@ -804,7 +807,7 @@ define([
                     caption: this.capBtnRotatePage,
                     split: true,
                     iconCls: 'toolbar__icon btn-update',
-                    lock: [_set.lostConnect, _set.disableOnStart],
+                    lock: [_set.pageDeleted, _set.pageRotate, _set.lostConnect, _set.disableOnStart],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small',
@@ -856,7 +859,7 @@ define([
                         id: 'tlbtn-addcomment',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-big-add-comment',
-                        lock: [_set.disableOnStart],
+                        lock: [_set.pageDeleted, _set.disableOnStart],
                         caption: this.capBtnComment,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -868,7 +871,7 @@ define([
                         id: 'tlbtn-textcomment',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-big-text-comment',
-                        lock: [_set.disableOnStart],
+                        lock: [_set.pageDeleted, _set.disableOnStart],
                         caption: this.capBtnTextComment,
                         menu: true,
                         split: true,
@@ -895,7 +898,7 @@ define([
                         caption: this.capBtnStamp,
                         split: true,
                         iconCls: 'toolbar__icon btn-stamp',
-                        lock: [_set.disableOnStart],
+                        lock: [_set.pageDeleted, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small',
@@ -909,7 +912,7 @@ define([
                         id: 'id-toolbar-btn-strikeout',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-strikeout',
-                        lock: [_set.lostConnect, _set.disableOnStart],
+                        lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         allowDepress: true,
                         split: true,
@@ -938,12 +941,13 @@ define([
                         type: AscPDF.ANNOTATIONS_TYPES.Strikeout
                     });
                     this.btnsStrikeout = [this.btnStrikeout];
+                    this.toolbarControls.push(this.btnStrikeout);
 
                     this.btnUnderline = new Common.UI.ButtonColored({
                         id: 'id-toolbar-btn-underline',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-underline',
-                        lock: [_set.lostConnect, _set.disableOnStart],
+                        lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         allowDepress: true,
                         split: true,
@@ -972,12 +976,13 @@ define([
                         type: AscPDF.ANNOTATIONS_TYPES.Underline
                     });
                     this.btnsUnderline = [this.btnUnderline];
+                    this.toolbarControls.push(this.btnUnderline);
 
                     this.btnHighlight = new Common.UI.ButtonColored({
                         id: 'id-toolbar-btn-highlight',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-highlight',
-                        lock: [_set.lostConnect, _set.disableOnStart],
+                        lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         allowDepress: true,
                         split: true,
@@ -1008,6 +1013,7 @@ define([
                         dataHintOffset: '0, -16'
                     });
                     this.btnsHighlight = [this.btnHighlight];
+                    this.toolbarControls.push(this.btnHighlight);
 
                     if (config.isPDFAnnotate && config.canPDFEdit || config.isPDFEdit) {
                         this.btnEditMode = new Common.UI.Button({
@@ -1154,7 +1160,7 @@ define([
                         id: 'id-toolbar-btn-paste',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-paste',
-                        lock: [_set.paragraphLock, _set.lostConnect, _set.disableOnStart],
+                        lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top',
                         dataHintTitle: 'V'
@@ -1165,7 +1171,7 @@ define([
                         id: 'id-toolbar-btn-cut',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-cut',
-                        lock: [_set.cutLock, _set.paragraphLock, _set.shapeLock, _set.lostConnect, _set.disableOnStart],
+                        lock: [_set.cutLock, _set.paragraphLock, _set.pageDeleted, _set.shapeLock, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top',
                         dataHintTitle: 'X'

From a740d5da859c7e6a0df1672d3da8a3b168a6a191 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 23 Jan 2025 12:54:51 +0300
Subject: [PATCH 2/5] Fix lock

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

diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js
index 51f864d011..0b9208d532 100644
--- a/apps/pdfeditor/main/app/view/Toolbar.js
+++ b/apps/pdfeditor/main/app/view/Toolbar.js
@@ -541,7 +541,7 @@ define([
                     id: 'id-toolbar-btn-incoffset',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-incoffset',
-                    lock: [_set.incIndentLock, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.incIndentLock, _set.pageDeleted, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
                     dataHint: '1',
                     dataHintDirection: 'top'
                 });

From 7294cce3e7da057e4ce0a6eeadaaf856254704cc Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 28 Jan 2025 13:16:19 +0300
Subject: [PATCH 3/5] [PDF] Change lock for text/shape objects

---
 .../main/app/controller/DocumentHolderExt.js  |  8 +--
 .../main/app/view/DocumentHolderExt.js        |  6 +--
 apps/pdfeditor/main/app/view/InsTab.js        |  4 +-
 apps/pdfeditor/main/app/view/Toolbar.js       | 54 +++++++++----------
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/apps/pdfeditor/main/app/controller/DocumentHolderExt.js b/apps/pdfeditor/main/app/controller/DocumentHolderExt.js
index ab44df406e..a5a2132bed 100644
--- a/apps/pdfeditor/main/app/controller/DocumentHolderExt.js
+++ b/apps/pdfeditor/main/app/controller/DocumentHolderExt.js
@@ -372,7 +372,7 @@ define([], function () {
         };
 
         dh.onShowTextBar = function(bounds) {
-            if (this.mode && !(!this.mode.isPDFEdit && this.mode.isEdit) || this._state.pageDeleted) return;
+            if (this.mode && !(!this.mode.isPDFEdit && this.mode.isEdit)) return;
 
             if (_.isUndefined(this._XY)) {
                 this._XY = [
@@ -742,7 +742,7 @@ define([], function () {
         };
 
         dh.onShowAnnotBar = function(bounds, mouseOnTop) {
-            if (this.mode && !this.mode.isEdit || this._state.pageDeleted) return;
+            if (this.mode && !this.mode.isEdit) return;
 
             if (_.isUndefined(this._XY)) {
                 this._XY = [
@@ -834,7 +834,7 @@ define([], function () {
         };
 
         dh.onShowAnnotSelectBar = function(bounds, mouseOnTop) {
-            if (this.mode && !this.mode.isEdit || this._state.pageDeleted) return;
+            if (this.mode && !this.mode.isEdit) return;
 
             if (_.isUndefined(this._XY)) {
                 this._XY = [
@@ -956,7 +956,7 @@ define([], function () {
         };
 
         dh.onShowMathTrack = function(bounds) {
-            if (this.mode && !(this.mode.isPDFEdit && this.mode.isEdit) || this._state.pageDeleted) return;
+            if (this.mode && !(this.mode.isPDFEdit && this.mode.isEdit)) return;
 
             this.lastMathTrackBounds = bounds;
             if (!Common.Controllers.LaunchController.isScriptLoaded()) {
diff --git a/apps/pdfeditor/main/app/view/DocumentHolderExt.js b/apps/pdfeditor/main/app/view/DocumentHolderExt.js
index 7b50fd9e5b..5d79c4d3ba 100644
--- a/apps/pdfeditor/main/app/view/DocumentHolderExt.js
+++ b/apps/pdfeditor/main/app/view/DocumentHolderExt.js
@@ -354,7 +354,7 @@ define([], function () {
                         me.tableMenu.items[i].setVisible(!isEquation);
                     }
 
-                    var disabled = (value.pageProps!==undefined && value.pageProps.locked);
+                    var disabled = false;//(value.pageProps!==undefined && value.pageProps.locked);
 
                     var align = value.tableProps.value.get_CellsVAlign();
                     var cls = '';
@@ -776,7 +776,7 @@ define([], function () {
                         imgdisabled = (value.imgProps!==undefined && value.imgProps.locked),
                         shapedisabled = (value.shapeProps!==undefined && value.shapeProps.locked),
                         chartdisabled = (value.chartProps!==undefined && value.chartProps.locked),
-                        page_deleted = (value.pageProps!==undefined && value.pageProps.locked),
+                        page_deleted = false,//(value.pageProps!==undefined && value.pageProps.locked),
                         disabled = imgdisabled || shapedisabled || chartdisabled || page_deleted,
                         pluginGuid = (value.imgProps) ? value.imgProps.value.asc_getPluginGuid() : null,
                         inSmartartInternal = value.shapeProps && value.shapeProps.value.get_FromSmartArtInternal(),
@@ -1044,7 +1044,7 @@ define([], function () {
                 initMenu: function(value){
                     var isInShape = (value.shapeProps && !_.isNull(value.shapeProps.value));
                     var isInChart = (value.chartProps && !_.isNull(value.chartProps.value));
-                    var page_deleted = (value.pageProps!==undefined && value.pageProps.locked);
+                    var page_deleted = false;//(value.pageProps!==undefined && value.pageProps.locked);
 
                     var disabled = (value.paraProps!==undefined  && value.paraProps.locked) || page_deleted ||
                         (isInShape && value.shapeProps.locked);
diff --git a/apps/pdfeditor/main/app/view/InsTab.js b/apps/pdfeditor/main/app/view/InsTab.js
index a91f8df561..3645bdcac2 100644
--- a/apps/pdfeditor/main/app/view/InsTab.js
+++ b/apps/pdfeditor/main/app/view/InsTab.js
@@ -195,7 +195,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-symbol',
                     caption: me.capBtnInsSymbol,
-                    lock: [_set.pageDeleted, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected],
                     menu: new Common.UI.Menu({
                         style: 'min-width: 100px;',
                         items: [
@@ -218,7 +218,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-big-inserthyperlink',
                     caption: me.capInsertHyperlink,
-                    lock: [_set.hyperlinkLock, _set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected],
+                    lock: [_set.hyperlinkLock, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js
index 0b9208d532..ea3b86e9c8 100644
--- a/apps/pdfeditor/main/app/view/Toolbar.js
+++ b/apps/pdfeditor/main/app/view/Toolbar.js
@@ -161,7 +161,7 @@ define([
                     menuCls: 'scrollable-menu',
                     menuStyle: 'min-width: 325px;',
                     hint: this.tipFontName,
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     store: new Common.Collections.Fonts(),
                     dataHint: '1',
                     dataHintDirection: 'top'
@@ -173,7 +173,7 @@ define([
                     cls: 'input-group-nr',
                     menuStyle: 'min-width: 55px;',
                     hint: this.tipFontSize,
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     data: [
                         {value: 8, displayValue: "8"},
                         {value: 9, displayValue: "9"},
@@ -203,7 +203,7 @@ define([
                     id: 'id-toolbar-btn-incfont',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-incfont',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     dataHint: '1',
                     dataHintDirection: 'top'
                 });
@@ -214,7 +214,7 @@ define([
                     id: 'id-toolbar-btn-decfont',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-decfont',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     dataHint: '1',
                     dataHintDirection: 'top'
                 });
@@ -225,7 +225,7 @@ define([
                     id: 'id-toolbar-btn-bold',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-bold',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     enableToggle: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom'
@@ -237,7 +237,7 @@ define([
                     id: 'id-toolbar-btn-italic',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-italic',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     enableToggle: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom'
@@ -249,7 +249,7 @@ define([
                     id: 'id-toolbar-btn-underline',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-underline',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     enableToggle: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom'
@@ -261,7 +261,7 @@ define([
                     id: 'id-toolbar-btn-strikeout',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-strikeout',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     enableToggle: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom'
@@ -273,7 +273,7 @@ define([
                     id: 'id-toolbar-btn-superscript',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-superscript',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inEquation],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inEquation],
                     enableToggle: true,
                     toggleGroup: 'superscriptGroup',
                     dataHint: '1',
@@ -286,7 +286,7 @@ define([
                     id: 'id-toolbar-btn-subscript',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-subscript',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inEquation],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inEquation],
                     enableToggle: true,
                     toggleGroup: 'superscriptGroup',
                     dataHint: '1',
@@ -302,7 +302,7 @@ define([
                     enableToggle: true,
                     allowDepress: true,
                     split: true,
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart, _set.inAnnotation],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: '0, -16',
@@ -326,7 +326,7 @@ define([
                     id: 'id-toolbar-btn-fontcolor',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-fontcolor',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     split: true,
                     menu: true,
                     colors: colorsconfig.colors,
@@ -349,7 +349,7 @@ define([
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-change-case',
                     action: 'change-case',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart],
                     menu: new Common.UI.Menu({
                         items: [
                             {caption: this.mniSentenceCase, value: Asc.c_oAscChangeTextCaseType.SentenceCase},
@@ -371,7 +371,7 @@ define([
                     id: 'id-toolbar-btn-clearstyle',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-clearstyle',
-                    lock: [ _set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noTextSelected, _set.disableOnStart],
+                    lock: [ _set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.disableOnStart],
                     dataHint: '1',
                     dataHintDirection: 'bottom'
                 });
@@ -382,7 +382,7 @@ define([
                     id: 'id-toolbar-btn-markers',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon ' + (!Common.UI.isRTL() ? 'btn-setmarkers' : 'btn-setmarkers-rtl'),
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
                     enableToggle: true,
                     toggleGroup: 'markersGroup',
                     split: true,
@@ -398,7 +398,7 @@ define([
                     id: 'id-toolbar-btn-numbering',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon ' + (!Common.UI.isRTL() ? 'btn-numbering' : 'btn-numbering-rtl'),
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
                     enableToggle: true,
                     toggleGroup: 'markersGroup',
                     split: true,
@@ -430,7 +430,7 @@ define([
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-align-left',
                     icls: 'btn-align-left',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.disableOnStart, _set.inAnnotation],
                     menu: new Common.UI.Menu({
                         items: [
                             {
@@ -483,7 +483,7 @@ define([
                 this.btnVerticalAlign = new Common.UI.Button({
                     id: 'id-toolbar-btn-valign',
                     cls: 'btn-toolbar',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.noObjectSelected, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.noObjectSelected, _set.disableOnStart, _set.inAnnotation],
                     iconCls: 'toolbar__icon btn-align-middle',
                     icls: 'btn-align-middle',
                     menu: new Common.UI.Menu({
@@ -530,7 +530,7 @@ define([
                     id: 'id-toolbar-btn-decoffset',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-decoffset',
-                    lock: [_set.decIndentLock, _set.pageDeleted, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.decIndentLock, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
                     dataHint: '1',
                     dataHintDirection: 'top'
                 });
@@ -541,7 +541,7 @@ define([
                     id: 'id-toolbar-btn-incoffset',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-incoffset',
-                    lock: [_set.incIndentLock, _set.pageDeleted, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.incIndentLock, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.inSmartart, _set.inSmartartInternal, _set.disableOnStart, _set.inAnnotation],
                     dataHint: '1',
                     dataHintDirection: 'top'
                 });
@@ -552,7 +552,7 @@ define([
                     id: 'id-toolbar-btn-linespace',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-linespace',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.disableOnStart, _set.inAnnotation],
                     menu: new Common.UI.Menu({
                         style: 'min-width: 60px;',
                         items: [
@@ -576,7 +576,7 @@ define([
                     id: 'id-toolbar-btn-columns',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-columns-two',
-                    lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.noParagraphSelected, _set.noColumns, _set.disableOnStart, _set.inAnnotation],
+                    lock: [_set.paragraphLock, _set.lostConnect, _set.noParagraphSelected, _set.noColumns, _set.disableOnStart, _set.inAnnotation],
                     menu: new Common.UI.Menu({
                         cls: 'ppm-toolbar shifted-right',
                         items: [
@@ -648,7 +648,7 @@ define([
                     id: 'id-toolbar-btn-shape-align',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-shape-align-left',
-                    lock: [_set.shapeLock, _set.pageDeleted, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart],
+                    lock: [_set.shapeLock, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart],
                     menu: new Common.UI.Menu({
                         cls: 'shifted-right',
                         items: [
@@ -702,7 +702,7 @@ define([
                     id: 'id-toolbar-btn-shape-arrange',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-arrange-front',
-                    lock: [_set.pageDeleted, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart],
+                    lock: [_set.shapeLock, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart],
                     menu: new Common.UI.Menu({
                         items: [
                             this.mnuArrangeFront = new Common.UI.MenuItem({
@@ -750,7 +750,7 @@ define([
                     id: 'id-toolbar-btn-merge-shapes',
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-combine-shapes',
-                    lock: [_set.shapeLock, _set.pageDeleted, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart, _set.cantMergeShape],
+                    lock: [_set.shapeLock, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart, _set.cantMergeShape],
                     menu: new Common.UI.Menu({
                         cls: 'shifted-right',
                         items: [
@@ -1160,7 +1160,7 @@ define([
                         id: 'id-toolbar-btn-paste',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-paste',
-                        lock: [_set.paragraphLock, _set.pageDeleted, _set.lostConnect, _set.disableOnStart],
+                        lock: [_set.paragraphLock, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top',
                         dataHintTitle: 'V'
@@ -1171,7 +1171,7 @@ define([
                         id: 'id-toolbar-btn-cut',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-cut',
-                        lock: [_set.cutLock, _set.paragraphLock, _set.pageDeleted, _set.shapeLock, _set.lostConnect, _set.disableOnStart],
+                        lock: [_set.cutLock, _set.paragraphLock, _set.shapeLock, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top',
                         dataHintTitle: 'X'

From 5d72155d24b96029b59c11ba07306a3415d56a90 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 28 Jan 2025 16:11:55 +0300
Subject: [PATCH 4/5] Fix lock on deleted page

---
 .../main/app/controller/DocumentHolder.js     |  3 --
 .../main/app/controller/RightMenu.js          | 12 ------
 .../main/app/view/DocumentHolderExt.js        | 43 +++++++++----------
 apps/pdfeditor/main/app/view/Toolbar.js       |  6 +--
 4 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/apps/pdfeditor/main/app/controller/DocumentHolder.js b/apps/pdfeditor/main/app/controller/DocumentHolder.js
index 62ce0d4fdf..0314911470 100644
--- a/apps/pdfeditor/main/app/controller/DocumentHolder.js
+++ b/apps/pdfeditor/main/app/controller/DocumentHolder.js
@@ -292,15 +292,12 @@ define([
                     } else if (type === Asc.c_oAscTypeSelectElement.Paragraph) {
                         var value = selectedElements[i].get_ObjectValue();
                         value && (locked = locked || value.get_Locked());
-                    } else if (type === Asc.c_oAscTypeSelectElement.PdfPage) {
-                        this._state.pageDeleted = selectedElements[i].get_ObjectValue().asc_getDeleteLock();
                     }
                 }
                 if (in_equation) {
                     this._state.equationLocked = locked;
                     this.disableEquationBar();
                 }
-                this._state.pageDeleted && this.clearSelection();
             }
         },
 
diff --git a/apps/pdfeditor/main/app/controller/RightMenu.js b/apps/pdfeditor/main/app/controller/RightMenu.js
index 6258b1f3ed..1338e3ee57 100644
--- a/apps/pdfeditor/main/app/controller/RightMenu.js
+++ b/apps/pdfeditor/main/app/controller/RightMenu.js
@@ -145,16 +145,11 @@ define([
             }
             // this._settings[Common.Utils.documentSettingsType.Signature].locked = false;
 
-            var page_deleted = false;
             for (i=0; i<SelectedObjects.length; i++)
             {
                 var eltype = SelectedObjects[i].get_ObjectType(),
                     settingsType = this.getDocumentSettingsType(eltype);
 
-                if (eltype === Asc.c_oAscTypeSelectElement.PdfPage) {
-                    page_deleted = SelectedObjects[i].get_ObjectValue().asc_getDeleteLock();
-                }
-
                 if (settingsType===undefined || settingsType>=this._settings.length || this._settings[settingsType]===undefined)
                     continue;
 
@@ -173,13 +168,6 @@ define([
                 }
             }
 
-            if ( page_deleted ) { // all elements are locked if the page is locked
-                for (i=0; i<this._settings.length; i++)  {
-                    if (this._settings[i])
-                        this._settings[i].locked = true;
-                }
-            }
-
             var lastactive = -1, currentactive, priorityactive = -1,
                 activePane = this.rightmenu.GetActivePane();
             for (i=0; i<this._settings.length; i++) {
diff --git a/apps/pdfeditor/main/app/view/DocumentHolderExt.js b/apps/pdfeditor/main/app/view/DocumentHolderExt.js
index 5d79c4d3ba..bb3117eaa5 100644
--- a/apps/pdfeditor/main/app/view/DocumentHolderExt.js
+++ b/apps/pdfeditor/main/app/view/DocumentHolderExt.js
@@ -62,8 +62,10 @@ define([], function () {
                 initMenu: function (value) {
                     var disabled = (value.pageProps!==undefined && value.pageProps.locked);
                     me.menuPDFViewCopy.setDisabled(!(me.api && me.api.can_CopyCut()));
-                    me.menuAddComment.setVisible(me.mode && me.mode.canComments || disabled);
-                    me.menuRemoveComment.setVisible(value && value.annotProps && value.annotProps.value || disabled);
+                    me.menuAddComment.setVisible(me.mode && me.mode.canComments);
+                    me.menuAddComment.setDisabled(disabled);
+                    me.menuRemoveComment.setVisible(value && value.annotProps && value.annotProps.value);
+                    me.menuRemoveComment.setDisabled(disabled);
                 },
                 items: [
                     me.menuPDFViewCopy,
@@ -110,8 +112,10 @@ define([], function () {
                 initMenu: function (value) {
                     var disabled = (value.pageProps!==undefined && value.pageProps.locked);
                     me.menuPDFEditCopy.setDisabled(!(me.api && me.api.can_CopyCut()));
-                    me.menuEditAddComment.setVisible(me.mode && me.mode.canComments || disabled);
-                    me.menuEditRemoveComment.setVisible(value && value.annotProps && value.annotProps.value || disabled);
+                    me.menuEditAddComment.setVisible(me.mode && me.mode.canComments);
+                    me.menuEditAddComment.setDisabled(disabled);
+                    me.menuEditRemoveComment.setVisible(value && value.annotProps && value.annotProps.value);
+                    me.menuEditRemoveComment.setDisabled(disabled);
                 },
                 items: [
                     me.menuPDFEditCopy,
@@ -354,8 +358,6 @@ define([], function () {
                         me.tableMenu.items[i].setVisible(!isEquation);
                     }
 
-                    var disabled = false;//(value.pageProps!==undefined && value.pageProps.locked);
-
                     var align = value.tableProps.value.get_CellsVAlign();
                     var cls = '';
                     switch (align) {
@@ -375,28 +377,28 @@ define([], function () {
                     me.menuTableCellBottom.setChecked(align == Asc.c_oAscVertAlignJc.Bottom);
 
                     if (me.api) {
-                        me.mnuTableMerge.setDisabled(value.tableProps.locked || disabled || !me.api.CheckBeforeMergeCells());
-                        me.mnuTableSplit.setDisabled(value.tableProps.locked || disabled || !me.api.CheckBeforeSplitCells());
+                        me.mnuTableMerge.setDisabled(value.tableProps.locked || !me.api.CheckBeforeMergeCells());
+                        me.mnuTableSplit.setDisabled(value.tableProps.locked || !me.api.CheckBeforeSplitCells());
                     }
-                    me.menuTableDistRows.setDisabled(value.tableProps.locked || disabled);
-                    me.menuTableDistCols.setDisabled(value.tableProps.locked || disabled);
+                    me.menuTableDistRows.setDisabled(value.tableProps.locked);
+                    me.menuTableDistCols.setDisabled(value.tableProps.locked);
 
-                    me.tableMenu.items[5].setDisabled(value.tableProps.locked || disabled);
-                    me.tableMenu.items[6].setDisabled(value.tableProps.locked || disabled);
+                    me.tableMenu.items[5].setDisabled(value.tableProps.locked);
+                    me.tableMenu.items[6].setDisabled(value.tableProps.locked);
 
-                    me.menuTableCellAlign.setDisabled(value.tableProps.locked || disabled);
+                    me.menuTableCellAlign.setDisabled(value.tableProps.locked);
 
                     me.menuTableSaveAsPicture.setVisible(!isEquation);
                     menuTableSaveAsPictureSeparator.setVisible(!isEquation);
 
                     me.menuTableAdvanced.setVisible(!isEquation);
-                    me.menuTableAdvanced.setDisabled(value.tableProps.locked || disabled);
+                    me.menuTableAdvanced.setDisabled(value.tableProps.locked);
                     menuTableSettingsSeparator.setVisible(me.menuTableAdvanced.isVisible());
 
                     var cancopy = me.api && me.api.can_CopyCut();
                     me.menuTableCopy.setDisabled(!cancopy);
-                    me.menuTableCut.setDisabled(value.tableProps.locked || disabled || !cancopy);
-                    me.menuTablePaste.setDisabled(value.tableProps.locked || disabled);
+                    me.menuTableCut.setDisabled(value.tableProps.locked || !cancopy);
+                    me.menuTablePaste.setDisabled(value.tableProps.locked);
 
                     // hyperlink properties
                     var text = null;
@@ -776,8 +778,7 @@ define([], function () {
                         imgdisabled = (value.imgProps!==undefined && value.imgProps.locked),
                         shapedisabled = (value.shapeProps!==undefined && value.shapeProps.locked),
                         chartdisabled = (value.chartProps!==undefined && value.chartProps.locked),
-                        page_deleted = false,//(value.pageProps!==undefined && value.pageProps.locked),
-                        disabled = imgdisabled || shapedisabled || chartdisabled || page_deleted,
+                        disabled = imgdisabled || shapedisabled || chartdisabled,
                         pluginGuid = (value.imgProps) ? value.imgProps.value.asc_getPluginGuid() : null,
                         inSmartartInternal = value.shapeProps && value.shapeProps.value.get_FromSmartArtInternal(),
                         lastSeparator = menuImgSaveAsPictureSeparator;
@@ -832,7 +833,6 @@ define([], function () {
                     /** coauthoring begin **/
                     me.menuAddCommentImg.setVisible(me.mode && me.mode.canComments);
                     !me.menuAddCommentImg.isVisible() && lastSeparator.setVisible(false);
-                    me.menuAddCommentImg.setDisabled(page_deleted);
                     /** coauthoring end **/
                     me.menuImgShapeAlign.setDisabled(disabled);
                     if (!disabled) {
@@ -1044,9 +1044,7 @@ define([], function () {
                 initMenu: function(value){
                     var isInShape = (value.shapeProps && !_.isNull(value.shapeProps.value));
                     var isInChart = (value.chartProps && !_.isNull(value.chartProps.value));
-                    var page_deleted = false;//(value.pageProps!==undefined && value.pageProps.locked);
-
-                    var disabled = (value.paraProps!==undefined  && value.paraProps.locked) || page_deleted ||
+                    var disabled = (value.paraProps!==undefined  && value.paraProps.locked) ||
                         (isInShape && value.shapeProps.locked);
                     var isEquation= (value.mathProps && value.mathProps.value);
                     me._currentParaObjDisabled = disabled;
@@ -1115,7 +1113,6 @@ define([], function () {
 
                     /** coauthoring begin **/
                     me.menuAddCommentPara.setVisible(me.mode && me.mode.canComments);
-                    me.menuAddCommentPara.setDisabled(page_deleted);
                     /** coauthoring end **/
 
                     menuCommentParaSeparator.setVisible(/** coauthoring begin **/ me.menuAddCommentPara.isVisible() || /** coauthoring end **/ me.menuAddHyperlinkPara.isVisible() || menuHyperlinkPara.isVisible());
diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js
index ea3b86e9c8..085246b11b 100644
--- a/apps/pdfeditor/main/app/view/Toolbar.js
+++ b/apps/pdfeditor/main/app/view/Toolbar.js
@@ -912,7 +912,7 @@ define([
                         id: 'id-toolbar-btn-strikeout',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-strikeout',
-                        lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
+                        lock: [_set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         allowDepress: true,
                         split: true,
@@ -947,7 +947,7 @@ define([
                         id: 'id-toolbar-btn-underline',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-underline',
-                        lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
+                        lock: [_set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         allowDepress: true,
                         split: true,
@@ -982,7 +982,7 @@ define([
                         id: 'id-toolbar-btn-highlight',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-highlight',
-                        lock: [_set.pageDeleted, _set.lostConnect, _set.disableOnStart],
+                        lock: [_set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         allowDepress: true,
                         split: true,

From 3d4dafc3c97046512d9683697759f346f7a902eb Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 28 Jan 2025 16:27:10 +0300
Subject: [PATCH 5/5] Refactoring

---
 apps/pdfeditor/main/app/controller/DocumentHolder.js | 2 +-
 apps/pdfeditor/main/app/controller/RightMenu.js      | 1 -
 apps/pdfeditor/main/app/view/DocumentHolderExt.js    | 7 +++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/pdfeditor/main/app/controller/DocumentHolder.js b/apps/pdfeditor/main/app/controller/DocumentHolder.js
index 0314911470..eb6ae98035 100644
--- a/apps/pdfeditor/main/app/controller/DocumentHolder.js
+++ b/apps/pdfeditor/main/app/controller/DocumentHolder.js
@@ -281,7 +281,7 @@ define([
                     }
                 }
             }
-            if (this.mode && this.mode.isEdit && (this.mode.isPDFEdit || this.mode.isPDFAnnotate)) {
+            if (this.mode && this.mode.isEdit && this.mode.isPDFEdit) {
                 var i = -1,
                     in_equation = false,
                     locked = false;
diff --git a/apps/pdfeditor/main/app/controller/RightMenu.js b/apps/pdfeditor/main/app/controller/RightMenu.js
index 1338e3ee57..c0b091a712 100644
--- a/apps/pdfeditor/main/app/controller/RightMenu.js
+++ b/apps/pdfeditor/main/app/controller/RightMenu.js
@@ -149,7 +149,6 @@ define([
             {
                 var eltype = SelectedObjects[i].get_ObjectType(),
                     settingsType = this.getDocumentSettingsType(eltype);
-
                 if (settingsType===undefined || settingsType>=this._settings.length || this._settings[settingsType]===undefined)
                     continue;
 
diff --git a/apps/pdfeditor/main/app/view/DocumentHolderExt.js b/apps/pdfeditor/main/app/view/DocumentHolderExt.js
index bb3117eaa5..90a25b4f03 100644
--- a/apps/pdfeditor/main/app/view/DocumentHolderExt.js
+++ b/apps/pdfeditor/main/app/view/DocumentHolderExt.js
@@ -418,13 +418,12 @@ define([], function () {
                         me.menuAddHyperlinkTable.hyperProps.value.put_Text(text);
                     }
                     if (!_.isUndefined(value.paraProps)) {
-                        me.menuAddHyperlinkTable.setDisabled(value.paraProps.locked || disabled);
-                        menuHyperlinkTable.setDisabled(value.paraProps.locked || disabled);
-                        me._currentParaObjDisabled = value.paraProps.locked || disabled;
+                        me.menuAddHyperlinkTable.setDisabled(value.paraProps.locked);
+                        menuHyperlinkTable.setDisabled(value.paraProps.locked);
+                        me._currentParaObjDisabled = value.paraProps.locked;
                     }
 
                     me.menuAddCommentTable.setVisible(me.mode && me.mode.canComments);
-                    me.menuAddCommentTable.setDisabled(disabled);
 
                     //equation menu
                     var eqlen = 0;