Поправила выставление ctrPrp для N-арных операторов

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55558 954022d7-b5bf-4e40-9824-e11837661b57

Поправила выставление ctrPrp для N-арных операторов
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55558 954022d7-b5bf-4e40-9824-e11837661b57
87f36748 · Anna.Pavlova · Alexander.Trofimov · 1dcfcb0b · 87f36748 · 1dcfcb0b
Commit 87f36748 authored Apr 16, 2014 by Anna.Pavlova Committed by Alexander.Trofimov May 18, 2016
6 changed files
--- a/Word/Editor/Math.js
+++ b/Word/Editor/Math.js
@@ -580,8 +580,6 @@ ParaMath.prototype =

            this.Math.absPos = {x: PRSA.X, y: PRSA.Y - this.Root.size.ascent};

-            console.log("Id Of Root  " + this.Root.Id + "  Recalculate : " + " X " + PRSA.X + " Y " + PRSA.Y);
-
            PRSA.X    += this.WidthVisible;
            PRSA.LastW = this.WidthVisible;
        }
@@ -757,7 +755,6 @@ ParaMath.prototype =

        if ( EndPos >= 1 )
        {
-            console.log("Id Of Root  " + this.Root.Id + "  Draw : " + " X " + PDSE.X + " Y " + PDSE.Y);
            this.Math.Draw( PDSE.X, PDSE.Y - this.Root.size.ascent, PDSE.Graphics );
            PDSE.X += this.Width;
        }

--- a/Word/Math/docfiles/Document.js
+++ b/Word/Math/docfiles/Document.js
--- a/Word/Math/docfiles/GlobalLoaders.js
+++ b/Word/Math/docfiles/GlobalLoaders.js
--- a/Word/Math/docfiles/api.js
+++ b/Word/Math/docfiles/api.js
--- a/Word/Math/nary.js
+++ b/Word/Math/nary.js
@@ -198,12 +198,24 @@ CNary.prototype.init = function(props)
            var prp = {type: DEGREE_SubSup};
            base.init_2(prp, sign);
        }
+
    }

-    /*if(!this.supHide && !this.subHide)
-     base.setCtrPrp(this.CtrPrp);*/      // выставляем аналогично как в CMathContent при добавлении элемента в addMComponent
+    if(!this.supHide || !this.subHide)
+        base.setCtrPrp(this.CtrPrp);    // выставляем аналогично как в CMathContent при добавлении элемента в addMComponent

    this.addMCToContent(base, arg);
+
+}
+CNary.prototype.setCtrPrp = function(txtPrp)
+{
+    this.CtrPrp.Merge(txtPrp); // only runPrp for paragraph
+    this.RunPrp.setTxtPrp(txtPrp);
+
+    if(this.elements !== null)
+    {
+        this.elements[0][0].setCtrPrp(this.CtrPrp);
+    }
 }
 CNary.prototype.setDistance = function()
 {

--- a/Word/TextEditor.html
+++ b/Word/TextEditor.html
@@ -192,6 +192,8 @@
        <script type="text/javascript" src="Math/borderBox.js"></script>
        <!--script type="text/javascript" src="Math/test_composition.js"></script>-->

+
+
    </head>
    <body id="id_body" class="block_elem" style="-moz-user-select:none;-khtml-user-select:none;user-select:none;width:100%;height:100%;background-color:#B0B0B0;overflow:hidden;position:fixed;" UNSELECTABLE="on">
 		<div id="id_menu" class="block_elem" style="width:100%;height:21mm;background-color:#F4F5F6;">