Commit 947496bb authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Исправлен баг с заходом в колонтитулы через функции в апи (баг 27167).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60171 954022d7-b5bf-4e40-9824-e11837661b57
parent 111f35fe
...@@ -6869,17 +6869,31 @@ asc_docs_api.prototype.GoToHeader = function(pageNumber) ...@@ -6869,17 +6869,31 @@ asc_docs_api.prototype.GoToHeader = function(pageNumber)
if (this.WordControl.m_oDrawingDocument.IsFreezePage(pageNumber)) if (this.WordControl.m_oDrawingDocument.IsFreezePage(pageNumber))
return; return;
var bForceRedraw = false;
var LogicDocument = this.WordControl.m_oLogicDocument;
if (docpostype_HdrFtr !== LogicDocument.CurPos.Type)
{
LogicDocument.CurPos.Type = docpostype_HdrFtr;
bForceRedraw = true;
}
var oldClickCount = global_mouseEvent.ClickCount; var oldClickCount = global_mouseEvent.ClickCount;
global_mouseEvent.Button = 0; global_mouseEvent.Button = 0;
global_mouseEvent.ClickCount = 2; global_mouseEvent.ClickCount = 1;
this.WordControl.m_oLogicDocument.OnMouseDown(global_mouseEvent, 0, 0, pageNumber);
this.WordControl.m_oLogicDocument.OnMouseUp(global_mouseEvent, 0, 0, pageNumber);
this.WordControl.m_oLogicDocument.OnMouseMove(global_mouseEvent, 0, 0, pageNumber);
this.WordControl.m_oLogicDocument.Cursor_MoveLeft(); LogicDocument.OnMouseDown(global_mouseEvent, 0, 0, pageNumber);
this.WordControl.m_oLogicDocument.Document_UpdateInterfaceState(); LogicDocument.OnMouseUp(global_mouseEvent, 0, 0, pageNumber);
LogicDocument.OnMouseMove(global_mouseEvent, 0, 0, pageNumber);
LogicDocument.Cursor_MoveLeft();
LogicDocument.Document_UpdateInterfaceState();
global_mouseEvent.ClickCount = oldClickCount; global_mouseEvent.ClickCount = oldClickCount;
if (true === bForceRedraw)
{
this.WordControl.m_oDrawingDocument.ClearCachePages();
this.WordControl.m_oDrawingDocument.FirePaint();
}
}; };
asc_docs_api.prototype.GoToFooter = function(pageNumber) asc_docs_api.prototype.GoToFooter = function(pageNumber)
...@@ -6887,17 +6901,31 @@ asc_docs_api.prototype.GoToFooter = function(pageNumber) ...@@ -6887,17 +6901,31 @@ asc_docs_api.prototype.GoToFooter = function(pageNumber)
if (this.WordControl.m_oDrawingDocument.IsFreezePage(pageNumber)) if (this.WordControl.m_oDrawingDocument.IsFreezePage(pageNumber))
return; return;
var bForceRedraw = false;
var LogicDocument = this.WordControl.m_oLogicDocument;
if (docpostype_HdrFtr !== LogicDocument.CurPos.Type)
{
LogicDocument.CurPos.Type = docpostype_HdrFtr;
bForceRedraw = true;
}
var oldClickCount = global_mouseEvent.ClickCount; var oldClickCount = global_mouseEvent.ClickCount;
global_mouseEvent.Button = 0; global_mouseEvent.Button = 0;
global_mouseEvent.ClickCount = 2; global_mouseEvent.ClickCount = 1;
this.WordControl.m_oLogicDocument.OnMouseDown(global_mouseEvent, 0, Page_Height, pageNumber);
this.WordControl.m_oLogicDocument.OnMouseUp(global_mouseEvent, 0, Page_Height, pageNumber);
this.WordControl.m_oLogicDocument.OnMouseMove(global_mouseEvent, 0, 0, pageNumber);
this.WordControl.m_oLogicDocument.Cursor_MoveLeft(); LogicDocument.OnMouseDown(global_mouseEvent, 0, Page_Height, pageNumber);
this.WordControl.m_oLogicDocument.Document_UpdateInterfaceState(); LogicDocument.OnMouseUp(global_mouseEvent, 0, Page_Height, pageNumber);
LogicDocument.OnMouseMove(global_mouseEvent, 0, 0, pageNumber);
LogicDocument.Cursor_MoveLeft();
LogicDocument.Document_UpdateInterfaceState();
global_mouseEvent.ClickCount = oldClickCount; global_mouseEvent.ClickCount = oldClickCount;
if (true === bForceRedraw)
{
this.WordControl.m_oDrawingDocument.ClearCachePages();
this.WordControl.m_oDrawingDocument.FirePaint();
}
}; };
asc_docs_api.prototype.ExitHeader_Footer = function(pageNumber) asc_docs_api.prototype.ExitHeader_Footer = function(pageNumber)
......
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