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

Bug 30687 - [Autosave] Не сохраняется ScreenTip у гиперссылок

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@65591 954022d7-b5bf-4e40-9824-e11837661b57
parent 891a1652
...@@ -10164,6 +10164,7 @@ function CHyperlink() ...@@ -10164,6 +10164,7 @@ function CHyperlink()
{ {
this.url = ""; this.url = "";
this.action = ""; this.action = "";
this.tooltip = null;
} }
CHyperlink.prototype = CHyperlink.prototype =
......
...@@ -6202,7 +6202,7 @@ function BinaryPPTYLoader() ...@@ -6202,7 +6202,7 @@ function BinaryPPTYLoader()
} }
case 4: case 4:
{ {
var tooltip = s.GetString2(); hyper.tooltip = s.GetString2();
break; break;
} }
case 5: case 5:
...@@ -7305,6 +7305,9 @@ function BinaryPPTYLoader() ...@@ -7305,6 +7305,9 @@ function BinaryPPTYLoader()
{ {
hyperlink = new ParaHyperlink(); hyperlink = new ParaHyperlink();
hyperlink.Set_Value(_run.hlink.url); hyperlink.Set_Value(_run.hlink.url);
if (_run.hlink.tooltip) {
hyperlink.Set_ToolTip(_run.hlink.tooltip);
}
if(!_run.Unifill) if(!_run.Unifill)
{ {
_run.Unifill = CreateUniFillSchemeColorWidthTint(11, 0); _run.Unifill = CreateUniFillSchemeColorWidthTint(11, 0);
...@@ -7440,6 +7443,9 @@ function BinaryPPTYLoader() ...@@ -7440,6 +7443,9 @@ function BinaryPPTYLoader()
{ {
hyperlink = new ParaHyperlink(); hyperlink = new ParaHyperlink();
hyperlink.Set_Value(_run.hlink.url); hyperlink.Set_Value(_run.hlink.url);
if (_run.hlink.tooltip) {
hyperlink.Set_ToolTip(_run.hlink.tooltip);
}
} }
var text_pr = new CTextPr(); var text_pr = new CTextPr();
if(_run.Unifill && !_run.Unifill.fill) if(_run.Unifill && !_run.Unifill.fill)
......
...@@ -1888,6 +1888,7 @@ function CBinaryFileWriter() ...@@ -1888,6 +1888,7 @@ function CBinaryFileWriter()
oThis._WriteString1(0, url); oThis._WriteString1(0, url);
oThis._WriteString2(2, action); oThis._WriteString2(2, action);
oThis._WriteString2(4, hlink.tooltip);
oThis.WriteUChar(g_nodeAttributeEnd); oThis.WriteUChar(g_nodeAttributeEnd);
} }
...@@ -2508,7 +2509,7 @@ function CBinaryFileWriter() ...@@ -2508,7 +2509,7 @@ function CBinaryFileWriter()
} }
case para_Hyperlink: case para_Hyperlink:
{ {
var _hObj = { Value : _elem.Value }; var _hObj = { Value : _elem.Value, tooltip: _elem.Get_ToolTip()};
var _content_len_h = _elem.Content.length; var _content_len_h = _elem.Content.length;
for (var hi = 0; hi < _content_len_h; hi++) for (var hi = 0; hi < _content_len_h; hi++)
......
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