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

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

http://bugzserver/show_bug.cgi?id=26566 - Ошибка в консоли при копировании диаграммы из CSE во фрейм в CDE

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58352 954022d7-b5bf-4e40-9824-e11837661b57
parent 86d496d4
...@@ -1669,8 +1669,11 @@ ...@@ -1669,8 +1669,11 @@
pasteData = tempWorkbook.aWorksheets[0]; pasteData = tempWorkbook.aWorksheets[0];
if (pasteData) { if (pasteData) {
History.TurnOn(); History.TurnOn();
if(pasteData.Drawings && pasteData.Drawings.length && !(window["Asc"]["editor"] && window["Asc"]["editor"].isChartEditor)) if(pasteData.Drawings && pasteData.Drawings.length)
{
if(!(window["Asc"]["editor"] && window["Asc"]["editor"].isChartEditor))
t._insertImagesFromBinary(worksheet, pasteData, isIntoShape); t._insertImagesFromBinary(worksheet, pasteData, isIntoShape);
}
else { else {
var newFonts = {}; var newFonts = {};
pasteData.generateFontMap(newFonts); pasteData.generateFontMap(newFonts);
......
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