Commit f92dc469 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 35263

parent 29cb8e5a
...@@ -1152,7 +1152,6 @@ CCellCommentator.prototype.removeComment = function(id, bNoEvent, bNoAscLock, bN ...@@ -1152,7 +1152,6 @@ CCellCommentator.prototype.removeComment = function(id, bNoEvent, bNoAscLock, bN
// Extra functions // Extra functions
CCellCommentator.prototype.getComments = function (col, row) { CCellCommentator.prototype.getComments = function (col, row) {
// Array of root items // Array of root items
var comments = []; var comments = [];
var _col = col, _row = row, mergedRange = null; var _col = col, _row = row, mergedRange = null;
...@@ -1174,11 +1173,10 @@ CCellCommentator.prototype.removeComment = function(id, bNoEvent, bNoAscLock, bN ...@@ -1174,11 +1173,10 @@ CCellCommentator.prototype.removeComment = function(id, bNoEvent, bNoAscLock, bN
for (var i = 0; i < length; i++) { for (var i = 0; i < length; i++) {
var commentCell = aComments[i]; var commentCell = aComments[i];
if (!commentCell.asc_getDocumentFlag() && !commentCell.asc_getHiddenFlag() &&
if (!commentCell.asc_getDocumentFlag() /*&& !commentCell.asc_getSolved()*/ && (!commentCell.asc_getSolved() || this.showSolved()) && 0 === commentCell.nLevel) {
!commentCell.asc_getHiddenFlag() && (commentCell.nLevel == 0)) {
if (!mergedRange) { if (!mergedRange) {
if ((_col == commentCell.nCol) && (_row == commentCell.nRow)) { if (_col === commentCell.nCol && _row === commentCell.nRow) {
comments.push(commentCell); comments.push(commentCell);
} }
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment