Commit 672282d3 authored by Sergey.Tsarkov's avatar Sergey.Tsarkov Committed by Alexander.Trofimov

поправлены настройки матриц при вставке из меню

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57856 954022d7-b5bf-4e40-9824-e11837661b57
parent 6668b903
...@@ -7027,35 +7027,43 @@ CMathContent.prototype = ...@@ -7027,35 +7027,43 @@ CMathContent.prototype =
var sText = String.fromCharCode(8710); var sText = String.fromCharCode(8710);
this.AddText(groupElem,sText); this.AddText(groupElem,sText);
break; break;
case 209: props = {ctrPrp: new CTextPr(), column:2, row:1, mcJc:MCJC_CENTER}; case 209: var oMcs = [{count: 2, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:1, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
break; break;
case 210: props = {ctrPrp: new CTextPr(), column:1, row:2, mcJc:MCJC_CENTER}; case 210: var oMcs = [{count: 1, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:2, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
break; break;
case 211: props = {ctrPrp: new CTextPr(), column:3, row:1, mcJc:MCJC_CENTER}; case 211: var oMcs = [{count: 3, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:1, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
break; break;
case 212: props = {ctrPrp: new CTextPr(), column:1, row:3, mcJc:MCJC_CENTER}; case 212: var oMcs = [{count: 1, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:3, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
break; break;
case 213: props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER}; case 213: var oMcs = [{count: 2, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:2, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
break; break;
case 214: props = {ctrPrp: new CTextPr(), column:3, row:2, mcJc:MCJC_CENTER}; case 214: var oMcs = [{count: 3, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:2, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
break; break;
case 215: props = {ctrPrp: new CTextPr(), column:2, row:3, mcJc:MCJC_CENTER}; case 215: var oMcs = [{count: 2, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:3, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
break; break;
case 216: props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:MCJC_CENTER}; case 216: var oMcs = [{count: 3, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:3, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
break; break;
...@@ -7071,7 +7079,8 @@ CMathContent.prototype = ...@@ -7071,7 +7079,8 @@ CMathContent.prototype =
case 220: var sText = String.fromCharCode(8945); case 220: var sText = String.fromCharCode(8945);
this.AddText(this,sText); this.AddText(this,sText);
break; break;
case 221: props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER}; case 221: var oMcs = [{count: 2, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:2, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
var oElem = oMatrix.getElement(0,0); var oElem = oMatrix.getElement(0,0);
...@@ -7083,7 +7092,8 @@ CMathContent.prototype = ...@@ -7083,7 +7092,8 @@ CMathContent.prototype =
oElem = oMatrix.getElement(1,1); oElem = oMatrix.getElement(1,1);
this.AddText(oElem, "1"); this.AddText(oElem, "1");
break; break;
case 222: props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER, plcHide:1}; case 222: var oMcs = [{count: 2, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:2, mcs: oMcs, plcHide:1};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
var oElem = oMatrix.getElement(0,0); var oElem = oMatrix.getElement(0,0);
...@@ -7091,7 +7101,8 @@ CMathContent.prototype = ...@@ -7091,7 +7101,8 @@ CMathContent.prototype =
oElem = oMatrix.getElement(1,1); oElem = oMatrix.getElement(1,1);
this.AddText(oElem, "1"); this.AddText(oElem, "1");
break; break;
case 223: props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:MCJC_CENTER}; case 223: var oMcs = [{count: 3, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:3, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
var oElem = oMatrix.getElement(0,0); var oElem = oMatrix.getElement(0,0);
...@@ -7113,7 +7124,8 @@ CMathContent.prototype = ...@@ -7113,7 +7124,8 @@ CMathContent.prototype =
oElem = oMatrix.getElement(2,2); oElem = oMatrix.getElement(2,2);
this.AddText(oElem, "1"); this.AddText(oElem, "1");
break; break;
case 224: props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:MCJC_CENTER, plcHide:1}; case 224: var oMcs = [{count: 3, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:3, mcs: oMcs, plcHide:1};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this); this.CreateElem(oMatrix,this);
var oElem = oMatrix.getElement(0,0); var oElem = oMatrix.getElement(0,0);
...@@ -7128,7 +7140,8 @@ CMathContent.prototype = ...@@ -7128,7 +7140,8 @@ CMathContent.prototype =
this.CreateElem(oDelimiter,this); this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0); var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER}; var oMcs = [{count: 2, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:2, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase); this.CreateElem(oMatrix,delimiterBase);
break; break;
...@@ -7137,7 +7150,8 @@ CMathContent.prototype = ...@@ -7137,7 +7150,8 @@ CMathContent.prototype =
this.CreateElem(oDelimiter,this); this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0); var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER}; var oMcs = [{count: 2, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:2, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase); this.CreateElem(oMatrix,delimiterBase);
break; break;
...@@ -7146,7 +7160,8 @@ CMathContent.prototype = ...@@ -7146,7 +7160,8 @@ CMathContent.prototype =
this.CreateElem(oDelimiter,this); this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0); var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER}; var oMcs = [{count: 2, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:2, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase); this.CreateElem(oMatrix,delimiterBase);
break; break;
...@@ -7155,7 +7170,8 @@ CMathContent.prototype = ...@@ -7155,7 +7170,8 @@ CMathContent.prototype =
this.CreateElem(oDelimiter,this); this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0); var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER}; var oMcs = [{count: 2, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:2, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase); this.CreateElem(oMatrix,delimiterBase);
break; break;
...@@ -7164,7 +7180,8 @@ CMathContent.prototype = ...@@ -7164,7 +7180,8 @@ CMathContent.prototype =
this.CreateElem(oDelimiter,this); this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0); var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:MCJC_CENTER}; var oMcs = [{count: 3, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:3, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase); this.CreateElem(oMatrix,delimiterBase);
...@@ -7194,7 +7211,8 @@ CMathContent.prototype = ...@@ -7194,7 +7211,8 @@ CMathContent.prototype =
this.CreateElem(oDelimiter,this); this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0); var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:MCJC_CENTER}; var oMcs = [{count: 3, mcJc:MCJC_CENTER}];
props = {ctrPrp: new CTextPr(), row:3, mcs: oMcs};
var oMatrix = new CMathMatrix(props); var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase); this.CreateElem(oMatrix,delimiterBase);
......
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