Commit f26f37bf authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

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

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58732 954022d7-b5bf-4e40-9824-e11837661b57
parent 5da52b76
......@@ -5399,7 +5399,7 @@ Paragraph.prototype =
for ( var CurPos = StartPos; CurPos <= EndPos; CurPos++ )
{
var Element = this.Content[CurPos];
if ( para_Hyperlink === Element.Type /*|| true === Element.Selection_CheckParaEnd()*/ )
if (para_Hyperlink === Element.Type || para_Math === Element.Type /*|| true === Element.Selection_CheckParaEnd()*/ )
return false;
}
......@@ -5408,7 +5408,8 @@ Paragraph.prototype =
else
{
// Внутри гиперссылки мы не можем задать ниперссылку
if ( para_Hyperlink === this.Content[this.CurPos.ContentPos].Type )
var CurType = this.Content[this.CurPos.ContentPos].Type;
if (para_Hyperlink === CurType || para_Math === CurType)
return false;
else
return true;
......@@ -5434,9 +5435,9 @@ Paragraph.prototype =
for ( var CurPos = StartPos; CurPos <= EndPos; CurPos++ )
{
var Element = this.Content[CurPos];
if ( (true === bHyper && para_Hyperlink === Element.Type) /*|| true === Element.Selection_CheckParaEnd()*/ )
if ((true === bHyper && para_Hyperlink === Element.Type) || para_Math === Element.Type /*|| true === Element.Selection_CheckParaEnd()*/)
return false;
else if ( true !== bHyper && para_Hyperlink === Element.Type )
else if (true !== bHyper && para_Hyperlink === Element.Type)
bHyper = true;
}
......@@ -5444,6 +5445,11 @@ Paragraph.prototype =
}
else
{
// Внутри гиперссылки мы не можем задать ниперссылку
var CurType = this.Content[this.CurPos.ContentPos].Type;
if (para_Math === CurType)
return false;
else
return true;
}
}
......
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