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

правка бага 21780 - [CoEdit] Не пропадает лок удаленного слайда после получения изменений

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51416 954022d7-b5bf-4e40-9824-e11837661b57
parent e4cf369d
...@@ -258,7 +258,7 @@ function CPresentation(DrawingDocument) ...@@ -258,7 +258,7 @@ function CPresentation(DrawingDocument)
this.SectPr = new SectPr(); this.SectPr = new SectPr();
this.SectPr.Set_PageSize( 793.7, 1122,53 ); this.SectPr.Set_PageSize( 793.7, 1122,53 );
this.SectPr.Set_PageMargins( { Left : 75.6 } ); this.SectPr.Set_PageMargins( { Left : 75.6 } );
this.slidesToUnlock = [];
this.ContentLastChangePos = 0; this.ContentLastChangePos = 0;
...@@ -734,6 +734,11 @@ CPresentation.prototype = ...@@ -734,6 +734,11 @@ CPresentation.prototype =
} }
if(this.Slides[this.CurPage]) if(this.Slides[this.CurPage])
this.Slides[this.CurPage].graphicObjects.updateSelectionState(); this.Slides[this.CurPage].graphicObjects.updateSelectionState();
for(var i = 0; i < this.slidesToUnlock.length; ++i)
{
this.DrawingDocument.UnLockSlide(this.slidesToUnlock[i]);
}
this.slidesToUnlock.length = 0;
}, },
updateSlideIndexes: function() updateSlideIndexes: function()
...@@ -6649,6 +6654,7 @@ CPresentation.prototype = ...@@ -6649,6 +6654,7 @@ CPresentation.prototype =
// действие совпало, не делаем его // действие совпало, не делаем его
if ( false === ChangesPos ) if ( false === ChangesPos )
break; break;
this.slidesToUnlock.push(ChangesPos);
this.Slides.splice(ChangesPos, 1); this.Slides.splice(ChangesPos, 1);
break; break;
} }
......
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