Commit a84f84f8 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

не рисовать локи в режиме демонстрации

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64772 954022d7-b5bf-4e40-9824-e11837661b57
parent e6d04dd9
......@@ -196,6 +196,9 @@ function CTransitionAnimation(htmlpage)
g.transform(1,0,0,1,0,0);
g.IsNoDrawingEmptyPlaceholder = true;
if (this.HtmlPage.DemonstrationManager.Mode)
g.IsDemonstrationMode = true;
this.HtmlPage.m_oLogicDocument.DrawPage(slide_num - 1, g);
}
}
......@@ -234,6 +237,9 @@ function CTransitionAnimation(htmlpage)
g.transform(1,0,0,1,0,0);
g.IsNoDrawingEmptyPlaceholder = true;
if (this.HtmlPage.DemonstrationManager.Mode)
g.IsDemonstrationMode = true;
this.HtmlPage.m_oLogicDocument.DrawPage(slide_num, g);
}
}
......@@ -2664,6 +2670,9 @@ function CDemonstrationManager(htmlpage)
g.transform(1,0,0,1,0,0);
g.IsNoDrawingEmptyPlaceholder = true;
if (this.HtmlPage.DemonstrationManager.Mode)
g.IsDemonstrationMode = true;
this.HtmlPage.m_oLogicDocument.DrawPage(slide_num, g);
this.SlideImages[slide_index] = new CCacheSlideImage();
......
......@@ -506,6 +506,8 @@ function CGraphics()
this.TextureFillTransformScaleY = 1;
this.IsThumbnail = false;
this.IsDemonstrationMode = false;
this.GrState = new CGrState();
this.GrState.Parent = this;
......@@ -2043,7 +2045,7 @@ CGraphics.prototype =
DrawLockObjectRect : function(lock_type, x, y, w, h)
{
if (editor.isViewMode || this.IsThumbnail || lock_type == locktype_None)
if (editor.isViewMode || this.IsThumbnail || lock_type == locktype_None || this.IsDemonstrationMode)
return;
if (editor.WordControl.m_oDrawingDocument.IsLockObjectsEnable === false && lock_type == locktype_Mine)
......
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