summaryrefslogtreecommitdiffstats
path: root/sc/source/ui/miscdlgs/conflictsdlg.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/miscdlgs/conflictsdlg.cxx')
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx16
1 files changed, 4 insertions, 12 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 23704b345a29..907938dc27db 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -653,32 +653,24 @@ void ScConflictsDlg::KeepAllHandler( bool bMine )
EndDialog( RET_OK );
}
-IMPL_LINK_NOARG(ScConflictsDlg, KeepMineHandle)
+IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepMineHandle, Button*, void)
{
KeepHandler( true );
-
- return 0;
}
-IMPL_LINK_NOARG(ScConflictsDlg, KeepOtherHandle)
+IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepOtherHandle, Button*, void)
{
KeepHandler( false );
-
- return 0;
}
-IMPL_LINK_NOARG(ScConflictsDlg, KeepAllMineHandle)
+IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepAllMineHandle, Button*, void)
{
KeepAllHandler( true );
-
- return 0;
}
-IMPL_LINK_NOARG(ScConflictsDlg, KeepAllOthersHandle)
+IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepAllOthersHandle, Button*, void)
{
KeepAllHandler( false );
-
- return 0;
}
void ScConflictsDlg::UpdateView()