From e22ce14d9cdfb34218ba1f3cfda1d08521670ffb Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 24 Mar 2017 17:05:18 +0300
Subject: [PATCH] [SSE] For bug 33985.

---
 apps/spreadsheeteditor/main/app/controller/Toolbar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 6a856cb96..a7082b3ec 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -608,7 +608,7 @@ define([
 
             if (me.api) {
                 var merged = me.api.asc_getCellInfo().asc_getFlags().asc_getMerge();
-                if (!merged && me.api.asc_mergeCellsDataLost(item.value)) {
+                if ((merged !== Asc.c_oAscMergeOptions.Merged) && me.api.asc_mergeCellsDataLost(item.value)) {
                     Common.UI.warning({
                         msg: me.warnMergeLostData,
                         buttons: ['yes', 'no'],
@@ -1940,7 +1940,7 @@ define([
 
                     val = info.asc_getFlags().asc_getMerge();
                     if (this._state.merge !== val) {
-                        toolbar.btnMerge.toggle(val===true, true);
+                        toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merged, true);
                         this._state.merge = val;
                     }