PaTCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 1bdedf9..bf5b29c 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -3,6 +3,8 @@
   Docs/Developers: Plugins.html
  BUG: [ 1375661 ] Readme incomplete in WinMerge 2.5.0.3
   Docs/Users: ReadMe.txt
+ PaTCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
+  Src: MergeEditView.cpp MergeEditView.h
 
 2005-12-17 Takashi
  PATCH: [ 1378771 ] Fix for BUG:[ 1376552 ] char offset not getting updated when...

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index cce0f4a..ab44861 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -316,16 +316,6 @@ void CMergeEditView::GetFullySelectedDiffs(int & firstDiff, int & lastDiff)
        }
 }
 
-void CMergeEditView::AddMod()
-{
-
-}
-
-void CMergeEditView::ResetMod()
-{
-
-}
-
 void CMergeEditView::OnInitialUpdate()
 {
        CCrystalEditViewEx::OnInitialUpdate();

diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h
index 0bd44c6..5bcab64 100644 (file)
--- a/Src/MergeEditView.h
+++ b/Src/MergeEditView.h
@@ -158,8 +158,6 @@ public:
        void SelectNone();
        void SelectDiff(int nDiff, BOOL bScroll =TRUE, BOOL bSelectText =TRUE);
        virtual CCrystalTextBuffer *LocateTextBuffer ();
-       void ResetMod();
-       void AddMod();
        void GetFullySelectedDiffs(int & firstDiff, int & lastDiff);
        CString GetSelectedText();
        CString GetLineText(int idx);