Skip to content

S
sdkjs
Commit beda2957 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

Поправлен баг с зависанием на 100% при открытии презентации с изменениями, в... 

Поправлен баг с зависанием на 100% при открытии презентации с изменениями, в которых имеются картинки или шрифты.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64950 954022d7-b5bf-4e40-9824-e11837661b57
parent 883bf368
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 53 deletions
PowerPoint/api.js
View file @ beda2957
......@@ -3850,24 +3850,25 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
CollaborativeEditing.Apply_Changes();
CollaborativeEditing.Release_Locks();
this.bNoSendComments = false;
this.isApplyChangesOnOpen = false;
if(OtherChanges)
var _slides = this.WordControl.m_oLogicDocument.Slides;
var _slidesCount = _slides.length;
for (var i = 0; i < _slidesCount; i++)
{
var _slides = this.WordControl.m_oLogicDocument.Slides;
var _slidesCount = _slides.length;
for (var i = 0; i < _slidesCount; i++)
var slideComments = _slides[i].slideComments;
if(slideComments)
{
var slideComments = _slides[i].slideComments;
if(slideComments)
var _comments = slideComments.comments;
var _commentsCount = _comments.length;
for (var j = 0; j < _commentsCount; j++)
{
var _comments = slideComments.comments;
var _commentsCount = _comments.length;
for (var j = 0; j < _commentsCount; j++)
{
this.sync_AddComment(_comments[j].Get_Id(), _comments[j].Data );
}
this.sync_AddComment(_comments[j].Get_Id(), _comments[j].Data );
}
}
}
this.bAddComments = true;
if(OtherChanges)
{
return;
}
......@@ -3927,35 +3928,34 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
}
this.WordControl.m_oLogicDocument.Document_UpdateInterfaceState();
this.WordControl.m_oLogicDocument.Document_UpdateRulersState();
this.WordControl.m_oLogicDocument.Document_UpdateSelectionState();
this.LoadedObject = null;
this.bInit_word_control = true;
var _slides = this.WordControl.m_oLogicDocument.Slides;
var _slidesCount = _slides.length;
for (var i = 0; i < _slidesCount; i++)
if(!(this.bAddComments === true) && !this.bNoSendComments)
{
var slideComments = _slides[i].slideComments;
if(slideComments)
var _slides = this.WordControl.m_oLogicDocument.Slides;
var _slidesCount = _slides.length;
for (var i = 0; i < _slidesCount; i++)
{
var _comments = slideComments.comments;
var _commentsCount = _comments.length;
for (var j = 0; j < _commentsCount; j++)
var slideComments = _slides[i].slideComments;
if(slideComments)
{
this.sync_AddComment(_comments[j].Get_Id(), _comments[j].Data );
var _comments = slideComments.comments;
var _commentsCount = _comments.length;
for (var j = 0; j < _commentsCount; j++)
{
this.sync_AddComment(_comments[j].Get_Id(), _comments[j].Data );
}
}
}
}
this.asc_fireCallback("asc_onDocumentContentReady");
this.isApplyChangesOnOpen = false;
this.bAddComments = false;
this.WordControl.InitControl();
if (bIsScroll)
{
this.WordControl.OnScroll();
......
Word/Editor/GraphicObjects/DrawingStates.js
View file @ beda2957
......@@ -583,38 +583,36 @@ RotateState.prototype =
}
if(bMoveState && e.CtrlKey)
{
if(e.CtrlKey)
for(i = 0; i < aNearestPos.length; ++i)
{
for(i = 0; i < aNearestPos.length; ++i)
if(aDrawings[i].Locked !== true)
checkObjectInArray(aCheckParagraphs, aNearestPos[i].Paragraph);
else
checkObjectInArray(aCheckParagraphs, aParentParagraphs[i]);
}
if(false === editor.isViewMode && false === this.drawingObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_ElementsArray_and_Type , Elements : aCheckParagraphs, CheckType : changestype_Paragraph_Content}))
{
this.drawingObjects.resetSelection();
History.Create_NewPoint(historydescription_Document_RotateFlowDrawingCtrl);
for(i = 0; i < this.drawingObjects.arrTrackObjects.length; ++i)
{
bounds = aBounds[i];
para_drawing = aDrawings[i].Copy();
para_drawing.Set_RelativeHeight(this.drawingObjects.getZIndex());
if(aDrawings[i].Locked !== true)
checkObjectInArray(aCheckParagraphs, aNearestPos[i].Paragraph);
{
aNearestPos[i].Paragraph.Check_NearestPos(aNearestPos[i]);
para_drawing.Set_XYForAdd(bounds.posX, bounds.posY, aNearestPos[i], pageIndex);
para_drawing.Add_ToDocument(aNearestPos[i], false);
}
else
checkObjectInArray(aCheckParagraphs, aParentParagraphs[i]);
}
if(false === editor.isViewMode && false === this.drawingObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_ElementsArray_and_Type , Elements : aCheckParagraphs, CheckType : changestype_Paragraph_Content}))
{
this.drawingObjects.resetSelection();
History.Create_NewPoint(historydescription_Document_RotateFlowDrawingCtrl);
for(i = 0; i < this.drawingObjects.arrTrackObjects.length; ++i)
{
bounds = aBounds[i];
para_drawing = aDrawings[i].Copy();
if(aDrawings[i].Locked !== true)
{
aNearestPos[i].Paragraph.Check_NearestPos(aNearestPos[i]);
para_drawing.Set_XYForAdd(bounds.posX, bounds.posY, aNearestPos[i], pageIndex);
para_drawing.Add_ToDocument(aNearestPos[i], false);
}
else
{
para_drawing.Set_XY(bounds.posX, bounds.posY, aDrawings[i].Get_ParentParagraph(), pageIndex, true);
para_drawing.Add_ToDocument2(aDrawings[i].Get_ParentParagraph());
}
this.drawingObjects.selectObject(para_drawing.GraphicObj, pageIndex);
para_drawing.Set_XY(bounds.posX, bounds.posY, aDrawings[i].Get_ParentParagraph(), pageIndex, true);
para_drawing.Add_ToDocument2(aDrawings[i].Get_ParentParagraph());
}
this.drawingObjects.document.Recalculate();
this.drawingObjects.selectObject(para_drawing.GraphicObj, pageIndex);
}
this.drawingObjects.document.Recalculate();
}
}
else
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7