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

update setTxtPrp to Operators

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50320 954022d7-b5bf-4e40-9824-e11837661b57
parent c63094c9
...@@ -1042,12 +1042,3 @@ CAccent.prototype.getCenter = function() ...@@ -1042,12 +1042,3 @@ CAccent.prototype.getCenter = function()
return center; return center;
} }
CAccent.prototype.setTxtPrp = function(txtPrp)
{
//this.operator.setTxtPrp(txtPrp);
if(this.operator !== null && typeof(this.operator) !== "undefined")
this.operator.setTxtPrp(txtPrp);
CAccent.superclass.setTxtPrp.call(this, txtPrp);
//this.elements[0][0].setTxtPrp(txtPrp);
}
\ No newline at end of file
...@@ -2827,7 +2827,8 @@ asc_docs_api.prototype.put_TextPrFontSize = function(size) ...@@ -2827,7 +2827,8 @@ asc_docs_api.prototype.put_TextPrFontSize = function(size)
this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(); this.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
//this.WordControl.m_oLogicDocument.Paragraph_Add( new ParaTextPr( { FontSize : Math.min(size, 100) } ) ); //this.WordControl.m_oLogicDocument.Paragraph_Add( new ParaTextPr( { FontSize : Math.min(size, 100) } ) );
//** //**
MathControl.SetTxtPrp( { FontSize : Math.min(size, 100) } ); //MathControl.SetTxtPrp( { FontSize : Math.min(size, 100) } );
MathComposition.SetTxtPrp( { FontSize : Math.min(size, 100) } );
//** //**
} }
} }
...@@ -2838,7 +2839,8 @@ asc_docs_api.prototype.put_TextPrBold = function(value) ...@@ -2838,7 +2839,8 @@ asc_docs_api.prototype.put_TextPrBold = function(value)
this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(); this.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
//this.WordControl.m_oLogicDocument.Paragraph_Add( new ParaTextPr( { Bold : value } ) ); //this.WordControl.m_oLogicDocument.Paragraph_Add( new ParaTextPr( { Bold : value } ) );
//** //**
MathControl.SetTxtPrp( { Bold : value } ); //MathControl.SetTxtPrp( { Bold : value } );
MathComposition.SetTxtPrp( { Bold : value } );
//** //**
} }
} }
...@@ -2849,7 +2851,8 @@ asc_docs_api.prototype.put_TextPrItalic = function(value) ...@@ -2849,7 +2851,8 @@ asc_docs_api.prototype.put_TextPrItalic = function(value)
this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(); this.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
//this.WordControl.m_oLogicDocument.Paragraph_Add( new ParaTextPr( { Italic : value } ) ); //this.WordControl.m_oLogicDocument.Paragraph_Add( new ParaTextPr( { Italic : value } ) );
//** //**
MathControl.SetTxtPrp( { Italic : value } ); //MathControl.SetTxtPrp( { Italic : value } );
MathComposition.SetTxtPrp( { Italic : value } );
//** //**
} }
} }
......
...@@ -6848,7 +6848,7 @@ CMathComposition.prototype = ...@@ -6848,7 +6848,7 @@ CMathComposition.prototype =
var Pos = this.SelectContent.CurPos + 1; var Pos = this.SelectContent.CurPos + 1;
var items = this.SelectContent.createEquation(indef); var items = this.SelectContent.createEquation(indef);
//this.Root.setTxtPrp(this.TxtPrp); this.Root.setTxtPrp(this.TxtPrp);
/// ///
this.RecalculateReverse(); this.RecalculateReverse();
......
...@@ -3840,9 +3840,9 @@ CSeparator.prototype.setPosition = function(pos) ...@@ -3840,9 +3840,9 @@ CSeparator.prototype.setPosition = function(pos)
function CDelimiter() function CDelimiter()
{ {
this.begOper = null; this.begOper = new COperator (-1);
this.endOper = null; this.endOper = new COperator (-1);
this.sepOper = null; this.sepOper = new COperator (-1);
this.shape = null; this.shape = null;
CSubMathBase.call(this); CSubMathBase.call(this);
...@@ -4338,6 +4338,13 @@ CDelimiter.prototype.getGlyph = function(chr, type, location) ...@@ -4338,6 +4338,13 @@ CDelimiter.prototype.getGlyph = function(chr, type, location)
return operator; return operator;
} }
CDelimiter.prototype.setTxtPrp = function(txtPrp)
{
this.begOper.setTxtPrp(txtPrp);
this.sepOper.setTxtPrp(txtPrp);
this.endOper.setTxtPrp(txtPrp);
CDelimiter.superclass.setTxtPrp.call(this, txtPrp);
}
/*function GetGlyph_GrChr(chr, location) /*function GetGlyph_GrChr(chr, location)
...@@ -4578,7 +4585,7 @@ CCharacter.prototype.setOperator = function(operator) ...@@ -4578,7 +4585,7 @@ CCharacter.prototype.setOperator = function(operator)
{ {
this.operator = operator; this.operator = operator;
var tPrp = this.getTxtPrp(); var tPrp = this.getTxtPrp();
this.operator.setTxtPrp(tPrp); //this.operator.setTxtPrp(tPrp);
this.setDimension(1, 1); this.setDimension(1, 1);
this.setContent(); this.setContent();
...@@ -4682,6 +4689,13 @@ CCharacter.prototype.getBase = function() ...@@ -4682,6 +4689,13 @@ CCharacter.prototype.getBase = function()
{ {
return this.elements[0][0]; return this.elements[0][0];
} }
CCharacter.prototype.setTxtPrp = function(txtPrp)
{
if(this.operator !== null && typeof(this.operator) !== "undefined")
this.operator.setTxtPrp(txtPrp);
CCharacter.superclass.setTxtPrp.call(this, txtPrp);
}
function CGroupCharacter() function CGroupCharacter()
......
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