From cf7532a12b1b9a54048964f9dd09bf7a6cf64f50 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 20 Jun 2017 13:11:31 +0300 Subject: [PATCH] [DE] Fix Bug 35084. --- apps/documenteditor/main/app/controller/Toolbar.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index ca2da17ad..9fac89442 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -712,6 +712,10 @@ define([ if (need_disable !== toolbar.btnNotes.isDisabled()) toolbar.btnNotes.setDisabled(need_disable); + need_disable = paragraph_locked || header_locked || in_image; + if (need_disable != toolbar.btnColumns.isDisabled()) + toolbar.btnColumns.setDisabled(need_disable); + if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled()) toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);