Commit 202fc9d6 authored by Ilya Kirillov's avatar Ilya Kirillov

Fix bug #32549 Исправлен баг с получением ширины выделенных ячеек в таблице.

parent e0a60e21
...@@ -320,21 +320,31 @@ CTable.prototype = ...@@ -320,21 +320,31 @@ CTable.prototype =
CellShd = null; CellShd = null;
} }
if (0 === Index) if (0 === Index)
{ {
if (tblwidth_Auto === Cell_w.Type) if (tblwidth_Auto === Cell_w.Type)
CellWidth = null; CellWidth = null;
else if (tblwidth_Mm === Cell_w.Type) else if (tblwidth_Mm === Cell_w.Type)
CellWidth = Cell_w.W; CellWidth = Cell_w.W;
else// if (tblwidth_Pct === Cell_w.Type) else// if (tblwidth_Pct === Cell_w.Type)
CellWidth = -Cell_w.W; CellWidth = -Cell_w.W;
} }
else else
{ {
if ((tblwidth_Auto === Cell_w.Type && null !== CellWidth) var _CellWidth;
|| (undefined === CellWidth || null === CellWidth || Math.abs(CellWidth - Cell_w.W) > 0.001)) if (tblwidth_Auto === Cell_w.Type)
CellWidth = undefined; _CellWidth = null;
} else if (tblwidth_Mm === Cell_w.Type)
_CellWidth = Cell_w.W;
else// if (tblwidth_Pct === Cell_w.Type)
_CellWidth = -Cell_w.W;
if ((tblwidth_Auto === Cell_w.Type && null !== CellWidth)
|| (undefined === CellWidth
|| null === CellWidth
|| Math.abs(CellWidth - _CellWidth) > 0.001))
CellWidth = undefined;
}
// Крайняя левая ли данная ячейка в выделении? // Крайняя левая ли данная ячейка в выделении?
if ( 0 === Index || this.Selection.Data[Index - 1].Row != Pos.Row ) if ( 0 === Index || this.Selection.Data[Index - 1].Row != Pos.Row )
......
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