Commit 7186951e authored by GoshaZotov's avatar GoshaZotov

fix bug 34439

parent 1b72bd2f
...@@ -1945,7 +1945,19 @@ ...@@ -1945,7 +1945,19 @@
editor = {WordControl: oTempDrawingDocument, isDocumentEditor: true}; editor = {WordControl: oTempDrawingDocument, isDocumentEditor: true};
var oPasteProcessor = new AscCommon.PasteProcessor({WordControl:{m_oLogicDocument: newCDocument}, FontLoader: {}}, false, false); var oPasteProcessor = new AscCommon.PasteProcessor({WordControl:{m_oLogicDocument: newCDocument}, FontLoader: {}}, false, false);
oPasteProcessor._Prepeare_recursive(node, true, true); oPasteProcessor._Prepeare_recursive(node, true, true);
oPasteProcessor._Execute(node, {}, true, true, false);
//при специальной вставке в firefox _getComputedStyle возвращает null
//TODO пересмотреть функцию _getComputedStyle
if(AscCommonExcel.g_clipboardExcel.specialPasteStart && window['AscCommon'].g_clipboardBase.specialPasteData.aContent)
{
oPasteProcessor.aContent = window['AscCommon'].g_clipboardBase.specialPasteData.aContent;
}
else
{
oPasteProcessor._Execute(node, {}, true, true, false);
window['AscCommon'].g_clipboardBase.specialPasteData.aContent = oPasteProcessor.aContent;
}
editor = oOldEditor; editor = oOldEditor;
History.TurnOn(); History.TurnOn();
......
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