diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index c62edcc75..82cd8e62b 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -512,7 +512,7 @@ define([ while (++i < wc) { if (!this.api.asc_isWorksheetHidden(i)) { - items.push({displayValue: me.api.asc_getWorksheetName(i), value: me.api.asc_getWorksheetName(i)}); + items.push(me.api.asc_getWorksheetName(i)); } } @@ -536,6 +536,7 @@ define([ win.show(); win.setSettings({ sheets : items, + ranges : me.api.asc_getDefinedNames(Asc.c_oAscGetDefinedNamesList.All), currentSheet: me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()), props : props, text : cell.asc_getText(), diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index e49aed615..b70ded600 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -881,7 +881,7 @@ define([ while (++i < wc) { if (!this.api.asc_isWorksheetHidden(i)) { - items.push({displayValue: me.api.asc_getWorksheetName(i), value: me.api.asc_getWorksheetName(i)}); + items.push(me.api.asc_getWorksheetName(i)); } } @@ -905,6 +905,7 @@ define([ win.show(); win.setSettings({ sheets : items, + ranges : me.api.asc_getDefinedNames(Asc.c_oAscGetDefinedNamesList.All), currentSheet: me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()), props : props, text : cell.asc_getText(), diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js index 7e8b4b140..ff1ad9e0a 100644 --- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js @@ -46,7 +46,8 @@ define([ 'common/main/lib/util/utils', 'common/main/lib/component/ComboBox', 'common/main/lib/component/InputField', - 'common/main/lib/component/Window' + 'common/main/lib/component/Window', + 'common/main/lib/component/TreeView' ], function () { 'use strict'; SSE.Views.HyperlinkSettingsDialog = Common.UI.Window.extend(_.extend({ @@ -63,7 +64,7 @@ define([ }, options || {}); this.template = [ - '