From 13704362ad31e941f277ce4a8336acc66da4f766 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 13 Mar 2020 16:26:27 +0300
Subject: [PATCH] [SSE] Bug 44812

---
 apps/common/main/lib/component/ComboBox.js                   | 2 +-
 apps/common/main/lib/component/Tab.js                        | 4 ++--
 apps/spreadsheeteditor/main/app/controller/CellEditor.js     | 2 +-
 apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js
index 7a19180bb..78a7b0a22 100644
--- a/apps/common/main/lib/component/ComboBox.js
+++ b/apps/common/main/lib/component/ComboBox.js
@@ -644,7 +644,7 @@ define([
                 } else {
                     $(this.el).find('ul').html(_.template([
                         '<% _.each(items, function(item) { %>',
-                           '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
+                           '<li id="<%= item.id %>" data-value="<%- item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
                         '<% }); %>'
                     ].join(''))({
                         items: this.store.toJSON(),
diff --git a/apps/common/main/lib/component/Tab.js b/apps/common/main/lib/component/Tab.js
index 108672047..2ecf3a621 100644
--- a/apps/common/main/lib/component/Tab.js
+++ b/apps/common/main/lib/component/Tab.js
@@ -51,8 +51,8 @@ define([
         this.active     = false;
         this.label      = 'Tab';
         this.cls        = '';
-        this.template   = _.template(['<li class="<% if(active){ %>active selected<% } %> <% if(cls.length){%><%= cls %><%}%>" data-label="<%= label %>">',
-                                            '<a title="<%= label %>"><%- label %></a>',
+        this.template   = _.template(['<li class="<% if(active){ %>active selected<% } %> <% if(cls.length){%><%= cls %><%}%>" data-label="<%- label %>">',
+                                            '<a title="<%- label %>"><%- label %></a>',
                                         '</li>'].join(''));
 
         this.initialize.call(this, opts);
diff --git a/apps/spreadsheeteditor/main/app/controller/CellEditor.js b/apps/spreadsheeteditor/main/app/controller/CellEditor.js
index 4afe73ad0..836fa0bce 100644
--- a/apps/spreadsheeteditor/main/app/controller/CellEditor.js
+++ b/apps/spreadsheeteditor/main/app/controller/CellEditor.js
@@ -266,7 +266,7 @@ define([
                 (new SSE.Views.NameManagerDlg({
                     api: this.api,
                     handler: function(result) {
-                        Common.NotificationCenter.trigger('edit:complete', this.editor);
+                        Common.NotificationCenter.trigger('edit:complete', me.editor);
                     },
                     locked: this.namedrange_locked,
                     sheets: items,
diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index c8f244f0c..713e7ac69 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -1042,7 +1042,7 @@ define([
                             linkstr = props.asc_getHyperlinkUrl() + '<br><b>' + me.textCtrlClick + '</b>';
                         }
                     } else {
-                        linkstr = props.asc_getTooltip() || (props.asc_getLocation());
+                        linkstr = Common.Utils.String.htmlEncode(props.asc_getTooltip() || (props.asc_getLocation()));
                         linkstr += '<br><b>' + me.textCtrlClick + '</b>';
                     }