/////////////////////////////////////////////////////////////////////////////
// CMergeDoc commands
+// remove lines with flags==deleteflags, and clear all others
+static PrepareBufferForRescan(CMergeDoc::CDiffTextBuffer * buf, DWORD deleteflags)
+{
+ for(int ct=buf->GetLineCount()-1; ct>=0; --ct)
+ {
+ if (buf->GetLineFlags(ct) & deleteflags)
+ {
+ buf->DeleteLine(ct);
+ }
+ else
+ buf->SetLineFlag(ct, LF_WINMERGE_FLAGS, FALSE, FALSE, FALSE);
+ }
+}
+
BOOL CMergeDoc::Rescan()
{
// store modified status
BOOL rtMod = m_rtBuf.IsModified();
// remove blank lines and clear winmerge flags
- int ct;
- for(ct=m_ltBuf.GetLineCount()-1; ct>=0; --ct)
- {
- if(m_ltBuf.GetLineFlags(ct) & LF_RIGHT_ONLY)
- {
- m_ltBuf.DeleteLine(ct);
- }
- }
- for(ct=m_rtBuf.GetLineCount()-1; ct>=0; --ct)
- {
- if(m_rtBuf.GetLineFlags(ct) & LF_LEFT_ONLY)
- {
- m_rtBuf.DeleteLine(ct);
- }
- }
+ PrepareBufferForRescan(&m_ltBuf, LF_RIGHT_ONLY);
+ PrepareBufferForRescan(&m_rtBuf, LF_LEFT_ONLY);
// restore modified status
m_ltBuf.SetModified(ltMod);
2003-02-08 Perry
DirDoc.*: Changed from strftime to COleDateTime::Format (respects user prefs).
+ First half of [ 679692 ] Update after editing (with code combination).
2003-02-07
Added 24 missing languages