Skip to content

S
sdkjs
Commit cc32940e authored by Sergey.Tsarkov's avatar Sergey.Tsarkov Committed by Alexander.Trofimov
Browse files
Options

подключено сохранение формул в бинарник 

поправлено redo в формулах

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53186 954022d7-b5bf-4e40-9824-e11837661b57
parent feb33ec2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 231 additions and 211 deletions
Word/Editor/Serialize2.js
View file @ cc32940e
This diff is collapsed.
Word/Math/mathContent.js
View file @ cc32940e
......@@ -5928,7 +5928,7 @@ CMathContent.prototype =
var Content_start = this.content.slice(0, Pos);
var Content_end = this.content.slice(Pos);
this.setStart_Selection(Pos);
this.setStartPos_Selection(Pos);
//this.selection.active = false;
this.content = Content_start.concat(Data.Items, Content_end);
......@@ -5942,7 +5942,7 @@ CMathContent.prototype =
var Content_start = this.content.slice(0, Pos);
var Content_end = this.content.slice(PosEnd);
this.setStart_Selection(Pos - 1);
this.setStartPos_Selection(Pos);
//this.selection.active = false;
this.content = Content_start.concat(Content_end);
......@@ -7183,11 +7183,9 @@ CMathComposition.prototype =
{
History.Create_NewPoint();
var Pos = this.CurrentContent.CurPos + 1;
var items = this.CurrentContent.addToContent_2(content);
var Pos = this.CurrentContent.CurPos - items.length,
PosEnd = this.CurrentContent.CurPos;
var PosEnd = Pos + items.length;
History.Add(this.CurrentContent, {Type: historyitem_Math_AddItem, Items: items, Pos: Pos, PosEnd: PosEnd});
},
......
Word/api.js
View file @ cc32940e
......@@ -8755,7 +8755,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
oAcc.fillPlaceholders();
break;
case 164: var sChr = String.fromCharCode(9182);
props = {chr:sChr, pos:"top", vertJc:"bot"};
props = {chr:sChr, pos:VJUST_TOP, vertJc:VJUST_BOT};
oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,MathElement.Math.Root,props);
oGroupChr.fillPlaceholders();
......@@ -8772,10 +8772,10 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oLimUpp.getFName();
var sChr = String.fromCharCode(9182);
props = {chr:sChr, pos:"top", vertJc:"bot"};
props = {chr:sChr, pos:VJUST_TOP, vertJc:VJUST_BOT};
oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
var grElem = oGroupChr.getArgument();
var grElem = oGroupChr.getBase();
grElem.fillPlaceholders();
break;
case 167: props = {type:LIMIT_LOW};
......@@ -8787,7 +8787,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
var grElem = oGroupChr.getArgument();
var grElem = oGroupChr.getBase();
grElem.fillPlaceholders();
break;
case 168: var sChr = String.fromCharCode(8406);
......@@ -9052,7 +9052,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8592);
props = {pos:"top", chr:sChr}
props = {pos:VJUST_TOP, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9063,7 +9063,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8594);
props = {pos:"top", chr:sChr}
props = {pos:VJUST_TOP, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9074,7 +9074,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8592);
props = {vertJc:"bot", chr:sChr}
props = {vertJc:VJUST_BOT, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9085,7 +9085,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8594);
props = {vertJc:"bot", chr:sChr}
props = {vertJc:VJUST_BOT, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9096,7 +9096,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8656);
props = {pos:"top", chr:sChr}
props = {pos:VJUST_TOP, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9107,7 +9107,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8658);
props = {pos:"top", chr:sChr}
props = {pos:VJUST_TOP, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9118,7 +9118,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8656);
props = {vertJc:"bot", chr:sChr}
props = {vertJc:VJUST_BOT, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9129,7 +9129,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8658);
props = {vertJc:"bot", chr:sChr}
props = {vertJc:VJUST_BOT, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9140,7 +9140,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8596);
props = {pos:"top", chr:sChr}
props = {pos:VJUST_TOP, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9151,7 +9151,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8596);
props = {vertJc:"bot", chr:sChr}
props = {vertJc:VJUST_BOT, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9162,7 +9162,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8660);
props = {pos:"top", chr:sChr}
props = {pos:VJUST_TOP, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9173,7 +9173,7 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8660);
props = {vertJc:"bot", chr:sChr}
props = {vertJc:VJUST_BOT, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
oGroupChr.fillPlaceholders();
......@@ -9184,10 +9184,10 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8594);
props = {vertJc:"bot", chr:sChr}
props = {vertJc:VJUST_BOT, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
var groupElem = oGroupChr.getArgument();
var groupElem = oGroupChr.getBase();
MathElement.AddText(groupElem,"yields");
break;
case 208: props = {opEmu:1};
......@@ -9196,10 +9196,10 @@ asc_docs_api.prototype.asc_AddMath = function(Type)
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8594);
props = {vertJc:"bot", chr:sChr}
props = {vertJc:VJUST_BOT, chr:sChr}
var oGroupChr = new CGroupCharacter();
MathElement.CreateElem(oGroupChr,oElem,props);
var groupElem = oGroupChr.getArgument();
var groupElem = oGroupChr.getBase();
var sText = String.fromCharCode(8710);
MathElement.AddText(groupElem,sText);
break;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7