git-svn-id:...

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

Word/Math/logarithm.js

@@ -219,4 +219,49 @@ CMathFunc.prototype.getFunction = function()
 CMathFunc.prototype.getArgument = function()
 {
     return this.elements[0][1];
-}
\ No newline at end of file
+}
+
+
+
+function old_CTrigFunc(num)
+{
+    if(num != num + 0 || num < 0 || num > 14)
+        return;
+
+    this.num = num;
+    //CSubMathBase.call(this, 1, 2);
+    CMathBase.call(this, 1,2);
+
+}
+//extend(old_CTrigFunc,CSubMathBase);
+extend(old_CTrigFunc, CMathBase);
+old_CTrigFunc.prototype.setContent = function()
+{
+    var oFunc = new CMathContent();
+    var GParms = Common_CopyObj(this.params);
+    GParms.bMText = false;
+
+    oFunc.init(GParms);
+    oFunc.setContent.apply(oFunc, NameFunctions.trig[this.num] );
+
+    var oArg  = new CMathContent();
+    oArg.init(this.params);
+    oArg.fillPlaceholders();
+
+    old_CTrigFunc.superclass.setContent.call(this, oFunc, oArg);
+}
+old_CTrigFunc.prototype.setDistance = function()
+{
+    //todo
+    //переделать!
+    this.dW = slashWidth(this.params.font);
+    this.dH = 0;
+}
+old_CTrigFunc.prototype.getFunction = function()
+{
+    return this.elemens[0][0];
+}
+old_CTrigFunc.prototype.getArgument = function()
+{
+    return this.elemens[0][1];
+}

Word/Math/minimax.js

-function CMinimax(num)
-{
-    CSubMathBase.call(this, 1, 2);
-    if(this.num !== this.num - 0 && this.num < 0 && this.num > 2)
-        this.num = 0;
-    else
-        this.num = num;
-
-}
-extend(CMinimax, CSubMathBase);
-CMinimax.prototype.setContent = function()
-{
-    var oBase = new CMathContent();
-    var GParams = Common_CopyObj(this.params);
-    GParams.bMText = false;
-    oBase.init(GParams);
-    oBase.relate(this);
-    oBase.addText(NameFunctions[this.num]);
-
-    var oIter = new CMathBase(1,1);
-    GParams = Common_CopyObj(this.params);
-    GParams.font = getTypeDegree(this.params.font);
-    oIter.init(GParams);
-    oIter.relate(this);
-    oIter.fillPlaceholders();
-
-    var oFunc = new CMathBase(2, 1);
-    oFunc.getCenter = function() { return this.elements[0][0].size.center; };
-    oFunc.init(this.params);
-    oFunc.relate(this);
-    oFunc.setContent(oBase, oIter);
-
-    var oArg = new CMathBase(1, 1);
-    oArg.init(this.params);
-    oArg.relate(this);
-    oArg.fillPlaceholders();
-
-    CMinimax.superclass.setContent.call(this, oFunc, oArg);
-
-}
-CMinimax.prototype.setDistance = function()
-{
-    //todo
-    //переделать !
-    this.dW = slashWidth(this.params.font);
-    this.dH = 0;
-}

Word/Math/trigFunction.js

-function CTrigFunc(num)
-{
-    if(num != num + 0 || num < 0 || num > 14)
-        return;
-
-    this.num = num;
-    //CSubMathBase.call(this, 1, 2);
-    CMathBase.call(this, 1,2);
-
-}
-//extend(CTrigFunc,CSubMathBase);
-extend(CTrigFunc, CMathBase);
-CTrigFunc.prototype.setContent = function()
-{
-    var oFunc = new CMathContent();
-    var GParms = Common_CopyObj(this.params);
-    GParms.bMText = false;
-
-    oFunc.init(GParms);
-    oFunc.setContent.apply(oFunc, NameFunctions.trig[this.num] );
-
-    var oArg  = new CMathContent();
-    oArg.init(this.params);
-    oArg.fillPlaceholders();
-
-    CTrigFunc.superclass.setContent.call(this, oFunc, oArg);
-}
-CTrigFunc.prototype.setDistance = function()
-{
-    //todo
-    //переделать!
-    this.dW = slashWidth(this.params.font);
-    this.dH = 0;
-}
-CTrigFunc.prototype.getFunction = function()
-{
-    return this.elemens[0][0];
-}
-CTrigFunc.prototype.getArgument = function()
-{
-    return this.elemens[0][1];
-}