Commit 2bd312f9 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=31015 - [Copy&Paste] Вставка графического...

http://bugzserver/show_bug.cgi?id=31015 -  [Copy&Paste] Вставка графического объекта из редактора документов в редактор таблиц не осуществляется вызывает ошибку в консоли

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66556 954022d7-b5bf-4e40-9824-e11837661b57
parent d70ea125
......@@ -2160,7 +2160,7 @@
var t = this;
var oPasteProcessor;
var oTempDrawingDocument = worksheet.model.DrawingDocument;
var newCDocument = new CDocument(oTempDrawingDocument);
var newCDocument = new CDocument(oTempDrawingDocument, false);
newCDocument.bFromDocument = true;
//TODo!!!!!!
newCDocument.Content[0].bFromDocument = true;
......@@ -2588,7 +2588,7 @@
//передавать CDrawingDocument текущего worksheet
var oTempDrawingDocument = worksheet.model.DrawingDocument;
var newCDocument = new CDocument(oTempDrawingDocument);
var newCDocument = new CDocument(oTempDrawingDocument, false);
newCDocument.bFromDocument = true;
newCDocument.theme = this.Api.wbModel.theme;
......@@ -3328,7 +3328,7 @@
//вставляем табличку из презентаций
var pasteFromBinaryWord = new Asc.pasteFromBinaryWord(this, ws);
var newCDocument = new CDocument(oTempDrawingDocument);
var newCDocument = new CDocument(oTempDrawingDocument, false);
newCDocument.bFromDocument = true;
newCDocument.theme = this.Api.wbModel.theme;
......@@ -3441,7 +3441,7 @@
//вставляем табличку из презентаций
var pasteFromBinaryWord = new Asc.pasteFromBinaryWord(this, ws);
var newCDocument = new CDocument(oTempDrawingDocument);
var newCDocument = new CDocument(oTempDrawingDocument, false);
newCDocument.bFromDocument = true;
newCDocument.theme = this.Api.wbModel.theme;
......
......@@ -1009,7 +1009,10 @@ CDocument.prototype =
this.private_ProcessTemplateReplacement(TemplateReplacementData);
}
}
this.Set_FastCollaborativeEditing(true);
if(null !== this.CollaborativeEditing)
{
this.Set_FastCollaborativeEditing(true);
}
},
Add_TestDocument : function()
......
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