From d7da0b8b5b2c033e87f7a042fdad6a6ccd48df43 Mon Sep 17 00:00:00 2001
From: "Anna.Pavlova" <Anna.Pavlova@OnlyOffice.com>
Date: Tue, 24 Feb 2015 13:37:45 +0000
Subject: [PATCH] =?UTF-8?q?1.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B1=D0=B0=D0=B3=D0=B8=20:=20=D0=BF?=
=?UTF-8?q?=D0=B0=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=B7-=D0=B7?=
=?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?=
=?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B0?=
=?UTF-8?q?=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=202.=20=D0=98?=
=?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B1?=
=?UTF-8?q?=D0=B0=D0=B3=D0=B8=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD=D0=BD?=
=?UTF-8?q?=D1=8B=D0=B5=20=D1=81=20=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE?=
=?UTF-8?q?=D0=B2=D0=BA=D0=BE=D0=B9=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0?=
=?UTF-8?q?/=D0=B7=D0=BD=D0=B0=D0=BA=D0=B0=20=D0=BF=D0=B0=D1=80=D0=B0?=
=?UTF-8?q?=D0=B3=D1=80=D0=B0=D1=84=D0=B0=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5?=
=?UTF-8?q?=20delimiters=20=D0=B8=20=D0=BF=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61114 954022d7-b5bf-4e40-9824-e11837661b57
---
Word/Math/accent.js | 8 ++++++--
Word/Math/borderBox.js | 8 ++++----
Word/Math/fraction.js | 4 ++++
Word/Math/nary.js | 10 +++++-----
Word/Math/operators.js | 7 +++++++
Word/Math/radical.js | 4 ++++
6 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/Word/Math/accent.js b/Word/Math/accent.js
index 391d971bb..57e46d6a1 100644
--- a/Word/Math/accent.js
+++ b/Word/Math/accent.js
@@ -165,11 +165,11 @@ CAccentDoubleLine.prototype.calcSize = function(stretch)
var Line = new CMathText(true);
Line.add(0x305);
- Line.Resize(g_oTextMeasurer);
+ Line.Measure(g_oTextMeasurer);
var DoubleLine = new CMathText(true);
DoubleLine.add(0x33F);
- DoubleLine.Resize(g_oTextMeasurer);
+ DoubleLine.Measure(g_oTextMeasurer);
this.diff = DoubleLine.size.ascent - Line.size.ascent;
@@ -594,6 +594,8 @@ CAccent.prototype.draw = function(x, y, pGraphics, PDSE)
};
CAccent.prototype.Draw_Elements = function(PDSE)
{
+ var X = PDSE.X;
+
var oBase = this.Content[0];
oBase.Draw_Elements(PDSE);
@@ -615,6 +617,8 @@ CAccent.prototype.Draw_Elements = function(PDSE)
}
this.operator.draw(x, y, PDSE.Graphics, PDSE);
+
+ PDSE.X = X + this.size.width;
};
CAccent.prototype.GetLastElement = function()
{
diff --git a/Word/Math/borderBox.js b/Word/Math/borderBox.js
index c901d8e0a..07cfa634e 100644
--- a/Word/Math/borderBox.js
+++ b/Word/Math/borderBox.js
@@ -203,6 +203,8 @@ CBorderBox.prototype.recalculateSize = function()
}
CBorderBox.prototype.Draw_Elements = function(PDSE)
{
+ var _X = PDSE.X;
+
this.Content[0].Draw_Elements(PDSE);
var penW = this.Get_TxtPrControlLetter().FontSize*0.02;
@@ -215,10 +217,6 @@ CBorderBox.prototype.Draw_Elements = function(PDSE)
var X = this.pos.x + PosLine.x + this.GapLeft,
Y = this.pos.y + PosLine.y;
- /*var X = this.pos.x + PDSE.X + this.GapLeft,
- Y = this.pos.y + PDSE.Y;*/
-
-
this.Make_ShdColor(PDSE, this.Get_CompiledCtrPrp());
if(!this.Pr.hideTop)
@@ -358,6 +356,8 @@ CBorderBox.prototype.Draw_Elements = function(PDSE)
PDSE.Graphics.drawVerLine(0, x1, y1, y2, penW);
}
+ PDSE.X = _X + this.size.width;
+
}
CBorderBox.prototype.setPosition = function(pos, PDSE)
{
diff --git a/Word/Math/fraction.js b/Word/Math/fraction.js
index 478187398..a875a1ef1 100644
--- a/Word/Math/fraction.js
+++ b/Word/Math/fraction.js
@@ -71,12 +71,16 @@ CFraction.prototype.draw = function(x, y, pGraphics, PDSE)
}
CFraction.prototype.Draw_Elements = function(PDSE)
{
+ var X = PDSE.X;
+
if(this.Pr.type == BAR_FRACTION || this.Pr.type == NO_BAR_FRACTION)
this.drawBarFraction(PDSE);
else if(this.Pr.type == SKEWED_FRACTION)
this.drawSkewedFraction(PDSE);
else if(this.Pr.type == LINEAR_FRACTION)
this.drawLinearFraction(PDSE);
+
+ PDSE.X = X + this.size.width;
}
CFraction.prototype.drawBarFraction = function(PDSE)
{
diff --git a/Word/Math/nary.js b/Word/Math/nary.js
index fbcb3608a..7d365883d 100644
--- a/Word/Math/nary.js
+++ b/Word/Math/nary.js
@@ -694,9 +694,9 @@ CNaryOperator.prototype.Draw_Elements = function(PDSE)
if(this.Type == para_Math_Text)
this.drawTextElem(PosLine.x, PosLine.y, PDSE.Graphics);
else
- this.drawGlyph(PosLine.x, PosLine.y, PDSE.Graphics);
+ this.drawGlyph(PosLine.x, PosLine.y, PDSE.Graphics, PDSE);
}
-CNaryOperator.prototype.drawGlyph = function(x, y, pGraphics)
+CNaryOperator.prototype.drawGlyph = function(x, y, pGraphics, PDSE)
{
var coord = this.getCoord();
@@ -1946,7 +1946,7 @@ function CContourIntegral()
CNaryOperator.call(this);
}
Asc.extendClass(CContourIntegral, CNaryOperator);
-CContourIntegral.prototype.draw = function(x, y, pGraphics, PDSE)
+CContourIntegral.prototype.drawGlyph = function(x, y, pGraphics, PDSE)
{
var circle = new CCircle();
var coord = circle.getCoord();
@@ -2032,7 +2032,7 @@ function CSurfaceIntegral()
CNaryOperator.call(this);
}
Asc.extendClass(CSurfaceIntegral, CNaryOperator);
-CSurfaceIntegral.prototype.draw = function(x, y, pGraphics, PDSE)
+CSurfaceIntegral.prototype.drawGlyph = function(x, y, pGraphics, PDSE)
{
var surf = new CSurface();
var coord = surf.getCoord();
@@ -2117,7 +2117,7 @@ function CVolumeIntegral()
CNaryOperator.call(this);
}
Asc.extendClass(CVolumeIntegral, CNaryOperator);
-CVolumeIntegral.prototype.draw = function(x, y, pGraphics, PDSE)
+CVolumeIntegral.prototype.drawGlyph = function(x, y, pGraphics, PDSE)
{
var volume = new CVolume();
var coord = volume.getCoord();
diff --git a/Word/Math/operators.js b/Word/Math/operators.js
index e9016b0a0..92fb9c410 100644
--- a/Word/Math/operators.js
+++ b/Word/Math/operators.js
@@ -3825,6 +3825,8 @@ CDelimiter.prototype.setPosition = function(position, PDSE)
}
CDelimiter.prototype.Draw_Elements = function(PDSE)
{
+ var X = PDSE.X;
+
var PosLine = this.ParaMath.GetLinePosition(PDSE.Line);
this.begOper.draw(PosLine.x, PosLine.y, PDSE.Graphics, PDSE);
@@ -3833,6 +3835,8 @@ CDelimiter.prototype.Draw_Elements = function(PDSE)
for(var j = 0; j < this.nCol; j++)
this.elements[0][j].Draw_Elements(PDSE);
+
+ PDSE.X = X + this.size.width;
}
CDelimiter.prototype.align_2 = function(element)
{
@@ -3965,6 +3969,8 @@ CCharacter.prototype.setPosition = function(pos, PDSE)
}
CCharacter.prototype.Draw_Elements = function(PDSE)
{
+ var X = PDSE.X;
+
this.Content[0].Draw_Elements(PDSE);
var ctrPrp = this.Get_TxtPrControlLetter();
@@ -3984,6 +3990,7 @@ CCharacter.prototype.Draw_Elements = function(PDSE)
this.operator.draw(PosLine.x, PosLine.y, PDSE.Graphics, PDSE);
+ PDSE.X = X + this.size.width;
}
CCharacter.prototype.getBase = function()
{
diff --git a/Word/Math/radical.js b/Word/Math/radical.js
index a8e16e5f3..ff179fe74 100644
--- a/Word/Math/radical.js
+++ b/Word/Math/radical.js
@@ -637,10 +637,14 @@ CRadical.prototype.setPosition = function(pos, PDSE)
}
CRadical.prototype.Draw_Elements = function(PDSE)
{
+ var X = PDSE.X;
+
var PosLine = this.ParaMath.GetLinePosition(PDSE.Line);
this.signRadical.draw(PosLine.x, PosLine.y, PDSE.Graphics, PDSE);
CRadical.superclass.Draw_Elements.call(this, PDSE);
+
+ PDSE.X = X + this.size.width;
}
CRadical.prototype.getBase = function()
{
--
2.30.9