Commit 17ae0e82 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=27916 - Ошибки в консоли после вставки...

http://bugzserver/show_bug.cgi?id=27916 - Ошибки в консоли после вставки текста содержащего разрыв строки из CPE в CDE

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60126 954022d7-b5bf-4e40-9824-e11837661b57
parent cc0896ae
......@@ -3243,7 +3243,7 @@ PasteProcessor.prototype =
var aContent = [];
for(var i = 0; i < docContent.length; i++)
{
aContent[i] = docContent[i].Element;
aContent[i] = ConvertParagraphToWord(docContent[i].Element, this.oDocument);
}
this.aContent = aContent;
......@@ -3882,10 +3882,17 @@ PasteProcessor.prototype =
{
var trueDocument = this.oDocument;
//создаём темповый CDocumentContent
this.oDocument = new CDocumentContent(trueDocument, this.oDocument.DrawingDocument, 0 , 0, 0, 0, false, false);
var tempCDocument = function()
{
return new CDocument( this.oDocument.DrawingDocument);
}
//создаём темповый CDocument
this.oDocument = ExecuteNoHistory(tempCDocument , this, []);
var aContent = ExecuteNoHistory(this.ReadFromBinary, this, [base64FromWord]);
//возврщаем обратно переменные и историю, документ которой заменяется при создании CDocument
this.oDocument = trueDocument;
History.Document = trueDocument;
var presentationSelectedContent = new PresentationSelectedContent();
presentationSelectedContent.DocContent = new CSelectedContent();
......@@ -6765,9 +6772,9 @@ PasteProcessor.prototype =
blipFill.fill = new CBlipFill();
blipFill.fill.RasterImageId = sSrc;
image.setBlipFill(blipFill);
image.setGeometry( CreateGeometry("rect"));
image.spPr.geometry.Init(5, 5);
image.setXfrm(node["offsetLeft"], node["offsetTop"], nWidth, nHeight, null, null, null);
//image.setGeometry( CreateGeometry("rect"));
//image.spPr.geometry.Init(5, 5);
//image.setXfrm(node["offsetLeft"], node["offsetTop"], nWidth, nHeight, null, null, null);
arrImages.push(image);
}
}
......
......@@ -636,6 +636,7 @@ function CDocument(DrawingDocument)
this.HighlightColor = null;
if(typeof CComments !== "undefined")
this.Comments = new CComments();
this.Lock = new CLock();
......
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