Commit 5a236a6e authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

к предыдущей заливке

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61386 954022d7-b5bf-4e40-9824-e11837661b57
parent 891aac5e
...@@ -961,7 +961,7 @@ ParaMath.prototype.UpdateWidthLine = function(PRS, Width) ...@@ -961,7 +961,7 @@ ParaMath.prototype.UpdateWidthLine = function(PRS, Width)
{ {
this.CurPageInfo.MaxLineW = Width; this.CurPageInfo.MaxLineW = Width;
if(align_Justify == this.Get_Align() && this.ParaMathRPI.bInline == false) if(this.ParaMathRPI.bInline == false && align_Justify == this.Get_Align())
this.UpdateInfoForBreak(PRS); this.UpdateInfoForBreak(PRS);
} }
}; };
...@@ -1189,9 +1189,9 @@ ParaMath.prototype.Is_Inline = function() ...@@ -1189,9 +1189,9 @@ ParaMath.prototype.Is_Inline = function()
ParaMath.prototype.Get_Align = function() ParaMath.prototype.Get_Align = function()
{ {
var Jc; var Jc;
if(this.bInline) if(this.ParaMathRPI.bInline)
{ {
var ParaPr = this.Paragraph.Get_CompiledPr2(false); var ParaPr = this.Paragraph.Get_CompiledPr2(false).ParaPr;
Jc = ParaPr.Jc; Jc = ParaPr.Jc;
} }
else if (undefined !== this.Jc) else if (undefined !== this.Jc)
...@@ -1205,7 +1205,6 @@ ParaMath.prototype.Get_Align = function() ...@@ -1205,7 +1205,6 @@ ParaMath.prototype.Get_Align = function()
Jc = MathSettings.Get_DefJc(); Jc = MathSettings.Get_DefJc();
} }
return Jc; return Jc;
}; };
ParaMath.prototype.Set_Align = function(Align) ParaMath.prototype.Set_Align = function(Align)
......
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