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

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

http://bugzserver/show_bug.cgi?id=25137 -  Ошибка в консоли при копировании текста внутри заголовка диаграммы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57091 954022d7-b5bf-4e40-9824-e11837661b57
parent 41e0d297
...@@ -2556,6 +2556,7 @@ function PasteProcessor(api, bUploadImage, bUploadFonts, bNested, pasteInExcel) ...@@ -2556,6 +2556,7 @@ function PasteProcessor(api, bUploadImage, bUploadFonts, bNested, pasteInExcel)
this.aContent = []; this.aContent = [];
this.pasteInExcel = pasteInExcel; this.pasteInExcel = pasteInExcel;
this.pasteInPresentationShape = null;
//��� ������� ������ � ������, ��� ����������� �� word � chrome ���������� ������ ������� ��� <p> //��� ������� ������ � ������, ��� ����������� �� word � chrome ���������� ������ ������� ��� <p>
this.bIgnoreNoBlockText = false; this.bIgnoreNoBlockText = false;
...@@ -2936,6 +2937,12 @@ PasteProcessor.prototype = ...@@ -2936,6 +2937,12 @@ PasteProcessor.prototype =
base64 = null; base64 = null;
base64FromExcel = null; base64FromExcel = null;
} }
else if(this.oDocument.bPresentation)
{
base64 = null;
base64FromExcel = null;
this.pasteInPresentationShape = true;
};
var isImageInNode = node.getElementsByTagName('img') && node.getElementsByTagName('img').length ? true : false; var isImageInNode = node.getElementsByTagName('img') && node.getElementsByTagName('img').length ? true : false;
if(base64 != null) if(base64 != null)
...@@ -4913,7 +4920,11 @@ PasteProcessor.prototype = ...@@ -4913,7 +4920,11 @@ PasteProcessor.prototype =
}, },
_Add_NewParagraph : function() _Add_NewParagraph : function()
{ {
this.oCurPar = new Paragraph(this.oDocument.DrawingDocument, this.oDocument, 0, 50, 50, X_Right_Field, Y_Bottom_Field ); var bFromPresentation = false;
if(this.pasteInPresentationShape)
bFromPresentation = true;
this.oCurPar = new Paragraph(this.oDocument.DrawingDocument, this.oDocument, 0, 50, 50, X_Right_Field, Y_Bottom_Field, bFromPresentation );
this.oCurParContentPos = this.oCurPar.CurPos.ContentPos; this.oCurParContentPos = this.oCurPar.CurPos.ContentPos;
this.oCurRun = new ParaRun(this.oCurPar); this.oCurRun = new ParaRun(this.oCurPar);
this.oCurRunContentPos = 0; this.oCurRunContentPos = 0;
......
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