Commit c08fb724 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

nodeDisplay перенесен из Editor_Paste_Exec в PasteProcessor.Start. Для вставки...

nodeDisplay перенесен из Editor_Paste_Exec в PasteProcessor.Start. Для вставки ячеек PasteProcessor.Start заменен на PasteProcessor._Execute

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51573 954022d7-b5bf-4e40-9824-e11837661b57
parent 021c0023
...@@ -2640,8 +2640,6 @@ function Body_Paste(api, e) ...@@ -2640,8 +2640,6 @@ function Body_Paste(api, e)
} }
function Editor_Paste_Exec(api, pastebin, nodeDisplay) function Editor_Paste_Exec(api, pastebin, nodeDisplay)
{ {
if(null == nodeDisplay)
nodeDisplay = pastebin;
var oPasteProcessor = new PasteProcessor(api, true, true, false); var oPasteProcessor = new PasteProcessor(api, true, true, false);
oPasteProcessor.Start(pastebin, nodeDisplay); oPasteProcessor.Start(pastebin, nodeDisplay);
}; };
...@@ -2662,7 +2660,8 @@ function PasteProcessor(api, bUploadImage, bUploadFonts, bNested) ...@@ -2662,7 +2660,8 @@ function PasteProcessor(api, bUploadImage, bUploadFonts, bNested)
this.bNested = bNested;//��� ���������� � �������� this.bNested = bNested;//��� ���������� � ��������
this.oFonts = new Object(); this.oFonts = new Object();
this.oImages = new Object(); this.oImages = new Object();
this.aContent = new Array();
//��� ������� ������ � ������, ��� ����������� �� word � chrome ���������� ������ ������� ��� <p> //��� ������� ������ � ������, ��� ����������� �� word � chrome ���������� ������ ������� ��� <p>
this.bIgnoreNoBlockText = false; this.bIgnoreNoBlockText = false;
...@@ -3232,6 +3231,8 @@ PasteProcessor.prototype = ...@@ -3232,6 +3231,8 @@ PasteProcessor.prototype =
}, },
Start : function(node, nodeDisplay, bDuplicate) Start : function(node, nodeDisplay, bDuplicate)
{ {
if(null == nodeDisplay)
nodeDisplay = node;
if(g_bIsDocumentCopyPaste) if(g_bIsDocumentCopyPaste)
{ {
...@@ -5611,7 +5612,7 @@ PasteProcessor.prototype = ...@@ -5611,7 +5612,7 @@ PasteProcessor.prototype =
oPasteProcessor.bUseScaleKoef = bUseScaleKoef; oPasteProcessor.bUseScaleKoef = bUseScaleKoef;
oPasteProcessor.dScaleKoef = dScaleKoef; oPasteProcessor.dScaleKoef = dScaleKoef;
} }
oPasteProcessor.Start(node); oPasteProcessor._Execute(node, {}, true, true, false);
oPasteProcessor._PrepareContent(); oPasteProcessor._PrepareContent();
oPasteProcessor._AddNextPrevToContent(cell.Content); oPasteProcessor._AddNextPrevToContent(cell.Content);
if(0 == oPasteProcessor.aContent.length) if(0 == oPasteProcessor.aContent.length)
......
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