Commit 00912f15 authored by Igor.Zotov's avatar Igor.Zotov

правка для вставки гиперссылок извне в презентации

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60037 954022d7-b5bf-4e40-9824-e11837661b57
parent 5e6381ee
...@@ -6783,7 +6783,7 @@ PasteProcessor.prototype = ...@@ -6783,7 +6783,7 @@ PasteProcessor.prototype =
if(!this.bIsPlainText) if(!this.bIsPlainText)
{ {
var rPr = this._read_rPr(node); var rPr = this._read_rPr(node);
var Item = new ParaText( rPr); var Item = new ParaTextPr( rPr);
shape.paragraphAdd(Item); shape.paragraphAdd(Item);
} }
for(var i = 0; i < nTabCount; i++) for(var i = 0; i < nTabCount; i++)
...@@ -6874,20 +6874,16 @@ PasteProcessor.prototype = ...@@ -6874,20 +6874,16 @@ PasteProcessor.prototype =
var title = child.getAttribute("title"); var title = child.getAttribute("title");
this.oDocument = shape.txBody.content; this.oDocument = shape.txBody.content;
// bAddParagraph = this._Decide_AddParagraph(child, pPr, bAddParagraph);
var oHyperlink = new ParaHyperlinkStart(); var Pos = ( true == this.oDocument.Selection.Use ? this.oDocument.Selection.StartPos : this.oDocument.CurPos.ContentPos );
oHyperlink.Set_Value( href ); var HyperProps = new CHyperlinkProperty({ Text: null, Value: href, ToolTip: title});
if(null != title) this.oDocument.Content[Pos].Hyperlink_Add( HyperProps );
oHyperlink.Set_ToolTip(title);
shape.paragraphAdd( oHyperlink );
} }
} }
bAddParagraph = this._ExecutePresentation(child, Common_CopyObj(pPr), false, bAddParagraph, bIsBlockChild || bInBlock, arrShapes, arrImages, arrTables); bAddParagraph = this._ExecutePresentation(child, Common_CopyObj(pPr), false, bAddParagraph, bIsBlockChild || bInBlock, arrShapes, arrImages, arrTables);
if(bIsBlockChild) if(bIsBlockChild)
bAddParagraph = true; bAddParagraph = true;
if("a" == sChildNodeName && true == bHyperlink)
shape.paragraphAdd( new ParaHyperlinkEnd() );
} }
if(bRoot) if(bRoot)
{ {
......
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