[Libreoffice-commits] .: sc/source

[Thorsten Behrens]

 sc/source/ui/miscdlgs/conflictsdlg.cxx |   19 -------------------
 1 file changed, 19 deletions(-)

New commits:
commit 90f979416e403a9406d6e7599c40776b1e0ef3f2
Author: Kevin Hunter <hunteke at earlham.edu>
Date:   Thu Nov 4 14:22:49 2010 +0100

    Unused code removal

diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 6e5880a..4ac66f5 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -344,25 +344,6 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA
                     }
                 }
             }
-            else if ( eConflictAction == SC_CONFLICT_ACTION_KEEP_OTHER )
-            {
-                if ( pAction->GetType() == SC_CAT_CONTENT )
-                {
-                    if ( bHandleContentAction )
-                    {
-                        // do nothing
-                        //mpTrack->SelectContent( pAction );
-                    }
-                }
-                else
-                {
-                    if ( bHandleNonContentAction )
-                    {
-                        // do nothing
-                        //mpTrack->Accept( pAction );
-                    }
-                }
-            }
         }
     }
     else