Commit 491dee58 authored by Oleg.Korshul's avatar Oleg.Korshul

Slide panel in zoom

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60178 954022d7-b5bf-4e40-9824-e11837661b57
parent f5d1ba6f
......@@ -800,7 +800,7 @@ function CEditorPage(api)
oWordControl.CalculateDocumentSize();
var lCurPage = oWordControl.m_oDrawingDocument.SlideCurrent;
this.GoToPage(lCurPage);
this.GoToPage(lCurPage, true);
this.ZoomFreePageNum = lCurPage;
if (-1 != lCurPage)
......@@ -820,9 +820,6 @@ function CEditorPage(api)
oWordControl.m_bIsRePaintOnScroll = true;
oWordControl.OnScroll();
if (!oWordControl.m_oDrawingDocument.IsEmptyPresentation)
oWordControl.m_oLogicDocument.Document_UpdateInterfaceState();
}
this.zoom_Out = function()
......@@ -3211,7 +3208,7 @@ function CEditorPage(api)
this.m_oDrawingDocument.CheckGuiControlColors(bIsAttack);
}
this.GoToPage = function(lPageNum)
this.GoToPage = function(lPageNum, isFromZoom)
{
var drDoc = this.m_oDrawingDocument;
......@@ -3240,9 +3237,12 @@ function CEditorPage(api)
this.SlideDrawer.CheckSlide(drDoc.SlideCurrent);
this.m_oApi.sync_BeginCatchSelectedElements();
this.m_oApi.sync_slidePropCallback(this.m_oLogicDocument.Slides[drDoc.SlideCurrent]);
this.m_oApi.sync_EndCatchSelectedElements();
if (true !== isFromZoom)
{
this.m_oApi.sync_BeginCatchSelectedElements();
this.m_oApi.sync_slidePropCallback(this.m_oLogicDocument.Slides[drDoc.SlideCurrent]);
this.m_oApi.sync_EndCatchSelectedElements();
}
this.CalculateDocumentSize(false);
......
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