Skip to content

S
sdkjs
Commit 5ff74233 authored by GoshaZotov's avatar GoshaZotov
Browse files
Options

fix bug 34179

parent f2912663
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
slide/api.js
View file @ 5ff74233
...@@ -1771,7 +1771,7 @@ background-repeat: no-repeat;\ ...@@ -1771,7 +1771,7 @@ background-repeat: no-repeat;\
} }
}; };
asc_docs_api.prototype.asc_PasteData = function(_format, data1, data2) asc_docs_api.prototype.asc_PasteData = function(_format, data1, data2, text_data)
{ {
if (this.getViewMode()) if (this.getViewMode())
return; return;
......
word/api.js
View file @ 5ff74233
...@@ -1755,7 +1755,7 @@ background-repeat: no-repeat;\ ...@@ -1755,7 +1755,7 @@ background-repeat: no-repeat;\
} }
}; };
asc_docs_api.prototype.asc_PasteData = function(_format, data1, data2, useCurrentPoint) asc_docs_api.prototype.asc_PasteData = function(_format, data1, data2, text_data, useCurrentPoint)
{ {
if (AscCommon.CollaborativeEditing.Get_GlobalLock()) if (AscCommon.CollaborativeEditing.Get_GlobalLock())
return; return;
...@@ -2109,7 +2109,7 @@ background-repeat: no-repeat;\ ...@@ -2109,7 +2109,7 @@ background-repeat: no-repeat;\
return; return;
} }
//t.WordControl.m_oLogicDocument.Add_NewParagraph(); //t.WordControl.m_oLogicDocument.Add_NewParagraph();
t.asc_PasteData(AscCommon.c_oAscClipboardDataFormat.Internal, 'docData;' + result, undefined, true); t.asc_PasteData(AscCommon.c_oAscClipboardDataFormat.Internal, 'docData;' + result, undefined, undefined, true);
}); });
} }
else else
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7