Commit c859b0cc authored by GoshaZotov's avatar GoshaZotov

fix bug 32517 - Не происходит удаление комментария в форматированной таблице через Table Settings

parent b2d4fbf8
...@@ -13441,9 +13441,23 @@ ...@@ -13441,9 +13441,23 @@
t.model.autoFilters.isEmptyAutoFilters( arn, type ); t.model.autoFilters.isEmptyAutoFilters( arn, type );
} }
var deleteCells = type === c_oAscInsertOptions.InsertCellsAndShiftRight ? range.deleteCellsShiftLeft() : range.deleteCellsShiftUp(); var preDeleteAction = function()
if ( deleteCells ) { {
t.cellCommentator.updateCommentsDependencies( true, type, arn ); t.cellCommentator.updateCommentsDependencies( false, type, arn );
};
var res;
if(type === c_oAscInsertOptions.InsertCellsAndShiftRight)
{
res = range.deleteCellsShiftLeft(preDeleteAction);
}
else
{
res = range.deleteCellsShiftUp(preDeleteAction);
}
if(res)
{
t.objectRender.updateDrawingObject( true, type, arn ); t.objectRender.updateDrawingObject( true, type, arn );
t._onUpdateFormatTable(range, false, true); t._onUpdateFormatTable(range, false, true);
} }
...@@ -13470,6 +13484,7 @@ ...@@ -13470,6 +13484,7 @@
t.model.autoFilters.isEmptyAutoFilters(ref); t.model.autoFilters.isEmptyAutoFilters(ref);
var cleanRange = t.model.getRange3( ref.r1, ref.c1, ref.r2, ref.c2 ); var cleanRange = t.model.getRange3( ref.r1, ref.c1, ref.r2, ref.c2 );
cleanRange.cleanAll(); cleanRange.cleanAll();
t.cellCommentator.deleteCommentsRange( cleanRange.bbox );
t._onUpdateFormatTable(ref, false, true); t._onUpdateFormatTable(ref, false, true);
......
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