From a4ad9ab16243b80929b72644e667c168b24c3d12 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 5 Apr 2016 15:30:21 +0300
Subject: [PATCH] =?UTF-8?q?[SSE]=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BC=D0=BF=D0=BB=D0=B5=D0=B9=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/app/view/DocumentHolder.js           |  2 +-
 .../main/app/view/TableSettings.js            | 94 ++++++++++---------
 2 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js
index 1860199a4..6553ad2b0 100644
--- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js
@@ -157,7 +157,7 @@ define([
                     items: [
                         { caption: this.deleteRowText,      value: c_oAscDeleteOptions.DeleteRows},
                         { caption: this.deleteColumnText,   value: c_oAscDeleteOptions.DeleteColumns},
-                        { caption: this.deleteTableText,    value: c_oAscDeleteOptions.DeleteColumns}
+                        { caption: this.deleteTableText,    value: c_oAscDeleteOptions.DeleteTable}
                     ]
                 })
             });
diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js
index 7691b03ad..78d9b9d22 100644
--- a/apps/spreadsheeteditor/main/app/view/TableSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js
@@ -279,6 +279,58 @@ define([
 
                 this._state.Range = props.asc_getTableRange();
 
+                var needTablePictures = false;
+                value = props.asc_getFirstRow();
+                if (this._state.CheckHeader!==value) {
+                    this.chHeader.setValue(value, true);
+                    this._state.CheckHeader=value;
+                    needTablePictures = true;
+                }
+
+                value = props.asc_getLastRow();
+                if (this._state.CheckTotal!==value) {
+                    this.chTotal.setValue(value, true);
+                    this._state.CheckTotal=value;
+                    needTablePictures = true;
+                }
+
+                value = props.asc_getBandHor();
+                if (this._state.CheckBanded!==value) {
+                    this.chBanded.setValue(value, true);
+                    this._state.CheckBanded=value;
+                    needTablePictures = true;
+                }
+
+                value = props.asc_getFirstCol();
+                if (this._state.CheckFirst!==value) {
+                    this.chFirst.setValue(value, true);
+                    this._state.CheckFirst=value;
+                    needTablePictures = true;
+                }
+
+                value = props.asc_getLastCol();
+                if (this._state.CheckLast!==value) {
+                    this.chLast.setValue(value, true);
+                    this._state.CheckLast=value;
+                    needTablePictures = true;
+                }
+
+                value = props.asc_getBandVer();
+                if (this._state.CheckColBanded!==value) {
+                    this.chColBanded.setValue(value, true);
+                    this._state.CheckColBanded=value;
+                    needTablePictures = true;
+                }
+
+                value = props.asc_getFilterButton();
+                if (this._state.CheckFilter!==value) {
+                    this.chFilter.setValue(value, true);
+                    this._state.CheckFilter=value;
+                }
+
+                if (needTablePictures)
+                    this.onApiInitTableTemplates(this.api.asc_getTablePictures(props));
+
                 //for table-template
                 value = props.asc_getTableStyleName();
                 if (this._state.TemplateName!==value || this._isTemplatesChanged) {
@@ -298,48 +350,6 @@ define([
                     this._state.TemplateName=value;
                 }
                 this._isTemplatesChanged = false;
-
-                value = props.asc_getFirstRow();
-                if (this._state.CheckHeader!==value) {
-                    this.chHeader.setValue(value, true);
-                    this._state.CheckHeader=value;
-                }
-
-                value = props.asc_getLastRow();
-                if (this._state.CheckTotal!==value) {
-                    this.chTotal.setValue(value, true);
-                    this._state.CheckTotal=value;
-                }
-
-                value = props.asc_getBandHor();
-                if (this._state.CheckBanded!==value) {
-                    this.chBanded.setValue(value, true);
-                    this._state.CheckBanded=value;
-                }
-
-                value = props.asc_getFirstCol();
-                if (this._state.CheckFirst!==value) {
-                    this.chFirst.setValue(value, true);
-                    this._state.CheckFirst=value;
-                }
-
-                value = props.asc_getLastCol();
-                if (this._state.CheckLast!==value) {
-                    this.chLast.setValue(value, true);
-                    this._state.CheckLast=value;
-                }
-
-                value = props.asc_getBandVer();
-                if (this._state.CheckColBanded!==value) {
-                    this.chColBanded.setValue(value, true);
-                    this._state.CheckColBanded=value;
-                }
-
-                value = props.asc_getFilterButton();
-                if (this._state.CheckFilter!==value) {
-                    this.chFilter.setValue(value, true);
-                    this._state.CheckFilter=value;
-                }
             }
         },