Commit cb623d19 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Исправлен баг с работой со стилями в документе при включенном режиме рецензирования (баг 30812).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66086 954022d7-b5bf-4e40-9824-e11837661b57
parent a5cc3969
......@@ -15197,7 +15197,7 @@ CDocument.prototype.Update_ForeignCursor = function(CursorInfo, UserId)
//-----------------------------------------------------------------------------------
CDocument.prototype.EndPreview_MailMergeResult = function(){};
CDocument.prototype.Continue_TrackRevisions = function(){};
CDocument.prototype.Set_TrackRevisions = function(bTrack){};
//-----------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------
......@@ -15894,10 +15894,10 @@ CTrackRevisionsManager.prototype.private_GetChangeRelatedParagraphs = function(C
if (LogicDocument && -1 !== ParaIndex)
{
if (ParaIndex < LogicDocument.Get_ElementsCount())
if (ParaIndex < LogicDocument.Get_ElementsCount() - 1)
{
var Element = LogicDocument.Get_ElementByIndex(ParaIndex + 1);
if (type_Paragraph === Element.Get_Type())
if (Element && type_Paragraph === Element.Get_Type())
RelatedParas[Element.Get_Id()] = true;
}
}
......
......@@ -5649,9 +5649,18 @@ asc_docs_api.prototype.GenerateStyles = function()
}
var StylesPainter = new CStylesPainter();
if (null != this.WordControl.m_oLogicDocument)
var LogicDocument = this.WordControl.m_oLogicDocument;
if (LogicDocument)
{
var isTrackRevision = LogicDocument.Is_TrackRevisions();
if (true === isTrackRevision)
LogicDocument.Set_TrackRevisions(false);
StylesPainter.GenerateStyles(this, (null == this.LoadedObject) ? this.WordControl.m_oLogicDocument.Get_Styles().Style : this.LoadedObjectDS);
if (true === isTrackRevision)
LogicDocument.Set_TrackRevisions(true);
}
};
asc_docs_api.prototype.asyncFontsDocumentEndLoaded = function()
......
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