Commit 60dd83c1 authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed bug #34452

parent 050601ba
...@@ -12289,7 +12289,7 @@ CDocument.prototype.controller_Remove = function(Count, bOnlyText, bRemoveOnlySe ...@@ -12289,7 +12289,7 @@ CDocument.prototype.controller_Remove = function(Count, bOnlyText, bRemoveOnlySe
if ((undefined === CurrFramePr && undefined === PrevFramePr) || ( undefined !== CurrFramePr && undefined !== PrevFramePr && true === CurrFramePr.Compare(PrevFramePr) )) if ((undefined === CurrFramePr && undefined === PrevFramePr) || ( undefined !== CurrFramePr && undefined !== PrevFramePr && true === CurrFramePr.Compare(PrevFramePr) ))
{ {
if (true === this.Is_TrackRevisions()) if (true === this.Is_TrackRevisions() && reviewtype_Add !== this.Content[this.CurPos.ContentPos - 1].Get_ReviewType())
{ {
this.Content[this.CurPos.ContentPos - 1].Set_ReviewType(reviewtype_Remove); this.Content[this.CurPos.ContentPos - 1].Set_ReviewType(reviewtype_Remove);
this.CurPos.ContentPos--; this.CurPos.ContentPos--;
...@@ -12331,7 +12331,7 @@ CDocument.prototype.controller_Remove = function(Count, bOnlyText, bRemoveOnlySe ...@@ -12331,7 +12331,7 @@ CDocument.prototype.controller_Remove = function(Count, bOnlyText, bRemoveOnlySe
if ((undefined === CurrFramePr && undefined === NextFramePr) || ( undefined !== CurrFramePr && undefined !== NextFramePr && true === CurrFramePr.Compare(NextFramePr) )) if ((undefined === CurrFramePr && undefined === NextFramePr) || ( undefined !== CurrFramePr && undefined !== NextFramePr && true === CurrFramePr.Compare(NextFramePr) ))
{ {
if (true === this.Is_TrackRevisions()) if (true === this.Is_TrackRevisions() && reviewtype_Add !== this.Content[this.CurPos.ContentPos].Get_ReviewType())
{ {
this.Content[this.CurPos.ContentPos].Set_ReviewType(reviewtype_Remove); this.Content[this.CurPos.ContentPos].Set_ReviewType(reviewtype_Remove);
this.CurPos.ContentPos++; this.CurPos.ContentPos++;
......
...@@ -3145,7 +3145,7 @@ CDocumentContent.prototype.Remove = function(Count, ...@@ -3145,7 +3145,7 @@ CDocumentContent.prototype.Remove = function(Count,
{ {
if (this.CurPos.ContentPos > 0 && type_Paragraph == this.Content[this.CurPos.ContentPos - 1].GetType()) if (this.CurPos.ContentPos > 0 && type_Paragraph == this.Content[this.CurPos.ContentPos - 1].GetType())
{ {
if (true === this.Is_TrackRevisions()) if (true === this.Is_TrackRevisions() && reviewtype_Add !== this.Content[this.CurPos.ContentPos - 1].Get_ReviewType())
{ {
this.Content[this.CurPos.ContentPos - 1].Set_ReviewType(reviewtype_Remove); this.Content[this.CurPos.ContentPos - 1].Set_ReviewType(reviewtype_Remove);
this.CurPos.ContentPos--; this.CurPos.ContentPos--;
...@@ -3180,7 +3180,7 @@ CDocumentContent.prototype.Remove = function(Count, ...@@ -3180,7 +3180,7 @@ CDocumentContent.prototype.Remove = function(Count,
{ {
if (this.CurPos.ContentPos < this.Content.length - 1 && type_Paragraph == this.Content[this.CurPos.ContentPos + 1].GetType()) if (this.CurPos.ContentPos < this.Content.length - 1 && type_Paragraph == this.Content[this.CurPos.ContentPos + 1].GetType())
{ {
if (true === this.Is_TrackRevisions()) if (true === this.Is_TrackRevisions() && reviewtype_Add !== this.Content[this.CurPos.ContentPos].Get_ReviewType())
{ {
this.Content[this.CurPos.ContentPos].Set_ReviewType(reviewtype_Remove); this.Content[this.CurPos.ContentPos].Set_ReviewType(reviewtype_Remove);
this.CurPos.ContentPos++; this.CurPos.ContentPos++;
......
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