Commit 3cbf092d authored by GoshaZotov's avatar GoshaZotov

hide transpose property(if paste content have format tables)

parent 581efb8d
...@@ -8768,6 +8768,8 @@ ...@@ -8768,6 +8768,8 @@
var specialPasteSelectionRange = new AscCommonExcel.SelectionRange(); var specialPasteSelectionRange = new AscCommonExcel.SelectionRange();
specialPasteSelectionRange.ranges[0] = newRange.clone(); specialPasteSelectionRange.ranges[0] = newRange.clone();
g_clipboardBase.specialPasteData.activeRange = specialPasteSelectionRange; g_clipboardBase.specialPasteData.activeRange = specialPasteSelectionRange;
window['AscCommon'].g_clipboardBase.specialPasteUndoData.transpose = null;
} }
else if(g_clipboardBase.specialPasteProps && g_clipboardBase.specialPasteProps.transpose) else if(g_clipboardBase.specialPasteProps && g_clipboardBase.specialPasteProps.transpose)
{ {
...@@ -9041,7 +9043,12 @@ ...@@ -9041,7 +9043,12 @@
var sProps = Asc.c_oSpecialPasteProps; var sProps = Asc.c_oSpecialPasteProps;
if(fromBinary) if(fromBinary)
{ {
allowedSpecialPasteProps = [sProps.paste, sProps.pasteOnlyFormula, sProps.formulaNumberFormat, sProps.formulaAllFormatting, sProps.formulaWithoutBorders, sProps.formulaColumnWidth, sProps.transpose, sProps.pasteOnlyValues, sProps.valueNumberFormat, sProps.valueAllFormating, sProps.pasteOnlyFormating/*, sProps.link*/]; allowedSpecialPasteProps = [sProps.paste, sProps.pasteOnlyFormula, sProps.formulaNumberFormat, sProps.formulaAllFormatting, sProps.formulaWithoutBorders, sProps.formulaColumnWidth, sProps.pasteOnlyValues, sProps.valueNumberFormat, sProps.valueAllFormating, sProps.pasteOnlyFormating/*, sProps.link*/];
if(!(val.TableParts && val.TableParts.length))
{
//add transpose property
allowedSpecialPasteProps.push(sProps.transpose);
}
} }
else else
{ {
......
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