Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

* 'develop' of https://github.com/ONLYOFFICE/sdkjs: Fixed bug #34164

Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop
* 'develop' of https://github.com/ONLYOFFICE/sdkjs: Fixed bug #34164
23326ceb · Alexey.Musinov · 53b49042 · 88c8daf1 · 23326ceb
Commit 23326ceb authored Mar 02, 2017 by Alexey.Musinov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

word/api.js word/api.js +3 -6

No files found.
--- a/word/api.js
+++ b/word/api.js
@@ -1665,13 +1665,10 @@ background-repeat: no-repeat;\
 		if (!this.WordControl.m_oLogicDocument)
 			return false;

-		if (false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Paragraph_Content))
-		{
-			if (AscCommon.g_clipboardBase.IsWorking())
-				return false;
+		if (AscCommon.g_clipboardBase.IsWorking())
+			return false;

-			return AscCommon.g_clipboardBase.Button_Paste();
-		}
+		return AscCommon.g_clipboardBase.Button_Paste();
 	};

 	asc_docs_api.prototype.Share = function()