diff --git a/uppsrc/RichEdit/Modify.cpp b/uppsrc/RichEdit/Modify.cpp index 954c4caf5..01ca34527 100644 --- a/uppsrc/RichEdit/Modify.cpp +++ b/uppsrc/RichEdit/Modify.cpp @@ -79,14 +79,14 @@ void RichEdit::Remove(int pos, int len, bool joinnext) if(InvalidRange(pos, pos + len)) return; AddUndo(new UndoRemove(text, pos, len)); - RichText::FormatInfo fmt; - RichPara::Format f = text.GetRichPos(pos).format; - if(joinnext) - fmt.Set(f); +// RichText::FormatInfo fmt; +// RichPara::Format f = text.GetRichPos(pos).format; +// if(joinnext) +// fmt.Set(f); text.Remove(pos, len); - if(!joinnext) - fmt.Set(text.GetRichPos(pos).format); - fmt.newpage = f.newpage; +// if(!joinnext) +// fmt.Set(text.GetRichPos(pos).format); +// fmt.newpage = f.newpage; SetModify(); modified = true; } diff --git a/uppsrc/RichText/TextData.cpp b/uppsrc/RichText/TextData.cpp index 3ff4f5238..ebe49321b 100644 --- a/uppsrc/RichText/TextData.cpp +++ b/uppsrc/RichText/TextData.cpp @@ -86,13 +86,13 @@ void RichText::Remove(int pos, int count) txt.Put(pi, pa, style); } else { - RichPara pa2 = txt.Get(pi2, style); - RichPara pa = txt.Get(pi, pa2.format.styleid, style); + RichPara pa = txt.Get(pi, style); + RichPara pa2 = txt.Get(pi2, pa.format.styleid, style); txt.part.Remove(pi, pi2 - pi); pa.Trim(pos); pa2.Mid(pos2); pa.Append(pa2); - pa.format = pa2.format; + pa2.format = pa.format; txt.Put(pi, pa, style); txt.SetRefreshFrom(pi); }