Commit d46f669b authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

1. убрала старые ф-ии из CMathText

2. поправила баг с переопределением имени шрифта при добавлении формулы в текст

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55646 954022d7-b5bf-4e40-9824-e11837661b57
parent 34c11bd2
...@@ -274,6 +274,10 @@ ParaMath.prototype = ...@@ -274,6 +274,10 @@ ParaMath.prototype =
var DefaultPrp = var DefaultPrp =
{ {
FontFamily: {Name : "Cambria Math", Index : -1 }, FontFamily: {Name : "Cambria Math", Index : -1 },
RFonts:
{
Ascii: {Name : "Cambria Math", Index : -1 }
},
FontSize: 11, FontSize: 11,
FontSizeCS: 11, FontSizeCS: 11,
Italic: true, Italic: true,
...@@ -886,14 +890,6 @@ ParaMath.prototype = ...@@ -886,14 +890,6 @@ ParaMath.prototype =
this.Get_EndPos(false, SearchPos.Pos, Depth); this.Get_EndPos(false, SearchPos.Pos, Depth);
SearchPos.DiffX = Diff - 0.0015; SearchPos.DiffX = Diff - 0.0015;
/*var str = "";
for(var i = 0; i < SearchPos.Pos.Data.length; i++)
{
str += SearchPos.Pos.Data[i] + " ";
}
console.log("Get_EndPos : " + str);*/
} }
Result = true; Result = true;
...@@ -989,35 +985,8 @@ ParaMath.prototype = ...@@ -989,35 +985,8 @@ ParaMath.prototype =
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
Set_SelectionContentPos : function(StartContentPos, EndContentPos, Depth, StartFlag, EndFlag) Set_SelectionContentPos : function(StartContentPos, EndContentPos, Depth, StartFlag, EndFlag)
{ {
/*var startStr = "";
if(StartContentPos !== null)
{
for(var i = 0; i < StartContentPos.Data.length; i++)
{
startStr += StartContentPos.Data[i] + " ";
}
console.log("StartContent : " + startStr);
}
var endStr = "";
if(EndContentPos !== null)
{
for(var i = 0; i < EndContentPos.Data.length; i++)
{
endStr += EndContentPos.Data[i] + " ";
}
console.log("EndContent : " + endStr);
}*/
// TODO: ParaMath.Set_SelectionContentPos // TODO: ParaMath.Set_SelectionContentPos
this.Root.Set_SelectionContentPos(StartContentPos, EndContentPos, Depth, StartFlag, EndFlag); this.Root.Set_SelectionContentPos(StartContentPos, EndContentPos, Depth, StartFlag, EndFlag);
this.bSelectionUse = true; this.bSelectionUse = true;
...@@ -1038,7 +1007,6 @@ ParaMath.prototype = ...@@ -1038,7 +1007,6 @@ ParaMath.prototype =
// TODO: ParaMath.Selection_Remove // TODO: ParaMath.Selection_Remove
this.bSelectionUse = false; this.bSelectionUse = false;
}, },
Select_All : function(Direction) Select_All : function(Direction)
{ {
......
...@@ -7739,6 +7739,10 @@ CMathContent.prototype = ...@@ -7739,6 +7739,10 @@ CMathContent.prototype =
Get_LeftPos: function() Get_LeftPos: function()
{ {
},
Selection_Remove: function()
{
}, },
////////////////////////// //////////////////////////
......
This diff is collapsed.
...@@ -95,13 +95,6 @@ var TXT_DOUBLE_STRUCK = 4; ...@@ -95,13 +95,6 @@ var TXT_DOUBLE_STRUCK = 4;
var TXT_SANS_SERIF = 5; var TXT_SANS_SERIF = 5;
var TXT_MONOSPACE = 6; var TXT_MONOSPACE = 6;
/*var SCR_ROMAN = 0;
var SCR_SCRIPT = 1;
var SCR_FRAKTUR = 2;
var SCR_DOUBLE_STRUCK = 3;
var SCR_SANS_SERIF = 4;
var SCR_MONOSPACE = 5;*/
var OPER_DELIMITER = 0; var OPER_DELIMITER = 0;
var OPER_SEPARATOR = 1; var OPER_SEPARATOR = 1;
var OPER_GROUP_CHAR = 2; var OPER_GROUP_CHAR = 2;
......
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