Commit 5b355e42 authored by Igor.Zotov's avatar Igor.Zotov

http://bugzserver/show_bug.cgi?id=27423 - Запретить вставку таблицы в заголовок диаграммы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59718 954022d7-b5bf-4e40-9824-e11837661b57
parent 3907ec22
...@@ -2974,7 +2974,7 @@ PasteProcessor.prototype = ...@@ -2974,7 +2974,7 @@ PasteProcessor.prototype =
base64 = null; base64 = null;
base64FromExcel = null; base64FromExcel = null;
this.pasteInPresentationShape = true; 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)
...@@ -5612,7 +5612,7 @@ PasteProcessor.prototype = ...@@ -5612,7 +5612,7 @@ PasteProcessor.prototype =
return bAddParagraph; return bAddParagraph;
} }
var sNodeName = node.nodeName.toLowerCase(); var sNodeName = node.nodeName.toLowerCase();
if("table" == sNodeName && this.pasteInExcel !== true) if("table" == sNodeName && this.pasteInExcel !== true && this.pasteInPresentationShape !== true)
{ {
if(g_bIsDocumentCopyPaste) if(g_bIsDocumentCopyPaste)
{ {
......
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