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

Устранена ошибка при отмене изменений внутри гиперссылок и полей (баг 30855).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66218 954022d7-b5bf-4e40-9824-e11837661b57
parent 6943fc73
...@@ -13671,6 +13671,10 @@ Paragraph.prototype.Get_Lock = function() ...@@ -13671,6 +13671,10 @@ Paragraph.prototype.Get_Lock = function()
{ {
return this.Lock; return this.Lock;
}; };
Paragraph.prototype.Get_ContentLength = function()
{
return this.Content.length;
};
var pararecalc_0_All = 0; var pararecalc_0_All = 0;
var pararecalc_0_None = 1; var pararecalc_0_None = 1;
......
...@@ -1122,6 +1122,10 @@ CParagraphContentWithParagraphLikeContent.prototype.Get_ClassesByPos = function( ...@@ -1122,6 +1122,10 @@ CParagraphContentWithParagraphLikeContent.prototype.Get_ClassesByPos = function(
if (0 <= CurPos && CurPos <= this.Content.length - 1) if (0 <= CurPos && CurPos <= this.Content.length - 1)
this.Content[CurPos].Get_ClassesByPos(Classes, ContentPos, Depth + 1); this.Content[CurPos].Get_ClassesByPos(Classes, ContentPos, Depth + 1);
}; };
CParagraphContentWithParagraphLikeContent.prototype.Get_ContentLength = function()
{
return this.Content.length;
};
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Функции пересчета // Функции пересчета
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
......
...@@ -10205,6 +10205,9 @@ ParaRun.prototype.Accept_RevisionChanges = function(Type, bAll) ...@@ -10205,6 +10205,9 @@ ParaRun.prototype.Accept_RevisionChanges = function(Type, bAll)
else if (reviewtype_Remove === ReviewType && (undefined === Type || c_oAscRevisionsChangeType.TextRem === Type)) else if (reviewtype_Remove === ReviewType && (undefined === Type || c_oAscRevisionsChangeType.TextRem === Type))
{ {
Parent.Remove_FromContent(CenterRunPos, 1); Parent.Remove_FromContent(CenterRunPos, 1);
if (Parent.Get_ContentLength() <= 0)
Parent.Add_ToContent(0, new ParaRun());
} }
} }
}; };
...@@ -10266,6 +10269,9 @@ ParaRun.prototype.Reject_RevisionChanges = function(Type, bAll) ...@@ -10266,6 +10269,9 @@ ParaRun.prototype.Reject_RevisionChanges = function(Type, bAll)
if (reviewtype_Add === ReviewType && (undefined === Type || c_oAscRevisionsChangeType.TextAdd === Type)) if (reviewtype_Add === ReviewType && (undefined === Type || c_oAscRevisionsChangeType.TextAdd === Type))
{ {
Parent.Remove_FromContent(CenterRunPos, 1); Parent.Remove_FromContent(CenterRunPos, 1);
if (Parent.Get_ContentLength() <= 0)
Parent.Add_ToContent(0, new ParaRun());
} }
else if (reviewtype_Remove === ReviewType && (undefined === Type || c_oAscRevisionsChangeType.TextRem === Type)) else if (reviewtype_Remove === ReviewType && (undefined === Type || c_oAscRevisionsChangeType.TextRem === Type))
{ {
......
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