Commit 9401d460 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

обработка для гиперссылок

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55760 954022d7-b5bf-4e40-9824-e11837661b57
parent 16a5136c
...@@ -3408,9 +3408,40 @@ ...@@ -3408,9 +3408,40 @@
{ {
case para_Run://*paraRun* case para_Run://*paraRun*
{ {
paraRunContent = content[n].Content; s = this._parseParaRun(content[n], oNewItem, paraPr, s, row, c1, text, formatText);
break;
};
case para_Hyperlink://*link*
{
oNewItem.hyperLink = content[n].Value;
oNewItem.toolTip = content[n].ToolTip;
for(var h = 0; h < content[n].Content.length; h++)
{
switch(content[n].Content[h].Type)
{
case para_Run://*paraRun*
{
s = this._parseParaRun(content[n].Content[h], oNewItem, paraPr, s, row, c1, text, formatText);
break;
};
};
};
break;
};
};
};
},
_parseParaRun: function(paraRun, oNewItem, paraPr, s, row, c1, text, formatText)
{
var paraRunContent = paraRun.Content;
var aResult = this.aResult;
var paragraphFontFamily = paraPr.TextPr.FontFamily.Name;
var cloneNewItem;
cTextPr = content[n].Get_CompiledPr(); var cTextPr = paraRun.Get_CompiledPr();
if(cTextPr && !(paraRunContent.length == 1 && paraRunContent[0] instanceof ParaEnd))//settings for text if(cTextPr && !(paraRunContent.length == 1 && paraRunContent[0] instanceof ParaEnd))//settings for text
formatText = this._getPrParaRun(paraPr, cTextPr); formatText = this._getPrParaRun(paraPr, cTextPr);
else if(!formatText) else if(!formatText)
...@@ -3438,8 +3469,7 @@ ...@@ -3438,8 +3469,7 @@
{ {
//if(!oNewItem.length) //if(!oNewItem.length)
//{ //{
fontFamily = paragraphFontFamily; this.fontsNew[paragraphFontFamily] = 1;
this.fontsNew[fontFamily] = 1;
oNewItem.push(formatText); oNewItem.push(formatText);
//} //}
...@@ -3479,8 +3509,7 @@ ...@@ -3479,8 +3509,7 @@
if(text != "") if(text != "")
{ {
fontFamily = paragraphFontFamily; this.fontsNew[paragraphFontFamily] = 1;
this.fontsNew[fontFamily] = 1;
oNewItem.push(formatText); oNewItem.push(formatText);
...@@ -3493,10 +3522,7 @@ ...@@ -3493,10 +3522,7 @@
text = ""; text = "";
}; };
break; return s;
};
};
};
}, },
_getAllNumberingText: function(Lvl, numberingText) _getAllNumberingText: function(Lvl, numberingText)
...@@ -3816,7 +3842,9 @@ ...@@ -3816,7 +3842,9 @@
result.borders = oNewItem.borders; result.borders = oNewItem.borders;
result.rowSpan = oNewItem.rowSpan; result.rowSpan = oNewItem.rowSpan;
result.colSpan = oNewItem.colSpan; result.colSpan = oNewItem.colSpan;
result.toolTip = result.toolTip;
result.bc = oNewItem.bc; result.bc = oNewItem.bc;
result.hyperLink = oNewItem.hyperLink;
return result; return result;
} }
......
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