Commit 823f6baa authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

правка для Bug #31655 ([Copy&Paste] JS ошибка после вставки гиперссылки из CSE в CPE)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68397 954022d7-b5bf-4e40-9824-e11837661b57
parent 2b894947
...@@ -3864,7 +3864,10 @@ PasteProcessor.prototype = ...@@ -3864,7 +3864,10 @@ PasteProcessor.prototype =
} }
else if(base64FromExcel)//вставляем в презентации из таблиц else if(base64FromExcel)//вставляем в презентации из таблиц
{ {
History.TurnOff();
var excelContent = this._readFromBinaryExcel(base64FromExcel); var excelContent = this._readFromBinaryExcel(base64FromExcel);
History.TurnOn();
var aContentExcel = excelContent.workbook; var aContentExcel = excelContent.workbook;
var aPastedImages = excelContent.arrImages; var aPastedImages = excelContent.arrImages;
...@@ -3882,17 +3885,6 @@ PasteProcessor.prototype = ...@@ -3882,17 +3885,6 @@ PasteProcessor.prototype =
var aContent = {aPastedImages: aPastedImages, images: aImagesToDownload}; var aContent = {aPastedImages: aPastedImages, images: aImagesToDownload};
for(var i = 0; i < arr_shapes.length; ++i)
{
shape = arr_shapes[i].graphicObject;
shape.worksheet = null;
shape.drawingBase = null;
arr_shapes[i] = new DrawingCopyObject(shape, 0, 0, 0, 0);
}
//var arrTransforms = objects.arrTransforms; //var arrTransforms = objects.arrTransforms;
var presentation = editor.WordControl.m_oLogicDocument; var presentation = editor.WordControl.m_oLogicDocument;
oThis = this; oThis = this;
...@@ -3902,6 +3894,16 @@ PasteProcessor.prototype = ...@@ -3902,6 +3894,16 @@ PasteProcessor.prototype =
{ {
if(false == oThis.bNested) if(false == oThis.bNested)
{ {
for(var i = 0; i < arr_shapes.length; ++i)
{
shape = arr_shapes[i].graphicObject.copy();
shape.worksheet = null;
shape.drawingBase = null;
arr_shapes[i] = new DrawingCopyObject(shape, 0, 0, 0, 0);
}
var presentationSelectedContent = new PresentationSelectedContent(); var presentationSelectedContent = new PresentationSelectedContent();
presentationSelectedContent.Drawings = arr_shapes; presentationSelectedContent.Drawings = arr_shapes;
...@@ -3930,8 +3932,11 @@ PasteProcessor.prototype = ...@@ -3930,8 +3932,11 @@ PasteProcessor.prototype =
{ {
sendImgUrls(oThis.api, oObjectsForDownload.aUrls, function (data) { sendImgUrls(oThis.api, oObjectsForDownload.aUrls, function (data) {
var oImageMap = {}; var oImageMap = {};
History.TurnOff();
ResetNewUrls(data, oObjectsForDownload.aUrls, oObjectsForDownload.aBuilderImagesByUrl, oImageMap); ResetNewUrls(data, oObjectsForDownload.aUrls, oObjectsForDownload.aBuilderImagesByUrl, oImageMap);
oThis.api.pre_Paste(fonts, oImageMap, paste_callback); oThis.api.pre_Paste(fonts, oImageMap, paste_callback);
History.TurnOn();
}); });
} }
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