Commit cfea6ca4 authored by GoshaZotov's avatar GoshaZotov

fix bug 34345

parent 90e94956
...@@ -98,6 +98,8 @@ ...@@ -98,6 +98,8 @@
this.width = null; this.width = null;
this.transpose = null; this.transpose = null;
this.comment = true;
} }
СSpecialPasteProps.prototype = { СSpecialPasteProps.prototype = {
...@@ -127,6 +129,8 @@ ...@@ -127,6 +129,8 @@
this.width = null; this.width = null;
this.transpose = null; this.transpose = null;
this.comment = true;
}, },
revert: function() revert: function()
{ {
...@@ -151,6 +155,8 @@ ...@@ -151,6 +155,8 @@
this.width = null; this.width = null;
this.transpose = null; this.transpose = null;
this.comment = null;
}, },
asc_setProps: function(props) asc_setProps: function(props)
{ {
...@@ -1927,7 +1933,7 @@ ...@@ -1927,7 +1933,7 @@
newCDocument.bFromDocument = true; newCDocument.bFromDocument = true;
//TODo!!!!!! //TODo!!!!!!
newCDocument.Content[0].bFromDocument = true; newCDocument.Content[0].bFromDocument = true;
newCDocument.theme = t.Api.wbModel.theme; newCDocument.theme = window["Asc"]["editor"].wbModel.theme;
oTempDrawingDocument.m_oLogicDocument = newCDocument; oTempDrawingDocument.m_oLogicDocument = newCDocument;
var oOldEditor = undefined; var oOldEditor = undefined;
......
...@@ -9489,7 +9489,7 @@ ...@@ -9489,7 +9489,7 @@
if(specialPasteProps.format) if(specialPasteProps.format)
{ {
rangeUnMerge.unmerge(); rangeUnMerge.unmerge();
//this.cellCommentator.deleteCommentsRange(rangeUnMerge.bbox); this.cellCommentator.deleteCommentsRange(rangeUnMerge.bbox);
} }
if (!isOneMerge) { if (!isOneMerge) {
arn.r2 = rMax2 - 1; arn.r2 = rMax2 - 1;
...@@ -9614,7 +9614,7 @@ ...@@ -9614,7 +9614,7 @@
var firstRange = range.clone(); var firstRange = range.clone();
//****paste comments**** //****paste comments****
if (val.aComments && val.aComments.length) { if (specialPasteProps.comment && val.aComments && val.aComments.length) {
addComments(pasteRow, pasteCol, val.aComments); addComments(pasteRow, pasteCol, val.aComments);
} }
......
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