diff options
Diffstat (limited to 'sc/source/ui/miscdlgs')
22 files changed, 72 insertions, 146 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() diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index f4dbff4623f5..2fc9fe903231 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -59,10 +59,9 @@ void ScColOrRowDlg::dispose() } -IMPL_LINK_NOARG(ScColOrRowDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(ScColOrRowDlg, OkHdl, Button*, void) { EndDialog( m_pBtnCols->IsChecked() ? SCRET_COLS : SCRET_ROWS ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 8d7c3f7fe52e..fa24392796b8 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -500,7 +500,7 @@ bool ScColRowNameRangesDlg::IsRefInputMode() const // handler called when OK is clicked, calls the add button handler before // passing the range lists to the document -IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, OkBtnHdl, Button*, void) { AddBtnHdl( 0 ); @@ -514,17 +514,15 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl) pDocShell->SetDocumentModified(); Close(); - return 0; } -IMPL_LINK_NOARG(ScColRowNameRangesDlg, CancelBtnHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, CancelBtnHdl, Button*, void) { Close(); - return 0; } // handler called when add button clicked: set ranges and add to listbox -IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) { OUString aNewArea( pEdAssign->GetText() ); OUString aNewData( pEdAssign2->GetText() ); @@ -577,10 +575,9 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl) pEdAssign2->GrabFocus(); } } - return 0; } -IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) { OUString aRangeStr = pLbRange->GetSelectEntry(); sal_uInt16 nSelectPos = pLbRange->GetSelectEntryPos(); @@ -588,7 +585,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl) (reinterpret_cast<sal_uLong>(pLbRange->GetEntryData( nSelectPos )) == nEntryDataCol); NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr); if (itr == aRangeMap.end()) - return 0; + return; const ScRange& rRange = itr->second; ScRangePair* pPair = NULL; @@ -638,7 +635,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl) Range1SelectHdl( 0 ); } } - return 0; } // handler called when a row in the listbox is selected, updates form input fields @@ -768,7 +764,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl) } // handler for the radio button for columns, adjust ranges -IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, ColClickHdl, Button*, void) { if ( !pBtnColHead->GetSavedValue() ) { @@ -785,11 +781,10 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl) aRange.aEnd.SetRow( MAXROW ); AdjustColRowData( aRange ); } - return 0; } // handler for the radio button for columns, adjust range -IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RowClickHdl, Button*, void) { if ( !pBtnRowHead->GetSavedValue() ) { @@ -806,7 +801,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl) aRange.aEnd.SetCol( MAXCOL ); AdjustColRowData( aRange ); } - return 0; } IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control*, pCtrl ) diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 5b1d6c8f2d6f..4eb2c94bb2ec 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -258,7 +258,7 @@ IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit*, pEdit) return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NewHdl, Button*, void) { ScViewData& rViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -289,10 +289,9 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl) pDocSh->PostPaintGridAll(); } } - return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_PrevHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_PrevHdl, Button*, void) { if (pDoc) { @@ -302,10 +301,9 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_PrevHdl) SetButtonState(); FillCtrls(nCurrentRow); } - return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_NextHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NextHdl, Button*, void) { if (pDoc) { @@ -315,19 +313,17 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_NextHdl) SetButtonState(); FillCtrls(nCurrentRow); } - return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_RestoreHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_RestoreHdl, Button*, void) { if (pDoc) { FillCtrls(nCurrentRow); } - return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_DeleteHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_DeleteHdl, Button*, void) { ScViewData& rViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -344,13 +340,11 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_DeleteHdl) pDocSh->SetDocumentModified(); pDocSh->PostPaintGridAll(); } - return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_CloseHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_CloseHdl, Button*, void) { EndDialog( ); - return 0; } IMPL_LINK_NOARG(ScDataFormDlg, Impl_ScrollHdl) diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 7f6c826a46de..5ba0bd1b6af0 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -40,13 +40,13 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent) get(m_pVclFrameMove, "framemove"); m_pCbUrl->SetSelectHdl( LINK( this, DataStreamDlg, UpdateHdl ) ); - m_pRBAddressValue->SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) ); + m_pRBAddressValue->SetClickHdl( LINK( this, DataStreamDlg, UpdateClickHdl ) ); m_pRBAddressValue->Enable(false); m_pRBScriptData->Enable(false); m_pRBDirectData->Hide(); m_pRBScriptData->Hide(); m_pRBNoMove->Hide(); - m_pRBValuesInLine->SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) ); + m_pRBValuesInLine->SetClickHdl( LINK( this, DataStreamDlg, UpdateClickHdl ) ); m_pEdRange->SetModifyHdl( LINK( this, DataStreamDlg, UpdateHdl ) ); m_pBtnBrowse->SetClickHdl( LINK( this, DataStreamDlg, BrowseHdl ) ); UpdateEnable(); @@ -79,17 +79,20 @@ void DataStreamDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(DataStreamDlg, BrowseHdl) +IMPL_LINK_NOARG_TYPED(DataStreamDlg, BrowseHdl, Button*, void) { sfx2::FileDialogHelper aFileDialog(0, 0); if ( aFileDialog.Execute() != ERRCODE_NONE ) - return 0; + return; m_pCbUrl->SetText( aFileDialog.GetPath() ); UpdateEnable(); - return 0; } +IMPL_LINK_NOARG_TYPED(DataStreamDlg, UpdateClickHdl, Button*, void) +{ + UpdateEnable(); +} IMPL_LINK_NOARG(DataStreamDlg, UpdateHdl) { UpdateEnable(); diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 3ebd534f0e86..3ab1ecb854f4 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -150,11 +150,9 @@ void ScDeleteContentsDlg::DisableObjects() aBtnDelObjects->Disable(); } -IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl) +IMPL_LINK_NOARG_TYPED(ScDeleteContentsDlg, DelAllHdl, Button*, void) { DisableChecks( aBtnDelAll->IsChecked() ); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 73244b6304e8..a254a0ee8aa8 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -251,7 +251,7 @@ bool ScFillSeriesDlg::CheckEndVal() // Handler: -IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) +IMPL_LINK_TYPED( ScFillSeriesDlg, DisableHdl, Button *, pBtn, void ) { if ( pBtn == m_pBtnDate ) { @@ -284,10 +284,9 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) m_pFtEndVal->Disable(); m_pEdEndVal->Disable(); } - return 0; } -IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(ScFillSeriesDlg, OKHdl, Button*, void) { if ( m_pBtnLeft->IsChecked() ) theFillDir = FILL_TO_LEFT; else if ( m_pBtnRight->IsChecked() ) theFillDir = FILL_TO_RIGHT; @@ -328,8 +327,6 @@ IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) ScopedVclPtr<MessageDialog>::Create(this, aErrMsgInvalidVal)->Execute(); pEdWrong->GrabFocus(); } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index b9d893f301f4..d59aec06a6cb 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -183,7 +183,7 @@ bool ScHighlightChgDlg::IsRefInputMode() const return m_pEdAssign->IsVisible(); } -IMPL_LINK( ScHighlightChgDlg, HighlightHandle, CheckBox*, pCb ) +IMPL_LINK_TYPED( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void ) { if(pCb!=NULL) { @@ -200,7 +200,6 @@ IMPL_LINK( ScHighlightChgDlg, HighlightHandle, CheckBox*, pCb ) m_pCbReject->Disable(); } } - return 0; } IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef ) @@ -217,7 +216,7 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef ) return 0; } -IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn ) +IMPL_LINK_TYPED( ScHighlightChgDlg, OKBtnHdl, Button*, pOKBtn, void ) { if (pOKBtn == m_pOkButton) { @@ -246,7 +245,6 @@ IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn ) pViewData->GetDocShell()->PostPaintGridAll(); Close(); } - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 0b3357e9e814..9a7922a03821 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -306,7 +306,7 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) } } -IMPL_LINK( ScInsertContentsDlg, ShortCutHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void ) { if ( pBtn == mpBtnShortCutPasteValuesOnly ) { @@ -341,22 +341,17 @@ IMPL_LINK( ScInsertContentsDlg, ShortCutHdl, PushButton*, pBtn ) nShortCutMoveMode = INS_NONE; EndDialog(RET_OK); } - return 0; } -IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl) +IMPL_LINK_NOARG_TYPED(ScInsertContentsDlg, InsAllHdl, Button*, void) { DisableChecks( mpBtnInsAll->IsChecked() ); - - return 0; } -IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl) +IMPL_LINK_NOARG_TYPED(ScInsertContentsDlg, LinkBtnHdl, Button*, void) { TestModes(); - - return 0; } ScInsertContentsDlg::~ScInsertContentsDlg() diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 11d0458a3ec0..8cef9ad6f2d6 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -268,7 +268,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) return 0; } -IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) +IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, ChoiceHdl_Impl, Button*, void) { if ( m_pBtnNew->IsChecked() ) SetNewTable_Impl(); @@ -276,16 +276,14 @@ IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) SetFromTo_Impl(); DoEnable_Impl(); - return 0; } -IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) +IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseHdl_Impl, Button*, void) { delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScInsertTableDlg, DialogClosedHdl ) ); - return 0; } IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl) @@ -302,7 +300,7 @@ void ScInsertTableDlg::DoEnable_Impl() m_pBtnOk->Disable(); } -IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl) +IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, DoEnterHdl, Button*, void) { if(nTableCount > 1 || ScDocument::ValidTabName(m_pEdName->GetText())) { @@ -313,7 +311,6 @@ IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl) OUString aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); (void)ScopedVclPtrInstance<MessageDialog>::Create(this, aErrMsg)->Execute(); } - return 0; } IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseTimeoutHdl, Timer *, void) diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 3b0d426b7b0f..246cac6e3a0c 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -95,13 +95,12 @@ short ScLinkedAreaDlg::Execute() #define FILTERNAME_HTML "HTML (StarCalc)" #define FILTERNAME_QUERY "calc_HTML_WebQuery" -IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl) +IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, BrowseHdl, Button*, void) { if ( !pDocInserter ) pDocInserter = new sfx2::DocumentInserter( OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg, DialogClosedHdl ) ); - return 0; } IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) @@ -204,10 +203,9 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl) return 0; } -IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl) +IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, ReloadHdl, Button*, void) { UpdateEnable(); - return 0; } IMPL_LINK_TYPED( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index f59a36cb22b2..92c39f599d66 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -96,7 +96,7 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const // Handler: -IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) +IMPL_LINK_NOARG_TYPED(ScMetricInputDlg, SetDefValHdl, Button*, void) { if ( m_pBtnDefVal->IsChecked() ) { @@ -105,7 +105,6 @@ IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) } else m_pEdValue->SetValue( nCurrentValue ); - return 0; } IMPL_LINK_NOARG(ScMetricInputDlg, ModifyHdl) diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 4359e1b9f8d2..6840c5297d0e 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -263,7 +263,7 @@ IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, void *, pBtn ) return 0; } -IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(ScMoveTableDlg, OkHdl, Button*, void) { sal_uInt16 nDocSel = pLbDoc->GetSelectEntryPos(); sal_uInt16 nDocLast = pLbDoc->GetEntryCount()-1; @@ -294,8 +294,6 @@ IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl) } EndDialog( RET_OK ); - - return 0; } IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox *, pLb ) diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 2cb6a11f967e..60cdf3df92cb 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -120,13 +120,12 @@ void ScSolverSuccessDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK( ScSolverSuccessDialog, ClickHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScSolverSuccessDialog, ClickHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) EndDialog(RET_OK); else EndDialog(); - return 0; } ScCursorRefEdit::ScCursorRefEdit( vcl::Window* pParent, vcl::Window *pLabel ) @@ -600,7 +599,7 @@ bool ScOptSolverDlg::IsRefInputMode() const // Handler: -IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScOptSolverDlg, BtnHdl, Button*, pBtn, void ) { if ( pBtn == m_pBtnSolve || pBtn == m_pBtnCancel ) { @@ -640,8 +639,6 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) maProperties = pOptDlg->GetProperties(); } } - - return 0; } IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl ) @@ -679,7 +676,7 @@ IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl) return 0; } -IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScOptSolverDlg, DelBtnHdl, Button*, pBtn, void ) { for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) if( pBtn == mpDelButton[nRow] ) @@ -703,8 +700,6 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) } } } - - return 0; } IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl) diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index 826689fe5392..eac9eac93291 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -89,13 +89,11 @@ void ScTableProtectionDlg::WriteData(ScTableProtection& rData) const void ScTableProtectionDlg::Init() { - Link<> aLink = LINK( this, ScTableProtectionDlg, CheckBoxHdl ); - m_pBtnProtect->SetClickHdl(aLink); + m_pBtnProtect->SetClickHdl(LINK( this, ScTableProtectionDlg, CheckBoxHdl )); - aLink = LINK( this, ScTableProtectionDlg, OKHdl ); - m_pBtnOk->SetClickHdl(aLink); + m_pBtnOk->SetClickHdl(LINK( this, ScTableProtectionDlg, OKHdl )); - aLink = LINK( this, ScTableProtectionDlg, PasswordModifyHdl ); + Link<> aLink = LINK( this, ScTableProtectionDlg, PasswordModifyHdl ); m_pPassword1Edit->SetModifyHdl(aLink); m_pPassword2Edit->SetModifyHdl(aLink); @@ -122,7 +120,7 @@ void ScTableProtectionDlg::EnableOptionalWidgets(bool bEnable) m_pOptionsListBox->Invalidate(); } -IMPL_LINK( ScTableProtectionDlg, CheckBoxHdl, CheckBox*, pBtn ) +IMPL_LINK_TYPED( ScTableProtectionDlg, CheckBoxHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnProtect) { @@ -130,14 +128,11 @@ IMPL_LINK( ScTableProtectionDlg, CheckBoxHdl, CheckBox*, pBtn ) EnableOptionalWidgets(bChecked); m_pBtnOk->Enable(bChecked); } - - return 0; } -IMPL_LINK_NOARG(ScTableProtectionDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(ScTableProtectionDlg, OKHdl, Button*, void) { EndDialog(RET_OK); - return 0; } IMPL_LINK_NOARG(ScTableProtectionDlg, PasswordModifyHdl) diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 662a2a9fcef9..639f74744d80 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -153,7 +153,7 @@ void ScRetypePassDlg::WriteNewDataToDocument(ScDocument& rDoc) const void ScRetypePassDlg::Init() { - Link<> aLink = LINK( this, ScRetypePassDlg, OKHdl ); + Link<Button*,void> aLink = LINK( this, ScRetypePassDlg, OKHdl ); mpBtnOk->SetClickHdl(aLink); aLink = LINK( this, ScRetypePassDlg, RetypeBtnHdl ); @@ -263,13 +263,12 @@ void ScRetypePassDlg::CheckHashStatus() mpBtnOk->Disable(); } -IMPL_LINK_NOARG(ScRetypePassDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(ScRetypePassDlg, OKHdl, Button*, void) { EndDialog(RET_OK); - return 0; } -IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScRetypePassDlg, RetypeBtnHdl, Button*, pBtn, void ) { ScPassHashProtectable* pProtected = NULL; if (pBtn == mpBtnRetypeDoc) @@ -289,7 +288,7 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn ) if (!pProtected) // What the ... !? - return 0; + return; ScopedVclPtrInstance< ScRetypePassInputDlg > aDlg(this, pProtected); if (aDlg->Execute() == RET_OK) @@ -310,7 +309,6 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn ) SetDocData(); CheckHashStatus(); } - return 0; } ScRetypePassInputDlg::ScRetypePassInputDlg(vcl::Window* pParent, ScPassHashProtectable* pProtected) @@ -363,16 +361,16 @@ OUString ScRetypePassInputDlg::GetNewPassword() const void ScRetypePassInputDlg::Init() { - Link<> aLink = LINK( this, ScRetypePassInputDlg, OKHdl ); + Link<Button*,void> aLink = LINK( this, ScRetypePassInputDlg, OKHdl ); m_pBtnOk->SetClickHdl(aLink); aLink = LINK( this, ScRetypePassInputDlg, RadioBtnHdl ); m_pBtnRetypePassword->SetClickHdl(aLink); m_pBtnRemovePassword->SetClickHdl(aLink); aLink = LINK( this, ScRetypePassInputDlg, CheckBoxHdl ); m_pBtnMatchOldPass->SetClickHdl(aLink); - aLink = LINK( this, ScRetypePassInputDlg, PasswordModifyHdl ); - m_pPassword1Edit->SetModifyHdl(aLink); - m_pPassword2Edit->SetModifyHdl(aLink); + Link<> aLink2 = LINK( this, ScRetypePassInputDlg, PasswordModifyHdl ); + m_pPassword1Edit->SetModifyHdl(aLink2); + m_pPassword2Edit->SetModifyHdl(aLink2); m_pBtnOk->Disable(); m_pBtnRetypePassword->Check(); @@ -416,13 +414,12 @@ void ScRetypePassInputDlg::CheckPasswordInput() m_pBtnOk->Enable(bPassGood); } -IMPL_LINK_NOARG(ScRetypePassInputDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, OKHdl, Button*, void) { EndDialog(RET_OK); - return 0; } -IMPL_LINK( ScRetypePassInputDlg, RadioBtnHdl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( ScRetypePassInputDlg, RadioBtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnRetypePassword) { @@ -436,14 +433,11 @@ IMPL_LINK( ScRetypePassInputDlg, RadioBtnHdl, RadioButton*, pBtn ) m_pPasswordGrid->Disable(); m_pBtnOk->Enable(); } - - return 0; } -IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl) +IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, CheckBoxHdl, Button*, void) { CheckPasswordInput(); - return 0; } IMPL_LINK_NOARG(ScRetypePassInputDlg, PasswordModifyHdl) diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index fb7f9ffafe4d..f12eab8a8af0 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -163,7 +163,7 @@ void ScAutoFormatDlg::UpdateChecks() // Handler: -IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) +IMPL_LINK_TYPED( ScAutoFormatDlg, CloseHdl, Button *, pBtn, void ) { if (pBtn == m_pBtnOk || pBtn == m_pBtnCancel) { @@ -172,7 +172,6 @@ IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) EndDialog( (pBtn == m_pBtnOk) ? RET_OK : RET_CANCEL ); } - return 0; } IMPL_LINK_NOARG(ScAutoFormatDlg, DblClkHdl) @@ -184,7 +183,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, DblClkHdl) return 0; } -IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) +IMPL_LINK_TYPED( ScAutoFormatDlg, CheckHdl, Button *, pBtn, void ) { ScAutoFormatData* pData = pFormat->findByIndex(nIndex); bool bCheck = static_cast<CheckBox*>(pBtn)->IsChecked(); @@ -209,11 +208,9 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) } m_pWndPreview->NotifyChange( pData ); - - return 0; } -IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) +IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, AddHdl, Button*, void) { if ( !bFmtInserted && pSelFmtData ) { @@ -279,11 +276,9 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) bOk = true; } } - - return 0; } -IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) +IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RemoveHdl, Button*, void) { if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) ) { @@ -317,11 +312,9 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) } SelFmtHdl( 0 ); - - return 0; } -IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) +IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RenameHdl, Button*, void) { bool bOk = false; while( !bOk ) @@ -400,8 +393,6 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) else bOk = true; } - - return 0; } IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 429b84a6140a..c6e121abaa86 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -190,7 +190,7 @@ void ScSimpleRefDlg::RefInputDone( bool bForced) // Handler: -IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) +IMPL_LINK_NOARG_TYPED(ScSimpleRefDlg, OkBtnHdl, Button*, void) { bAutoReOpen=false; OUString aResult=m_pEdAssign->GetText(); @@ -198,10 +198,9 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) Link<> aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() ); aUnoLink.Call( &aResult ); - return 0; } -IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) +IMPL_LINK_NOARG_TYPED(ScSimpleRefDlg, CancelBtnHdl, Button*, void) { bAutoReOpen=false; OUString aResult=m_pEdAssign->GetText(); @@ -209,7 +208,6 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) Link<> aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() ); aUnoLink.Call( &aResult ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 66446d5d54cd..b539260f396a 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -350,12 +350,10 @@ void ScSolverOptionsDialog::EditOption() } } -IMPL_LINK( ScSolverOptionsDialog, ButtonHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScSolverOptionsDialog, ButtonHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnEdit) EditOption(); - - return 0; } IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsDoubleClickHdl) diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 09d0fa1cea88..ff37302b9658 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -199,7 +199,7 @@ bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal ) // Handler: -IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScSolverDlg, BtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) { @@ -253,8 +253,6 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) { Close(); } - - return 0; } IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 56541ae00c71..337cf71762f5 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -129,16 +129,13 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl) return 0; } -IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl) -{ - // Handler, called when the OK button is pushed - +IMPL_LINK_NOARG_TYPED(ScTabBgColorDlg, TabBgColorOKHdl_Impl, Button*, void) +{ sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO ); m_aTabBgColor = aColor; EndDialog( RET_OK ); - return 0; } ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet(vcl::Window* pParent, WinBits nStyle) diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 5ff6903d29f2..dd74ab0e431a 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -244,7 +244,7 @@ static bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab, // Handler: -IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScTabOpDlg, BtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) { @@ -320,8 +320,6 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) } else if (pBtn == m_pBtnCancel) Close(); - - return 0; } IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) |