Commit 98fc4400 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Bug #31890 Исправлен баг с зацикливанием при нулевом дефолтовом табе.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68743 954022d7-b5bf-4e40-9824-e11837661b57
parent 98baac2c
...@@ -2350,6 +2350,8 @@ function CHorRuler() ...@@ -2350,6 +2350,8 @@ function CHorRuler()
_positon_y = this.m_nBottom + 1.5; _positon_y = this.m_nBottom + 1.5;
var _min_default_value = Math.max(0, this.m_dMaxTab); var _min_default_value = Math.max(0, this.m_dMaxTab);
if (this.m_dDefaultTab > 0.01)
{
while (true) while (true)
{ {
if ((_margin_left + position_default_tab) > this.m_dMarginRight) if ((_margin_left + position_default_tab) > this.m_dMarginRight)
...@@ -2369,6 +2371,7 @@ function CHorRuler() ...@@ -2369,6 +2371,7 @@ function CHorRuler()
position_default_tab += this.m_dDefaultTab; position_default_tab += this.m_dDefaultTab;
} }
}
// custom tabs // custom tabs
var _len_tabs = this.m_arrTabs.length; var _len_tabs = this.m_arrTabs.length;
......
...@@ -1918,7 +1918,13 @@ Paragraph.prototype.private_RecalculateGetTabPos = function(X, ParaPr, CurPage) ...@@ -1918,7 +1918,13 @@ Paragraph.prototype.private_RecalculateGetTabPos = function(X, ParaPr, CurPage)
if ( null === Tab ) if ( null === Tab )
{ {
if ( X < PageStart.X + ParaPr.Ind.Left ) if ( X < PageStart.X + ParaPr.Ind.Left )
{
NewX = PageStart.X + ParaPr.Ind.Left; NewX = PageStart.X + ParaPr.Ind.Left;
}
else if (Default_Tab_Stop < 0.001)
{
NewX = X;
}
else else
{ {
NewX = PageStart.X; NewX = PageStart.X;
......
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