Commit 74588b3a authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=25462 - Copy&Paste: Не сбрасывается...

http://bugzserver/show_bug.cgi?id=25462 - Copy&Paste: Не сбрасывается форматирование с ссылки после удалении ссылки со стороннего ресурса

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58301 954022d7-b5bf-4e40-9824-e11837661b57
parent 02bd0feb
...@@ -4772,6 +4772,9 @@ PasteProcessor.prototype = ...@@ -4772,6 +4772,9 @@ PasteProcessor.prototype =
{ {
if(-1 != text_decoration.indexOf("underline")) if(-1 != text_decoration.indexOf("underline"))
underline = true; underline = true;
else if(-1 != text_decoration.indexOf("none") && node.parentElement && node.parentElement.nodeName.toLowerCase() == "a")
underline = false;
if(-1 != text_decoration.indexOf("line-through")) if(-1 != text_decoration.indexOf("line-through"))
Strikeout = true; Strikeout = true;
} }
...@@ -5829,6 +5832,22 @@ PasteProcessor.prototype = ...@@ -5829,6 +5832,22 @@ PasteProcessor.prototype =
TextPr.Underline = true; TextPr.Underline = true;
oHyperlink.Apply_TextPr( TextPr, undefined, true ); oHyperlink.Apply_TextPr( TextPr, undefined, true );
} }
//проставляем rStyle
if(oHyperlink.Content && oHyperlink.Content.length)
{
if(this.oLogicDocument && this.oLogicDocument.Styles && this.oLogicDocument.Styles.Default && this.oLogicDocument.Styles.Default.Hyperlink && this.oLogicDocument.Styles.Style)
{
var hyperLinkStyle = this.oLogicDocument.Styles.Default.Hyperlink;
for(var k = 0; k < oHyperlink.Content.length; k++)
{
if(oHyperlink.Content[k].Type == para_Run)
oHyperlink.Content[k].Set_RStyle(hyperLinkStyle);
}
}
}
this._Paragraph_Add(oHyperlink); this._Paragraph_Add(oHyperlink);
} }
} }
......
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