Commit 577f1638 authored by GoshaZotov's avatar GoshaZotov

fix bug 33196

parent d1c29375
...@@ -90,6 +90,17 @@ ...@@ -90,6 +90,17 @@
} }
else else
{ {
//если мультиселект, то запрещаем копирование
if(1 !== ws.model.selectionRange.ranges.length)
{
var selectedDrawings = ws.objectRender.getSelectedGraphicObjects();
if(0 === selectedDrawings.length)
{
ws.handlers.trigger ("onErrorEvent", Asc.c_oAscError.ID.CopyMultiselectAreaError, Asc.c_oAscError.Level.NoCritical);
return;
}
}
//TEXT //TEXT
if (AscCommon.c_oAscClipboardDataFormat.Text & _formats) if (AscCommon.c_oAscClipboardDataFormat.Text & _formats)
{ {
......
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
PasteMaxRangeError : -64, PasteMaxRangeError : -64,
PastInMergeAreaError : -65, PastInMergeAreaError : -65,
CopyMultiselectAreaError : -66,
DataRangeError : -72, DataRangeError : -72,
CannotMoveRange : -71, CannotMoveRange : -71,
...@@ -1112,6 +1113,7 @@ ...@@ -1112,6 +1113,7 @@
prot['FTRangeIncludedOtherTables'] = prot.FTRangeIncludedOtherTables; prot['FTRangeIncludedOtherTables'] = prot.FTRangeIncludedOtherTables;
prot['PasteMaxRangeError'] = prot.PasteMaxRangeError; prot['PasteMaxRangeError'] = prot.PasteMaxRangeError;
prot['PastInMergeAreaError'] = prot.PastInMergeAreaError; prot['PastInMergeAreaError'] = prot.PastInMergeAreaError;
prot['CopyMultiselectAreaError'] = prot.CopyMultiselectAreaError;
prot['DataRangeError'] = prot.DataRangeError; prot['DataRangeError'] = prot.DataRangeError;
prot['CannotMoveRange'] = prot.CannotMoveRange; prot['CannotMoveRange'] = prot.CannotMoveRange;
prot['MaxDataSeriesError'] = prot.MaxDataSeriesError; prot['MaxDataSeriesError'] = prot.MaxDataSeriesError;
......
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