Commit 201f9752 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

Bug 23556 - Изменяется местоположение слов при копировании данных, в которых...

Bug 23556 - Изменяется местоположение слов при копировании данных, в которых присутствует ссылки внутри других ссылок

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56942 954022d7-b5bf-4e40-9824-e11837661b57
parent ddfbbbdc
...@@ -631,7 +631,7 @@ CopyProcessor.prototype = ...@@ -631,7 +631,7 @@ CopyProcessor.prototype =
sRes += this.ParseItem(Item.Content[i]); sRes += this.ParseItem(Item.Content[i]);
return sRes; return sRes;
}, },
CopyRunContent: function (Container, bUseSelection) { CopyRunContent: function (Container, bUseSelection, bOmitHyperlink) {
var sRes = ""; var sRes = "";
var ParaStart = 0; var ParaStart = 0;
var ParaEnd = Container.Content.length - 1; var ParaEnd = Container.Content.length - 1;
...@@ -665,6 +665,7 @@ CopyProcessor.prototype = ...@@ -665,6 +665,7 @@ CopyProcessor.prototype =
} }
} }
else if (para_Hyperlink == item.Type) { else if (para_Hyperlink == item.Type) {
if (!bOmitHyperlink) {
sRes += "<a"; sRes += "<a";
var sValue = item.Get_Value(); var sValue = item.Get_Value();
var sToolTip = item.Get_ToolTip(); var sToolTip = item.Get_ToolTip();
...@@ -673,7 +674,10 @@ CopyProcessor.prototype = ...@@ -673,7 +674,10 @@ CopyProcessor.prototype =
if (null != sToolTip && "" != sToolTip) if (null != sToolTip && "" != sToolTip)
sRes += " title=\"" + CopyPasteCorrectString(sToolTip) + "\""; sRes += " title=\"" + CopyPasteCorrectString(sToolTip) + "\"";
sRes += ">"; sRes += ">";
sRes += this.CopyRunContent(item); }
//вложенные ссылки в html запрещены.
sRes += this.CopyRunContent(item, bUseSelection, true);
if (!bOmitHyperlink)
sRes += "</a>"; sRes += "</a>";
} }
else if(para_Math == item.Type){ else if(para_Math == item.Type){
...@@ -802,7 +806,7 @@ CopyProcessor.prototype = ...@@ -802,7 +806,7 @@ CopyProcessor.prototype =
//pPr //pPr
this.Commit_pPr(Item); this.Commit_pPr(Item);
this.Para.innerHTML = this.CopyRunContent(Item, bUseSelection); this.Para.innerHTML = this.CopyRunContent(Item, bUseSelection, false);
if(bLast && false == this.bOccurEndPar) if(bLast && false == this.bOccurEndPar)
{ {
......
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