Commit a36f96f9 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

баг с миганием линеек в документе

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66239 954022d7-b5bf-4e40-9824-e11837661b57
parent 7d11db18
...@@ -5604,7 +5604,7 @@ DrawingObjectsController.prototype = ...@@ -5604,7 +5604,7 @@ DrawingObjectsController.prototype =
loadDocumentStateAfterLoadChanges: function(oSelectionState, PageIndex) loadDocumentStateAfterLoadChanges: function(oSelectionState, PageIndex)
{ {
var bDocument = isRealObject(this.document); var bDocument = isRealObject(this.document), bNeedRecalculateCurPos = false;
var nPageIndex = 0; var nPageIndex = 0;
if(isRealNumber(PageIndex)){ if(isRealNumber(PageIndex)){
nPageIndex = PageIndex; nPageIndex = PageIndex;
...@@ -5634,10 +5634,7 @@ DrawingObjectsController.prototype = ...@@ -5634,10 +5634,7 @@ DrawingObjectsController.prototype =
else else
{ {
oDocContent.Set_ContentPosition(oSelectionState.Pos, 0, 0); oDocContent.Set_ContentPosition(oSelectionState.Pos, 0, 0);
if(this.document){ bNeedRecalculateCurPos = true;
this.document.NeedUpdateTarget = true;
this.document.RecalculateCurPos();
}
} }
this.selection.textSelection = oDrawingSelectionState.textObject; this.selection.textSelection = oDrawingSelectionState.textObject;
} }
...@@ -5661,6 +5658,9 @@ DrawingObjectsController.prototype = ...@@ -5661,6 +5658,9 @@ DrawingObjectsController.prototype =
if(oDrawingSelectionState.groupObject.loadDocumentStateAfterLoadChanges(oState, nPageIndex)) if(oDrawingSelectionState.groupObject.loadDocumentStateAfterLoadChanges(oState, nPageIndex))
{ {
this.selection.groupSelection = oDrawingSelectionState.groupObject; this.selection.groupSelection = oDrawingSelectionState.groupObject;
if(!oSelectionState.DrawingSelection){
bNeedRecalculateCurPos = true;
}
} }
} }
} }
...@@ -5699,6 +5699,11 @@ DrawingObjectsController.prototype = ...@@ -5699,6 +5699,11 @@ DrawingObjectsController.prototype =
} }
} }
} }
if(this.document && bNeedRecalculateCurPos){
this.document.NeedUpdateTarget = true;
this.document.RecalculateCurPos();
}
return this.selectedObjects.length > 0; return this.selectedObjects.length > 0;
}, },
......
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