Commit 33c21deb authored by GoshaZotov's avatar GoshaZotov Committed by Alexander.Trofimov

add warning for Bug #32333

parent b304cd10
......@@ -13,7 +13,8 @@ function (window, undefined) {
var CColor = AscCommon.CColor;
var c_oAscConfirm = {
ConfirmReplaceRange: 0
ConfirmReplaceRange: 0,
ConfirmPutMergeRange: 1
};
var c_oAscAlignType = {
......@@ -293,6 +294,7 @@ var c_oAscPopUpSelectorType = {
window['Asc']['c_oAscConfirm'] = window['Asc'].c_oAscConfirm = c_oAscConfirm;
prot = c_oAscConfirm;
prot['ConfirmReplaceRange'] = prot.ConfirmReplaceRange;
prot['ConfirmPutMergeRange'] = prot.ConfirmPutMergeRange;
window['Asc']['c_oAscMergeOptions'] = window['Asc'].c_oAscMergeOptions = c_oAscMergeOptions;
prot = c_oAscMergeOptions;
prot['Unmerge'] = prot.Unmerge;
......
......@@ -8840,6 +8840,13 @@
// Вызовем на всякий случай, т.к. мы можем уже обновиться из-за формул ToDo возможно стоит убрать это в дальнейшем (но нужна переработка формул) - http://bugzserver/show_bug.cgi?id=24505
t._updateSelectionNameAndInfo();
if(null !== t.model.getRange3( arnTo.r1, arnTo.c1, arnTo.r2, arnTo.c2 ).hasMerged())
{
t.model.workbook.handlers.trigger( "asc_onConfirmAction", Asc.c_oAscConfirm.ConfirmPutMergeRange, function () {
t.model.autoFilters.unmergeTablesAfterMove( arnTo );
});
}
};
if ( t.model.autoFilters._searchFiltersInRange( arnFrom ) ) {
......
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