Fixed bug #33404.

9a48530b · Ilya Kirillov · 28e06875 · 9a48530b
Commit 9a48530b authored Feb 17, 2017 by Ilya Kirillov
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 10 deletions

word/api.js word/api.js +17 -10

No files found.
--- a/word/api.js
+++ b/word/api.js
@@ -1759,17 +1759,24 @@ background-repeat: no-repeat;\
 	    if (AscCommon.CollaborativeEditing.Get_GlobalLock())
 	        return;
-		this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(AscDFH.historydescription_Document_PasteHotKey);
+		var _logicDoc = this.WordControl.m_oLogicDocument;
-		switch (_format)
+		if (!_logicDoc)
+			return;
+		if (false === _logicDoc.Document_Is_SelectionLocked(changestype_Paragraph_Content))
 		{
-			case AscCommon.c_oAscClipboardDataFormat.HtmlElement:
+			_logicDoc.Create_NewHistoryPoint(AscDFH.historydescription_Document_PasteHotKey);
-				AscCommon.Editor_Paste_Exec(this, data1, data2);
+			switch (_format)
-				break;
+			{
-			case AscCommon.c_oAscClipboardDataFormat.Internal:
+				case AscCommon.c_oAscClipboardDataFormat.HtmlElement:
-				AscCommon.Editor_Paste_Exec(this, null, null, data1);
+					AscCommon.Editor_Paste_Exec(this, data1, data2);
-				break;
+					break;
-			default:
+				case AscCommon.c_oAscClipboardDataFormat.Internal:
-				break;
+					AscCommon.Editor_Paste_Exec(this, null, null, data1);
+					break;
+				default:
+					break;
+			}
 		}
 	};