Проверка на лок для сплита и мерже

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60304 954022d7-b5bf-4e40-9824-e11837661b57

PowerPoint/api.js

@@ -2576,13 +2576,21 @@ asc_docs_api.prototype.CheckBeforeSplitCells = function()
 }
 asc_docs_api.prototype.MergeCells = function()
 {
-    this.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
-    this.WordControl.m_oLogicDocument.Table_MergeCells();
+    var doc = this.WordControl.m_oLogicDocument;
+    if(doc.Document_Is_SelectionLocked(changestype_Drawing_Props) === false)
+    {
+        this.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
+        this.WordControl.m_oLogicDocument.Table_MergeCells();
+    }
 }
 asc_docs_api.prototype.SplitCell = function(Cols, Rows)
 {
-    this.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
-    this.WordControl.m_oLogicDocument.Table_SplitCell(Cols, Rows);
+    var doc = this.WordControl.m_oLogicDocument;
+    if(doc.Document_Is_SelectionLocked(changestype_Drawing_Props) === false)
+    {
+        this.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
+        this.WordControl.m_oLogicDocument.Table_SplitCell(Cols, Rows);
+    }
 }
 asc_docs_api.prototype.widthTable = function(width){