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

Сделано, чтобы при генерации стилей не рисовались невидимые символы параграфа (баг 30995).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66401 954022d7-b5bf-4e40-9824-e11837661b57
parent 37ddffcb
...@@ -15180,6 +15180,20 @@ CDocument.prototype.private_ToggleParagraphAlignByHotkey = function(Align) ...@@ -15180,6 +15180,20 @@ CDocument.prototype.private_ToggleParagraphAlignByHotkey = function(Align)
} }
} }
}; };
CDocument.prototype.Is_ShowParagraphMarks = function()
{
return this.Api.ShowParaMarks;
};
CDocument.prototype.Set_ShowParagraphMarks = function(isShow, isRedraw)
{
this.Api.ShowParaMarks = isShow;
if (true === isRedraw)
{
this.DrawingDocument.ClearCachePages();
this.DrawingDocument.FirePaint();
}
};
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
// Private // Private
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
......
...@@ -5478,14 +5478,21 @@ asc_docs_api.prototype.GenerateStyles = function() ...@@ -5478,14 +5478,21 @@ asc_docs_api.prototype.GenerateStyles = function()
if (LogicDocument) if (LogicDocument)
{ {
var isTrackRevision = LogicDocument.Is_TrackRevisions(); var isTrackRevision = LogicDocument.Is_TrackRevisions();
var isShowParaMarks = LogicDocument.Is_ShowParagraphMarks();
if (true === isTrackRevision) if (true === isTrackRevision)
LogicDocument.Set_TrackRevisions(false); LogicDocument.Set_TrackRevisions(false);
if (true === isShowParaMarks)
LogicDocument.Set_ShowParagraphMarks(false, false);
StylesPainter.GenerateStyles(this, (null == this.LoadedObject) ? this.WordControl.m_oLogicDocument.Get_Styles().Style : this.LoadedObjectDS); StylesPainter.GenerateStyles(this, (null == this.LoadedObject) ? this.WordControl.m_oLogicDocument.Get_Styles().Style : this.LoadedObjectDS);
if (true === isTrackRevision) if (true === isTrackRevision)
LogicDocument.Set_TrackRevisions(true); LogicDocument.Set_TrackRevisions(true);
if (true === isShowParaMarks)
LogicDocument.Set_ShowParagraphMarks(true, false);
} }
}; };
asc_docs_api.prototype.asyncFontsDocumentEndLoaded = function() 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