Bug 22602 - Clear All очищает ячейки, выделенные внутри диапазона форматированного как таблица.

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

Excel/model/Workbook.js

@@ -3059,23 +3059,28 @@ Woorksheet.prototype._removeCell=function(nRow, nCol, cell){
 		{
 		    var sheetId = this.getId();
 		    var cellId = cell.getName();
-			if(false == cell.isEmpty())
-			{
-				var oUndoRedoData_CellData = new UndoRedoData_CellData(cell.getValueData(), null);
-				if(null != cell.xfs)
-					oUndoRedoData_CellData.style = cell.xfs.clone();
-				History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_RemoveCell, sheetId, new Asc.Range(nCol, nRow, nCol, nRow), new UndoRedoData_CellSimpleData(nRow, nCol, oUndoRedoData_CellData, null));
-			}
 			if(cell.formulaParsed)
 			    this.workbook.dependencyFormulas.deleteMasterNodes2(sheetId, cellId);
 			this.workbook.needRecalc.nodes[getVertexId(sheetId, cellId)] = [sheetId, cellId];
 			this.workbook.needRecalc.length++;
 			
+			if (null != cell.getConditionalFormattingStyle() || null != cell.getTableStyle()) {
+			    cell.setValue("");
+			    cell.setStyle(null);
+			}
+			else {
+			    if (false == cell.isEmpty()) {
+			        var oUndoRedoData_CellData = new UndoRedoData_CellData(cell.getValueData(), null);
+			        if (null != cell.xfs)
+			            oUndoRedoData_CellData.style = cell.xfs.clone();
+			        History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_RemoveCell, sheetId, new Asc.Range(nCol, nRow, nCol, nRow), new UndoRedoData_CellSimpleData(nRow, nCol, oUndoRedoData_CellData, null));
+			    }
 			    delete row.c[nCol];
-			if(row.isEmpty())
+			    if (row.isEmpty())
 			        delete this.aGCells[nRow];
 			}
 		}
+	}
 };
 Woorksheet.prototype._getCell=function(row, col){
 	//0-based
@@ -4386,11 +4391,17 @@ Cell.prototype.setConditionalFormattingStyle=function(xfs){
 	this.bNeedCompileXfs = true;
 	this.oValue.cleanCache();
 };
+Cell.prototype.getConditionalFormattingStyle = function (xfs) {
+    return this.conditionalFormattingXfs;
+};
 Cell.prototype.setTableStyle=function(xfs){
 	this.tableXfs = xfs;
 	this.bNeedCompileXfs = true;
 	this.oValue.cleanCache();
 };
+Cell.prototype.getTableStyle=function(xfs){
+    return this.tableXfs;
+};
 Cell.prototype.setStyle=function(xfs){
 	var oldVal = this.xfs;
 	var newVal = null;