From 497b5313cedf107a792508befc7a52a5841127aa Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Mon, 13 Mar 2017 12:10:12 +0300
Subject: [PATCH] [SSE] Bug 34159.

---
 .../main/app/controller/DocumentHolder.js            |  4 ++++
 .../spreadsheeteditor/main/app/controller/Toolbar.js | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index c589e4ce1..0aa9f9b4c 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -695,12 +695,15 @@ define([
                     (new SSE.Views.ChartSettingsDlg(
                         {
                             chartSettings: props,
+                            imageSettings: item.chartInfo,
                             isChart: true,
                             api: me.api,
                             handler: function(result, value) {
                                 if (result == 'ok') {
                                     if (me.api) {
                                         me.api.asc_editChartDrawingObject(value.chartSettings);
+                                        if (value.imageSettings)
+                                            me.api.asc_setGraphicObjectProps(value.imageSettings);
                                     }
                                 }
                                 Common.NotificationCenter.trigger('edit:complete', me);
@@ -1205,6 +1208,7 @@ define([
                                 isshapemenu = true;
                             }
                         } else if ( elValue.asc_getChartProperties() ) {
+                            documentHolder.mnuChartEdit.chartInfo = elValue;
                             ischartmenu = true;
                             has_chartprops = true;
                         } 
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 171a775b6..ccf5d99d4 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -750,18 +750,30 @@ define([
                 var win, props;
                 if (me.api){
                     props = me.api.asc_getChartObject();
+                    var selectedObjects = me.api.asc_getGraphicObjectProps(),
+                        imageSettings = null;
+                    for (var i = 0; i < selectedObjects.length; i++) {
+                        if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) {
+                            var elValue = selectedObjects[i].asc_getObjectValue();
+                            if ( elValue.asc_getChartProperties() )
+                                imageSettings = elValue;
+                        }
+                    }
                     if (props) {
                         var ischartedit = ( me.toolbar.mode.isEditDiagram || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChart || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChartText);
 
                         (new SSE.Views.ChartSettingsDlg(
                             {
                                 chartSettings: props,
+                                imageSettings: imageSettings,
                                 isChart: true,
                                 api: me.api,
                                 handler: function(result, value) {
                                     if (result == 'ok') {
                                         if (me.api) {
                                             (ischartedit) ? me.api.asc_editChartDrawingObject(value.chartSettings) : me.api.asc_addChartDrawingObject(value.chartSettings);
+                                            if (value.imageSettings)
+                                                me.api.asc_setGraphicObjectProps(value.imageSettings);
                                         }
                                     }
                                     Common.NotificationCenter.trigger('edit:complete', me.toolbar);