Commit 9c579edf authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed bug #35744

parent 3f024b56
...@@ -1402,7 +1402,7 @@ Paragraph.prototype.Internal_Draw_1 = function(CurPage, pGraphics, Pr) ...@@ -1402,7 +1402,7 @@ Paragraph.prototype.Internal_Draw_1 = function(CurPage, pGraphics, Pr)
if (this.bFromDocument && (pGraphics.RENDERER_PDF_FLAG !== true)) if (this.bFromDocument && (pGraphics.RENDERER_PDF_FLAG !== true))
{ {
// Если данный параграф зажат другим пользователем, рисуем соответствующий знак // Если данный параграф зажат другим пользователем, рисуем соответствующий знак
if (AscCommon.locktype_None != this.Lock.Get_Type()) if (AscCommon.locktype_None != this.Lock.Get_Type() && this.LogicDocument && !this.LogicDocument.IsViewModeInReview())
{ {
if (( CurPage > 0 || false === this.IsStartFromNewPage() || null === this.Get_DocumentPrev() )) if (( CurPage > 0 || false === this.IsStartFromNewPage() || null === this.Get_DocumentPrev() ))
{ {
...@@ -9237,7 +9237,7 @@ Paragraph.prototype.UpdateCursorType = function(X, Y, CurPage) ...@@ -9237,7 +9237,7 @@ Paragraph.prototype.UpdateCursorType = function(X, Y, CurPage)
this.DrawingDocument.SetCursorType("default", MMData); this.DrawingDocument.SetCursorType("default", MMData);
var Bounds = this.Pages[CurPage].Bounds; var Bounds = this.Pages[CurPage].Bounds;
if (true === this.Lock.Is_Locked() && X < Bounds.Right && X > Bounds.Left && Y > Bounds.Top && Y < Bounds.Bottom) if (true === this.Lock.Is_Locked() && X < Bounds.Right && X > Bounds.Left && Y > Bounds.Top && Y < Bounds.Bottom && this.LogicDocument && !this.LogicDocument.IsViewModeInReview())
{ {
var _X = this.Pages[CurPage].X; var _X = this.Pages[CurPage].X;
var _Y = this.Pages[CurPage].Y; var _Y = this.Pages[CurPage].Y;
......
...@@ -2357,6 +2357,9 @@ background-repeat: no-repeat;\ ...@@ -2357,6 +2357,9 @@ background-repeat: no-repeat;\
}; };
asc_docs_api.prototype.asc_Save = function(isAutoSave, isUndoRequest, isIdle) asc_docs_api.prototype.asc_Save = function(isAutoSave, isUndoRequest, isIdle)
{ {
if (this.WordControl.m_oLogicDocument.IsViewModeInReview())
return false;
var res = false; var res = false;
this.IsUserSave = !isAutoSave; this.IsUserSave = !isAutoSave;
if (this.saveCheck()) if (this.saveCheck())
......
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