From 3165fa2da9636e4718dab808e9a0df488d9bcc9a Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 25 Sep 2018 16:19:33 +0300
Subject: [PATCH] [PE][SSE] Fix Bug 38948

---
 apps/presentationeditor/main/app/controller/Toolbar.js | 2 +-
 apps/presentationeditor/main/app/view/Toolbar.js       | 4 ++--
 apps/spreadsheeteditor/main/app/controller/Main.js     | 1 +
 apps/spreadsheeteditor/main/app/controller/Toolbar.js  | 6 ++++++
 apps/spreadsheeteditor/main/app/view/Toolbar.js        | 6 ++++--
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index 2d2e92eb4..28366bef8 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -607,7 +607,7 @@ define([
                 this._state.no_slides = (count<=0);
                 this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, {array: this.toolbar.paragraphControls});
                 this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, {array: [
-                    this.toolbar.btnChangeSlide, this.toolbar.btnPreview, this.toolbar.btnCopy, this.toolbar.btnPaste,
+                    this.toolbar.btnChangeSlide, this.toolbar.btnPreview, this.toolbar.btnPrint, this.toolbar.btnCopy, this.toolbar.btnPaste,
                     this.toolbar.btnCopyStyle, this.toolbar.btnInsertTable, this.toolbar.btnInsertChart,
                     this.toolbar.btnColorSchemas, this.toolbar.btnShapeAlign,
                     this.toolbar.btnShapeArrange, this.toolbar.btnSlideSize,  this.toolbar.listTheme
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index 49b7e3ebf..90149a29f 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -175,9 +175,9 @@ define([
                         id: 'id-toolbar-btn-print',
                         cls: 'btn-toolbar',
                         iconCls: 'btn-print no-mask',
-                        lock: [_set.slideDeleted, _set.noSlides, _set.cantPrint]
+                        lock: [_set.slideDeleted, _set.noSlides, _set.cantPrint, _set.disableOnStart]
                     });
-                    me.paragraphControls.push(me.btnPrint);
+                    me.slideOnlyControls.push(me.btnPrint);
 
                     me.btnSave = new Common.UI.Button({
                         id: 'id-toolbar-btn-save',
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index 3d5253428..ca996e5d9 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -730,6 +730,7 @@ define([
 
                                 me.fillTextArt(me.api.asc_getTextArtPreviews());
                                 me.updateThemeColors();
+                                toolbarController.activateControls();
                             }
 
                             rightmenuController.createDelayedElements();
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index baee0fb5a..cbacefdaf 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -121,6 +121,7 @@ define([
             this.editMode = true;
             this._isAddingShape = false;
             this._state = {
+                activated: false,
                 prstyle: undefined,
                 clrtext: undefined,
                 pralign: undefined,
@@ -2915,6 +2916,11 @@ define([
             this._state.namedrange_locked = (state == Asc.c_oAscDefinedNameReason.LockDefNameManager);
         },
 
+        activateControls: function() {
+            this.toolbar.lockToolbar(SSE.enumLock.disableOnStart, false, {array: [this.toolbar.btnPrint]});
+            this._state.activated = true;
+        },
+
         DisableToolbar: function(disable, viewMode) {
             if (viewMode!==undefined) this.editMode = !viewMode;
             disable = disable || !this.editMode;
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index 1b5040f10..d846c71c0 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -80,7 +80,8 @@ define([
         multiselect:    'is-multiselect',
         cantHyperlink:  'cant-hyperlink',
         commentLock:    'can-comment',
-        cantModifyFilter: 'cant-filter'
+        cantModifyFilter: 'cant-filter',
+        disableOnStart: 'on-start'
     };
 
     SSE.Views.Toolbar =  Common.UI.Mixtbar.extend(_.extend({
@@ -380,7 +381,7 @@ define([
                     id          : 'id-toolbar-btn-print',
                     cls         : 'btn-toolbar',
                     iconCls     : 'btn-print no-mask',
-                    lock        : [_set.editCell, _set.cantPrint]
+                    lock        : [_set.editCell, _set.cantPrint, _set.disableOnStart]
                 });
 
                 me.btnSave = new Common.UI.Button({
@@ -1258,6 +1259,7 @@ define([
                     if (cmp && _.isFunction(cmp.setDisabled))
                         cmp.setDisabled(true);
                 });
+                this.lockToolbar(SSE.enumLock.disableOnStart, true, {array: [me.btnPrint]});
 
                 this.on('render:after', _.bind(this.onToolbarAfterRender, this));
             }