Commit 254a417c authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Перенесено создание точкив истории при вставке

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57017 954022d7-b5bf-4e40-9824-e11837661b57
parent e5e173f9
...@@ -452,4 +452,8 @@ CShape.prototype.Get_Worksheet = function() ...@@ -452,4 +452,8 @@ CShape.prototype.Get_Worksheet = function()
CTextBody.prototype.Get_Worksheet = function() CTextBody.prototype.Get_Worksheet = function()
{ {
return this.parent && this.parent.Get_Worksheet && this.parent.Get_Worksheet(); return this.parent && this.parent.Get_Worksheet && this.parent.Get_Worksheet();
};
CTextBody.prototype.getDrawingDocument = function()
{
return this.parent && this.parent.getDrawingDocument && this.parent.getDrawingDocument();
}; };
\ No newline at end of file
...@@ -1721,16 +1721,18 @@ ...@@ -1721,16 +1721,18 @@
oPasteProcessor.aContent = []; oPasteProcessor.aContent = [];
newFonts = this._convertFonts(oPasteProcessor.oFonts); newFonts = this._convertFonts(oPasteProcessor.oFonts);
History.Create_NewPoint();
oPasteProcessor._Execute(node, {}, true, true, false); oPasteProcessor._Execute(node, {}, true, true, false);
targetDocContent.Remove(1, true, true);
if(!oPasteProcessor.aContent || !oPasteProcessor.aContent.length) if(!oPasteProcessor.aContent || !oPasteProcessor.aContent.length)
return false; return false;
var targetContent = worksheet.objectRender.controller.getTargetDocContent(true);//нужно для заголовков диаграмм
targetContent.Remove(1, true, true);
worksheet._loadFonts(newFonts, function () { worksheet._loadFonts(newFonts, function () {
oPasteProcessor.InsertInPlace(targetDocContent , oPasteProcessor.aContent); oPasteProcessor.InsertInPlace(targetContent , oPasteProcessor.aContent);
worksheet.objectRender.controller.startRecalculate(); worksheet.objectRender.controller.startRecalculate();
...@@ -1768,8 +1770,7 @@ ...@@ -1768,8 +1770,7 @@
var isIntoShape = worksheet.objectRender.controller.getTargetDocContent(); var isIntoShape = worksheet.objectRender.controller.getTargetDocContent();
if(isIntoShape) if(isIntoShape)
{ {
History.Create_NewPoint();
isIntoShape = worksheet.objectRender.controller.getTargetDocContent(true);//нужно для заголовков диаграмм
var resultPasteInShape = this._pasteInShape(worksheet, node, onlyFromLocalStorage, isIntoShape); var resultPasteInShape = this._pasteInShape(worksheet, node, onlyFromLocalStorage, isIntoShape);
if(resultPasteInShape == true) if(resultPasteInShape == true)
return; return;
......
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