Commit 6bf584f0 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 27925 - [Copy&Paste] Не происходит вставки гиперссылки из CDE в CPE

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60450 954022d7-b5bf-4e40-9824-e11837661b57
parent 50154fec
...@@ -126,10 +126,25 @@ function CreateUniFillByUniColorCopy(uniColor) ...@@ -126,10 +126,25 @@ function CreateUniFillByUniColorCopy(uniColor)
return ret; return ret;
} }
function CopyRunToPPTX(Run, Paragraph) function CopyRunToPPTX(Run, Paragraph, bHyper)
{ {
var NewRun = new ParaRun(Paragraph, false); var NewRun = new ParaRun(Paragraph, false);
NewRun.Set_Pr( Run.Pr.Copy() ); var RunPr = Run.Pr.Copy();
if(RunPr.RStyle != undefined)
{
RunPr.RStyle = undefined;
}
if(bHyper)
{
if(!RunPr.Unifill)
{
RunPr.Unifill = CreateUniFillSchemeColorWidthTint(11, 0);
}
RunPr.Underline = true;
}
NewRun.Set_Pr( RunPr );
var PosToAdd = 0; var PosToAdd = 0;
for ( var CurPos = 0; CurPos < Run.Content.length; CurPos++ ) for ( var CurPos = 0; CurPos < Run.Content.length; CurPos++ )
...@@ -163,7 +178,7 @@ function ConvertParagraphToPPTX(paragraph, drawingDocument, newParent) ...@@ -163,7 +178,7 @@ function ConvertParagraphToPPTX(paragraph, drawingDocument, newParent)
} }
else if(Item.Type === para_Hyperlink) else if(Item.Type === para_Hyperlink)
{ {
new_paragraph.Internal_Content_Add(new_paragraph.Content.length, ConvertHyperlinkToPPTX(Item, new_paragraph), false);
} }
} }
var EndRun = new ParaRun(new_paragraph); var EndRun = new ParaRun(new_paragraph);
...@@ -174,8 +189,22 @@ function ConvertParagraphToPPTX(paragraph, drawingDocument, newParent) ...@@ -174,8 +189,22 @@ function ConvertParagraphToPPTX(paragraph, drawingDocument, newParent)
function ConvertHyperlinkToPPTX(hyperlink, paragraph) function ConvertHyperlinkToPPTX(hyperlink, paragraph)
{ {
var hyperlink = new ParaHyperlink(); var hyperlink_ret = new ParaHyperlink(), i, item, pos = 0;
return hyperlink; hyperlink_ret.Set_Value( hyperlink.Value );
hyperlink_ret.Set_ToolTip( hyperlink.ToolTip );
for(i = 0; i < hyperlink.Content.length; ++i)
{
item = hyperlink.Content[i];
if(item.Type === para_Run)
{
hyperlink_ret.Add_ToContent(pos++, CopyRunToPPTX(item, paragraph, true));
}
else if(item.Type === para_Hyperlink)
{
hyperlink_ret.Add_ToContent(pos++, ConvertHyperlinkToPPTX(item, paragraph));
}
}
return hyperlink_ret;
} }
function ConvertParagraphToWord(paragraph, docContent) function ConvertParagraphToWord(paragraph, docContent)
......
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