убрала Resize, setPosition и UpdatePosition (for Edit)

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

Word/Math/actions.js

@@ -375,8 +375,6 @@ CControlComposition.prototype =
     CreateEquation: function(indef)
     {
         this.Content[this.CurPos].CreateEquation(indef);
-        this.Content[this.CurPos].RecalculateReverse(oMeasure);
-        this.Content[this.CurPos].UpdatePosition();
     },
     Paragraph_Add: function(TextPr)
     {
@@ -415,14 +413,6 @@ CControlComposition.prototype =
     {
         this.Content[this.CurPos].Refresh();
     },
-    old_Set_SelectionState: function(State)
-    {
-        this.Content[this.CurPos].Set_SelectionState(State);
-    },
-    old_Get_SelectionState: function()
-    {
-        return this.Content[this.CurPos].Get_SelectionState();
-    },
     UpdateCursor: function()
     {
         this.Content[this.CurPos].UpdateCursor();
@@ -1268,7 +1258,7 @@ function Set_Container(dimension, path, index)
                         document.getElementById("Container").style.display = "none";
                         // AddMathComponent -> CreateEquation
                         //MathControl.CreateEquation(index + _i*column + _j);
-                        MathComposition.CreateEquation(index + _i*column + _j);
+                        MathComposition.CreateEquation2(index + _i*column + _j);
                         editor.WordControl.m_oLogicDocument.DrawingDocument.OnRecalculatePage(0, { Width : Page_Width, Height : Page_Height, Margins :  {
                             Left   : X_Left_Field,
                             Right  : X_Right_Field,

Word/Math/base.js

@@ -521,10 +521,6 @@ CMathBase.prototype =
 
         return content;
     },
-    drawSelect: function()
-    {
-        this.elements[this.CurPos_X][this.CurPos_Y].drawSelect();
-    },
     cursor_MoveToStartPos: function() //   home => cursor_MoveToStartPos
     {
         this.CurPos_X = 0;
@@ -873,11 +869,11 @@ CMathBase.prototype =
 
         this.size = {width: _width, height: _height, center: _center};
     },
-    RecalculateReverse: function(oMeasure)
+    /*RecalculateReverse: function(oMeasure)
     {
         this.recalculateSize();
         this.Parent.RecalculateReverse(oMeasure);
-    },
+    },*/
     Resize: function(oMeasure)
     {
         for(var i=0; i < this.nRow; i++)

Word/Math/docfiles/Document.js

@@ -1332,7 +1332,7 @@ CDocument.prototype =
             this.Document_UpdateRulersState();
             //**
             //MathControl.UpdateCursor();
-            MathComposition.UpdateCursor();
+            MathComposition.UpdateCursor2();
             //this.RecalculateCurPos();
             //**
             //this.RecalculateCurPos();

Word/Math/fraction.js

@@ -7,8 +7,6 @@ function CFraction()
 extend(CFraction, CMathBase);
 CFraction.prototype.init = function(props)
 {
-	if (props.type == undefined)
-				props.type = BAR_FRACTION;
     var bValid = typeof(props.type) !== "undefined" && props.type !== null;
 
     if(bValid)
@@ -576,7 +574,7 @@ old_CBarFraction.prototype.setSimple = function(flag)
     else
         this.setReduct(1);
 
-    this./**/Resize();
+    this.Resize();
 }
 
 //////////

Word/Math/mathText.js

@@ -184,7 +184,7 @@ CMathText.prototype =
 
         this.size = {width: _width, widthG: widthG, height: _height, center: _center, ascent: _ascent, descent: _descent};
     },
-    resize: function(oMeasure)
+    Resize: function(oMeasure)
     {
         var letter = this.getCode();
 
@@ -341,10 +341,6 @@ CMathText.prototype =
         this.size.center = this.size.center*(this.transform.sy + this.transform.shy);*/
 
     },
-    Resize: function(oMeasure)
-    {
-        this.resize(oMeasure);
-    },
     IsJustDraw: function()
     {
         return this.bJDraw;

Word/Math/operators.js

@@ -2533,14 +2533,14 @@ COperator.prototype.getProps = function(props, defaultProps)
     this.defaultType = defaultProps.type;
 
     var bDelimiter = this.type == OPER_DELIMITER || this.type == OPER_SEPARATOR,
-        bType = typeof(props.type)!=="undefined" &&  props.type !== null,
+        bNotType = typeof(props.type)=="undefined" ||  props.type == null,
         bEmptyStr = typeof(chr) === "string" && chr.length == 0,
         bCode = typeof(chr) === "string" && chr.length > 0;
 
     var code = bCode ? chr.charCodeAt(0) : null;
 
-    var bDPrpDelim =  bDelimiter && !bType && bEmptyStr,
-        bDPrpOther =  !bDelimiter && !bType && !bCode;
+    var bDPrpDelim =  bDelimiter && bNotType && bEmptyStr,
+        bDPrpOther =  !bDelimiter && bNotType && !bCode;
 
     if(bDPrpDelim || bDPrpOther)
     {
@@ -2722,15 +2722,6 @@ CDelimiter.prototype.init = function(props)
     else if(props.grow == false || props.grow == 0)
         this.grow = false;
 
-    if(props.begChr == undefined)
-        props.begChrType = PARENTHESIS_LEFT;
-
-    if(props.endChr == undefined)
-        props.endChrType = PARENTHESIS_RIGHT;
-
-    if(props.endChr == undefined && props.column >1)
-        props.sepChrType = DELIMITER_LINE;
-
     var begPrp =
     {
         chr:   props.begChr,
@@ -3253,7 +3244,7 @@ CGroupCharacter.prototype.init = function(props)
     /*this.setOperator(new COperator(glyph));*/
 
     if(this.operator.IsArrow())
-        this.setReduct(DEGR_REDUCT); /// заменить впоследствии на более подходящую функцию
+        this.setReduct(DEGR_REDUCT);
 }
 CGroupCharacter.prototype.getCenter = function()
 {

Word/Math/test_composition.js

@@ -18,7 +18,7 @@ function simulatorMComposition( MComposition, ttype)
 
     props =
     {
-        type:   BAR_FRACTION
+        //type:   BAR_FRACTION
     };
     var fract = new CFraction();
     addToContent_ForRead(accent.getBase(), fract, props);
@@ -52,10 +52,13 @@ function simulatorMComposition( MComposition, ttype)
 
     props =
     {
-        begChrType:        PARENTHESIS_LEFT,
+        begChr: "",
+        endChr: "",
+        sepChr: "",
+        //begChrType:        PARENTHESIS_LEFT,
         //endChrType:      PARENTHESIS_RIGHT,
-        endChr:             ")",
-        sepChrType:        DELIMITER_LINE,
+        //endChr:             ")",
+        //sepChrType:        DELIMITER_LINE,
         column:            2
     };
 
@@ -230,7 +233,7 @@ function simulatorMComposition( MComposition, ttype)
 
     lastElem.addTxt("w");
 
-    var oper = new CGroupCharacter();
+    /*var oper = new CGroupCharacter();
     props =
     {
         chrType:       DOUBLE_ARROW_LR,
@@ -239,7 +242,7 @@ function simulatorMComposition( MComposition, ttype)
 
     addToContent_ForRead(lastElem, oper, props);
 
-    oper.getBase().addTxt("a");
+    oper.getBase().addTxt("a");*/
 
     lastElem.addTxt("y");