diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-15 08:13:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-16 09:11:29 +0000 |
| commit | 6f1313b3d44ea54e9a331e0fc00871081fa662fe (patch) | |
| tree | fa6d9b6da04daedcb63ea2a0bc8c414288ed8bc6 /cui | |
| parent | 14bf708ef586b15dffed66ffaf524baf4d8fcbfa (diff) | |
convert Link<> to typed
Change-Id: Icbba339dac0be31e30dff021bba06a219f8aecd6
Reviewed-on: https://gerrit.libreoffice.org/19405
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui')
73 files changed, 392 insertions, 417 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 5ccc0eca2f63..0d68bfa8ad26 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2673,14 +2673,12 @@ void SvxMainMenuOrganizerDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit) +IMPL_LINK_NOARG_TYPED(SvxMainMenuOrganizerDialog, ModifyHdl, Edit&, void) { - (void)pEdit; - // if the Edit control is empty do not change the name if (m_pMenuNameEdit->GetText().isEmpty()) { - return 0; + return; } SvxConfigEntry* pNewEntryData = @@ -2689,8 +2687,6 @@ IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit) pNewEntryData->SetName(m_pMenuNameEdit->GetText()); m_pMenuListBox->SetEntryText( pNewMenuEntry, pNewEntryData->GetName() ); - - return 0; } IMPL_LINK_NOARG_TYPED( SvxMainMenuOrganizerDialog, SelectHdl, SvTreeListBox*, void ) diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 54de68e7197f..c263b7e9a2f0 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -954,9 +954,9 @@ int SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu ) } -IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) +IMPL_LINK_TYPED(SpellDialog, ModifyHdl, Edit&, rEd, void) { - if (m_pSentenceED == pEd) + if (m_pSentenceED == &rEd) { bModified = true; m_pSuggestionLB->SetNoSelection(); @@ -976,7 +976,6 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) } m_pSentenceED->AddUndoAction(pSpellAction); } - return 0; }; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index d783e887405b..81d274aefc0e 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -990,6 +990,7 @@ public: void update_color(sal_uInt16 n = UPDATE_ALL); DECL_LINK(ColorModifyHdl, void*); + DECL_LINK_TYPED(ColorModifyEditHdl, Edit&, void); DECL_LINK_TYPED(ModeModifyHdl, RadioButton&, void); sal_Int32 GetColor() const; @@ -1074,20 +1075,21 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sa mpColorField->SetModifyHdl( aLink ); mpColorSlider->SetModifyHdl( aLink ); - mpMFRed->SetModifyHdl( aLink ); - mpMFGreen->SetModifyHdl( aLink ); - mpMFBlue->SetModifyHdl( aLink ); + Link<Edit&,void> aLink3( LINK( this, ColorPickerDialog, ColorModifyEditHdl ) ); + mpMFRed->SetModifyHdl( aLink3 ); + mpMFGreen->SetModifyHdl( aLink3 ); + mpMFBlue->SetModifyHdl( aLink3 ); - mpMFCyan->SetModifyHdl( aLink ); - mpMFMagenta->SetModifyHdl( aLink ); - mpMFYellow->SetModifyHdl( aLink ); - mpMFKey->SetModifyHdl( aLink ); + mpMFCyan->SetModifyHdl( aLink3 ); + mpMFMagenta->SetModifyHdl( aLink3 ); + mpMFYellow->SetModifyHdl( aLink3 ); + mpMFKey->SetModifyHdl( aLink3 ); - mpMFHue->SetModifyHdl( aLink ); - mpMFSaturation->SetModifyHdl( aLink ); - mpMFBrightness->SetModifyHdl( aLink ); + mpMFHue->SetModifyHdl( aLink3 ); + mpMFSaturation->SetModifyHdl( aLink3 ); + mpMFBrightness->SetModifyHdl( aLink3 ); - mpEDHex->SetModifyHdl( aLink ); + mpEDHex->SetModifyHdl( aLink3 ); Link<RadioButton&,void> aLink2 = LINK( this, ColorPickerDialog, ModeModifyHdl ); mpRBRed->SetToggleHdl( aLink2 ); @@ -1278,6 +1280,10 @@ void ColorPickerDialog::update_color( sal_uInt16 n ) mpColorPreview->SetColor(aColor); } +IMPL_LINK_TYPED(ColorPickerDialog, ColorModifyEditHdl, Edit&, rEdit, void) +{ + ColorModifyHdl(&rEdit); +} IMPL_LINK(ColorPickerDialog, ColorModifyHdl, void *, p) { sal_uInt16 n = 0; diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index e5fd633788f3..268dbe98b054 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -264,7 +264,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni OUString sRealSetText = m_pcmbSearchText->GetText(); if (!sRealSetText.equals(sInitialText)) m_pcmbSearchText->SetText(OUString()); - LINK(this, FmSearchDialog, OnSearchTextModified).Call(m_pcmbSearchText); + LINK(this, FmSearchDialog, OnSearchTextModified).Call(*m_pcmbSearchText); // initial m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint)); @@ -393,7 +393,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void } } -IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified) +IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnSearchTextModified, Edit&, void) { if ((!m_pcmbSearchText->GetText().isEmpty()) || !m_prbSearchForText->IsChecked()) m_pbSearchAgain->Enable(); @@ -401,7 +401,6 @@ IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified) m_pbSearchAgain->Disable(); m_pSearchEngine->InvalidatePreviousLoc(); - return 0; } IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnFocusGrabbed, Control&, void) diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 73bb4c3d6a70..bdf4c9377d59 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -196,11 +196,11 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r mpMtrWidth->SetValue( nTileWidth ); mpMtrWidth->SetLast( GetGraphicSizePixel().Width() ); - mpMtrWidth->SetModifyHdl( GetModifyHdl() ); + mpMtrWidth->SetModifyHdl( LINK(this, GraphicFilterMosaic, EditModifyHdl) ); mpMtrHeight->SetValue( nTileHeight ); mpMtrHeight->SetLast( GetGraphicSizePixel().Height() ); - mpMtrHeight->SetModifyHdl( GetModifyHdl() ); + mpMtrHeight->SetModifyHdl( LINK(this, GraphicFilterMosaic, EditModifyHdl) ); mpCbxEdges->Check( bEnhanceEdges ); mpCbxEdges->SetToggleHdl( LINK(this, GraphicFilterMosaic, CheckBoxModifyHdl) ); @@ -213,6 +213,11 @@ IMPL_LINK_TYPED(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, rCheckBox, vo GetModifyHdl().Call(&rCheckBox); } +IMPL_LINK_TYPED(GraphicFilterMosaic, EditModifyHdl, Edit&, rEdit, void) +{ + GetModifyHdl().Call(&rEdit); +} + GraphicFilterMosaic::~GraphicFilterMosaic() { disposeOnce(); @@ -273,10 +278,15 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r get(mpMtrRadius, "radius"); mpMtrRadius->SetValue( nRadius* 10 ); - mpMtrRadius->SetModifyHdl( GetModifyHdl() ); + mpMtrRadius->SetModifyHdl( LINK(this, GraphicFilterSmooth, EditModifyHdl) ); mpMtrRadius->GrabFocus(); } +IMPL_LINK_TYPED(GraphicFilterSmooth, EditModifyHdl, Edit&, rEdit, void) +{ + GetModifyHdl().Call(&rEdit); +} + GraphicFilterSmooth::~GraphicFilterSmooth() { disposeOnce(); @@ -329,7 +339,7 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi get(mpCbxInvert, "invert"); mpMtrThreshold->SetValue( FRound( cGreyThreshold / 2.55 ) ); - mpMtrThreshold->SetModifyHdl( GetModifyHdl() ); + mpMtrThreshold->SetModifyHdl( LINK(this, GraphicFilterSolarize, EditModifyHdl) ); mpCbxInvert->Check( bInvert ); mpCbxInvert->SetToggleHdl( LINK(this, GraphicFilterSolarize, CheckBoxModifyHdl) ); @@ -339,6 +349,10 @@ IMPL_LINK_TYPED(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, rCheckBox, { GetModifyHdl().Call(&rCheckBox); } +IMPL_LINK_TYPED(GraphicFilterSolarize, EditModifyHdl, Edit&, rEdit, void) +{ + GetModifyHdl().Call(&rEdit); +} GraphicFilterSolarize::~GraphicFilterSolarize() { @@ -399,7 +413,12 @@ GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGr get(mpMtrSepia, "value"); mpMtrSepia->SetValue( nSepiaPercent ); - mpMtrSepia->SetModifyHdl( GetModifyHdl() ); + mpMtrSepia->SetModifyHdl( LINK(this, GraphicFilterSepia, EditModifyHdl) ); +} + +IMPL_LINK_TYPED(GraphicFilterSepia, EditModifyHdl, Edit&, rEdit, void) +{ + GetModifyHdl().Call(&rEdit); } GraphicFilterSepia::~GraphicFilterSepia() @@ -452,7 +471,12 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG mpNumPoster->SetFirst( 2 ); mpNumPoster->SetLast( rGraphic.GetBitmapEx().GetBitCount() ); mpNumPoster->SetValue( nPosterCount ); - mpNumPoster->SetModifyHdl( GetModifyHdl() ); + mpNumPoster->SetModifyHdl( LINK(this, GraphicFilterPoster, EditModifyHdl) ); +} + +IMPL_LINK_TYPED(GraphicFilterPoster, EditModifyHdl, Edit&, rEdit, void) +{ + GetModifyHdl().Call(&rEdit); } GraphicFilterPoster::~GraphicFilterPoster() diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 4a064ebe0135..0ab18c3f19d5 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -41,7 +41,7 @@ SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const pFtDescription->SetText( rDesc ); pEdtName->SetText( rName ); pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); - ModifyHdl(pEdtName.get()); + ModifyHdl(*pEdtName.get()); pEdtName->SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl)); } @@ -58,11 +58,10 @@ void SvxNameDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl) +IMPL_LINK_NOARG_TYPED(SvxNameDialog, ModifyHdl, Edit&, void) { if(aCheckNameHdl.IsSet()) pBtnOK->Enable(aCheckNameHdl.Call(*this)); - return 0; } @@ -82,7 +81,7 @@ SvxObjectNameDialog::SvxObjectNameDialog( // activate name pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); - ModifyHdl(pEdtName.get()); + ModifyHdl(*pEdtName.get()); pEdtName->SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl)); } @@ -99,14 +98,12 @@ void SvxObjectNameDialog::dispose() } -IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl) +IMPL_LINK_NOARG_TYPED(SvxObjectNameDialog, ModifyHdl, Edit&, void) { if(aCheckNameHdl.IsSet()) { pBtnOK->Enable(aCheckNameHdl.Call(*this)); } - - return 0; } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index c11cd43bbf31..c8a1a8d9624e 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -657,7 +657,7 @@ namespace svx } m_pWordInput->SetText( sFirstSuggestion ); m_pWordInput->SaveValue(); - OnSuggestionModified( m_pWordInput ); + OnSuggestionModified( *m_pWordInput ); } @@ -718,19 +718,17 @@ namespace svx IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnSuggestionSelected, SuggestionDisplay&, void ) { m_pWordInput->SetText( m_pSuggestions->GetSelectEntry() ); - OnSuggestionModified( NULL ); + OnSuggestionModified( *m_pWordInput ); } - IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnSuggestionModified ) + IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnSuggestionModified, Edit&, void ) { m_pFind->Enable( m_pWordInput->IsValueChangedFromSaved() ); bool bSameLen = m_pWordInput->GetText().getLength() == m_pOriginalWord->GetText().getLength(); m_pReplace->Enable( m_bDocumentMode && bSameLen ); m_pReplaceAll->Enable( m_bDocumentMode && bSameLen ); - - return 0L; } @@ -1197,13 +1195,11 @@ namespace svx EndDialog( RET_OK ); } - IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl) + IMPL_LINK_NOARG_TYPED(HangulHanjaNewDictDialog, ModifyHdl, Edit&, void) { OUString aName(comphelper::string::stripEnd(m_pDictNameED->GetText(), ' ')); m_pOkBtn->Enable( !aName.isEmpty() ); - - return 0; } HangulHanjaNewDictDialog::HangulHanjaNewDictDialog(vcl::Window* pParent) @@ -1502,39 +1498,33 @@ namespace svx UpdateScrollbar(); } - IMPL_LINK_NOARG( HangulHanjaEditDictDialog, OriginalModifyHdl ) + IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, OriginalModifyHdl, Edit&, void ) { m_bModifiedOriginal = true; m_aOriginal = comphelper::string::stripEnd( m_aOriginalLB->GetText(), ' ' ); UpdateSuggestions(); UpdateButtonStates(); - - return 0; } - IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl1, Edit*, pEdit ) + IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl1, Edit&, rEdit, void ) { - EditModify( pEdit, 0 ); - return 0; + EditModify( &rEdit, 0 ); } - IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl2, Edit*, pEdit ) + IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl2, Edit&, rEdit, void ) { - EditModify( pEdit, 1 ); - return 0; + EditModify( &rEdit, 1 ); } - IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl3, Edit*, pEdit ) + IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl3, Edit&, rEdit, void ) { - EditModify( pEdit, 2 ); - return 0; + EditModify( &rEdit, 2 ); } - IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl4, Edit*, pEdit ) + IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl4, Edit&, rEdit, void ) { - EditModify( pEdit, 3 ); - return 0; + EditModify( &rEdit, 3 ); } IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, BookLBSelectHdl, ListBox&, void ) diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index f7c27b39e36b..5fc269e2f450 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -104,7 +104,7 @@ void SvxHyperlinkDocTp::FillDlgFields(const OUString& rStrURL) aStrMark = rStrURL.copy( nPos+1 ); m_pEdTarget->SetText ( aStrMark ); - ModifiedPathHdl_Impl ( NULL ); + ModifiedPathHdl_Impl ( *m_pCbbPath ); } /************************************************************************* @@ -216,7 +216,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void) m_pCbbPath->SetText( aPath ); if ( aOldURL != GetCurrentURL() ) - ModifiedPathHdl_Impl (NULL); + ModifiedPathHdl_Impl(*m_pCbbPath); } } @@ -256,7 +256,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedPathHdl_Impl, Edit&, void) { maStrURL = GetCurrentURL(); @@ -264,8 +264,6 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl) maTimer.Start(); m_pFtFullURL->SetText( maStrURL ); - - return 0L; } /************************************************************************* @@ -297,7 +295,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, Edit&, void) { maStrURL = GetCurrentURL(); @@ -305,8 +303,6 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl) mpMarkWnd->SelectEntry ( m_pEdTarget->GetText() ); m_pFtFullURL->SetText( maStrURL ); - - return 0L; } /************************************************************************* @@ -332,7 +328,7 @@ void SvxHyperlinkDocTp::SetMarkStr ( const OUString& aStrMark ) { m_pEdTarget->SetText ( aStrMark ); - ModifiedTargetHdl_Impl ( NULL ); + ModifiedTargetHdl_Impl ( *m_pEdTarget ); } /************************************************************************* diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 094f05e41e61..f73027328ce3 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -224,7 +224,7 @@ void SvxHyperlinkInternetTp::SetInitFocus() |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, Edit&, void) { OUString aScheme = GetSchemeFromURL( m_pCbbTarget->GetText() ); if( !aScheme.isEmpty() ) @@ -233,8 +233,6 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl) // start timer maTimer.SetTimeout( 2500 ); maTimer.Start(); - - return 0L; } /************************************************************************* @@ -254,7 +252,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, void) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl, Edit&, void) { OUString aStrLogin ( m_pEdLogin->GetText() ); if ( aStrLogin.equalsIgnoreAsciiCase( sAnonymous ) ) @@ -262,8 +260,6 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl) m_pCbAnonymous->Check(); ClickAnonymousHdl_Impl(NULL); } - - return 0L; } void SvxHyperlinkInternetTp::SetScheme(const OUString& rScheme) diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 26febba904ea..567a47801ba4 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -229,13 +229,11 @@ void SvxHyperlinkMailTp::RemoveImproperProtocol(const OUString& aProperScheme) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, Edit&, void) { OUString aScheme = GetSchemeFromURL( m_pCbbReceiver->GetText() ); if(!aScheme.isEmpty()) SetScheme( aScheme ); - - return 0L; } /************************************************************************* diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 42c77ea01624..8adf79265833 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -163,7 +163,7 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet ) m_pSingleBtn->SetClickHdl(aViewLayoutLink); m_pColumnsBtn->SetClickHdl(aViewLayoutLink); - Link<> aViewLayoutSpinLink = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl); + Link<Edit&,void> aViewLayoutSpinLink = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl); m_pColumnsEdit->SetModifyHdl(aViewLayoutSpinLink); Link<Button*,void> aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl); @@ -328,13 +328,12 @@ IMPL_LINK_TYPED(SvxZoomDialog, UserHdl, Button *, pButton, void) } } -IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl) +IMPL_LINK_NOARG_TYPED(SvxZoomDialog, SpinHdl, Edit&, void) { if (!m_pUserBtn->IsChecked()) - return 0; + return; mbModified = true; - return 0; } IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void) @@ -364,10 +363,10 @@ IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void) } } -IMPL_LINK(SvxZoomDialog, ViewLayoutSpinHdl, NumericField*, pEdit) +IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutSpinHdl, Edit&, rEdit, void) { - if (pEdit == m_pColumnsEdit && !m_pColumnsBtn->IsChecked()) - return 0; + if (&rEdit == m_pColumnsEdit && !m_pColumnsBtn->IsChecked()) + return; if (m_pColumnsEdit->GetValue() % 2 == 0) { @@ -380,8 +379,6 @@ IMPL_LINK(SvxZoomDialog, ViewLayoutSpinHdl, NumericField*, pEdit) } mbModified = true; - - return 0; } IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutCheckHdl, Button*, pCheckBox, void) diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 717762349810..40497fbd3fff 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -64,11 +64,11 @@ private: std::set< sal_uInt16 > m_aIgnoreErrorsAt; sal_uInt16 m_nErrorStart; sal_uInt16 m_nErrorEnd; - bool m_bIsUndoEditMode; + bool m_bIsUndoEditMode; - Link<> m_aModifyLink; + Link<Edit&,void> m_aModifyLink; - void CallModifyLink() {m_aModifyLink.Call(this);} + void CallModifyLink() {m_aModifyLink.Call(*this);} inline SpellDialog* GetSpellDialog() const; protected: @@ -77,7 +77,7 @@ protected: public: SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits); - void SetModifyHdl(const Link<>& rLink) override { m_aModifyLink = rLink;} + void SetModifyHdl(const Link<Edit&,void>& rLink) override { m_aModifyLink = rLink;} void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ); void SetText( const OUString& rStr ) override; @@ -179,7 +179,7 @@ private: DECL_LINK_TYPED( CheckGrammarHdl, Button*, void ); DECL_LINK_TYPED( ExtClickHdl, Button*, void ); DECL_LINK_TYPED(CancelHdl, Button*, void); - DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *); + DECL_LINK_TYPED( ModifyHdl, Edit&, void); DECL_LINK_TYPED(UndoHdl, Button*, void); DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void ); DECL_LINK_TYPED( AddToDictClickHdl, Button*, void ); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 073b728d2845..bf83041a8381 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -255,7 +255,7 @@ private: DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool); - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); bool NewDelHdl(void*); void RefillReplaceBox( bool bFromReset, @@ -318,7 +318,7 @@ private: DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool); DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); bool NewDelHdl(void*); /// Box filled with new language void RefillReplaceBoxes(bool bFromReset, diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 1817195fd132..3fd76592ffb9 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -122,8 +122,8 @@ private: DECL_LINK_TYPED( SelPreHdl_Impl, ValueSet*, void ); DECL_LINK_TYPED( SelSdwHdl_Impl, ValueSet*, void ); DECL_LINK_TYPED( LinesChanged_Impl, LinkParamNone*, void ); - DECL_LINK( ModifyDistanceHdl_Impl, MetricField*); - DECL_LINK( ModifyWidthHdl_Impl, void*); + DECL_LINK_TYPED( ModifyDistanceHdl_Impl, Edit&, void); + DECL_LINK_TYPED( ModifyWidthHdl_Impl, Edit&, void); DECL_LINK_TYPED( SyncHdl_Impl, Button*, void); sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index e768576f1857..a85d6252da00 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -483,7 +483,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog void UpdateButtonStates(); DECL_LINK_TYPED( MoveHdl, Button *, void ); - DECL_LINK( ModifyHdl, Edit * ); + DECL_LINK_TYPED( ModifyHdl, Edit&, void ); DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); public: diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index a2e8746772c5..180950612bb6 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -133,9 +133,10 @@ private: bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); DECL_LINK_TYPED( UpdateHdl_Impl, Idle *, void ); - DECL_LINK( FontModifyHdl_Impl, void* ); + DECL_LINK_TYPED( FontModifyEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( FontModifyListBoxHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( FontModifyComboBoxHdl_Impl, ComboBox&, void ); + void FontModifyHdl_Impl(void*); public: using SfxTabPage::ActivatePage; @@ -297,13 +298,13 @@ private: DECL_LINK_TYPED( PositionHdl_Impl, Button*, void ); DECL_LINK_TYPED( RotationHdl_Impl, Button*, void ); - DECL_LINK( FontModifyHdl_Impl, void *); + DECL_LINK_TYPED( FontModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( AutoPositionHdl_Impl, Button*, void ); DECL_LINK_TYPED( FitToLineHdl_Impl, Button*, void ); - DECL_LINK_TYPED( KerningSelectHdl_Impl, ListBox&, void); - DECL_LINK( KerningModifyHdl_Impl, void *); + DECL_LINK_TYPED( KerningSelectHdl_Impl, ListBox&, void ); + DECL_LINK_TYPED( KerningModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( LoseFocusHdl_Impl, Control&, void ); - DECL_LINK( ScaleWidthModifyHdl_Impl, void *); + DECL_LINK_TYPED( ScaleWidthModifyHdl_Impl, Edit&, void ); public: virtual ~SvxCharPositionPage(); diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index abf5a02635d8..1b481f92907c 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -57,8 +57,9 @@ private: void FillTypeLB(); - DECL_LINK( ChangeAttrHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void ); + void ChangeAttrHdl_Impl(void*); public: diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index da70430e3c6c..a9b537e0c6d2 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -161,7 +161,7 @@ private: DECL_LINK_TYPED(OnClickedSearchAgain, Button *, void); DECL_LINK_TYPED( OnClickedSpecialSettings, Button*, void ); - DECL_LINK(OnSearchTextModified, void *); + DECL_LINK_TYPED(OnSearchTextModified, Edit&, void); DECL_LINK_TYPED( OnPositionSelected, ListBox&, void ); DECL_LINK_TYPED( OnFieldSelected, ListBox&, void ); diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 021e6a348541..9d7be2deeb35 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -95,6 +95,7 @@ class GraphicFilterSmooth : public GraphicFilterDialog { private: VclPtr<NumericField> mpMtrRadius; + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: @@ -113,6 +114,7 @@ private: VclPtr<MetricField> mpMtrHeight; VclPtr<CheckBox> mpCbxEdges; DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void); + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, @@ -132,6 +134,7 @@ private: VclPtr<MetricField> mpMtrThreshold; VclPtr<CheckBox> mpCbxInvert; DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void); + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: @@ -149,6 +152,7 @@ class GraphicFilterSepia : public GraphicFilterDialog { private: VclPtr<MetricField> mpMtrSepia; + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); @@ -165,6 +169,7 @@ class GraphicFilterPoster : public GraphicFilterDialog { private: VclPtr<NumericField> mpNumPoster; + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 62da72139f40..f7761c9f3d4d 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -50,7 +50,7 @@ private: unsigned nNameRow; unsigned nShortNameField; - DECL_LINK( ModifyHdl_Impl, Edit * ); + DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); bool GetAddress_Impl(); void SetAddress_Impl(); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 95a7163f9522..671d4220da95 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -143,9 +143,10 @@ class SvxTransparenceTabPage : public SvxTabPage DECL_LINK_TYPED(ClickTransOffHdl_Impl, Button*, void ); DECL_LINK_TYPED(ClickTransLinearHdl_Impl, Button*, void ); DECL_LINK_TYPED(ClickTransGradientHdl_Impl, Button*, void ); - DECL_LINK(ModifyTransparentHdl_Impl, void*); - DECL_LINK(ModifiedTrgrHdl_Impl, void*); + DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void); + DECL_LINK_TYPED(ModifiedTrgrEditHdl_Impl, Edit&, void); DECL_LINK_TYPED(ModifiedTrgrListBoxHdl_Impl, ListBox&, void); + void ModifiedTrgrHdl_Impl(void*); void ActivateLinear(bool bActivate); void ActivateGradient(bool bActivate); @@ -271,13 +272,14 @@ private: DECL_LINK_TYPED( ModifyHatchingHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ToggleHatchBckgrdColorHdl_Impl, CheckBox&, void ); DECL_LINK_TYPED( ModifyBitmapHdl_Impl, ListBox&, void ); - DECL_LINK( ModifyStepCountHdl_Impl, void* ); + DECL_LINK_TYPED( ModifyStepCountEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ModifyStepCountClickHdl_Impl, Button*, void ); + void ModifyStepCountHdl_Impl(void*); //UUUU DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void ); - DECL_LINK( ModifyTileHdl_Impl, void * ); + DECL_LINK_TYPED( ModifyTileHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ModifyTileClickHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickScaleHdl_Impl, Button*, void ); void ClickInvisibleHdl_Impl(); @@ -353,7 +355,7 @@ private: SfxMapUnit m_ePoolUnit; DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void ); - DECL_LINK( ModifyShadowHdl_Impl, void * ); + DECL_LINK_TYPED( ModifyShadowHdl_Impl, Edit&, void ); DECL_LINK_TYPED( SelectShadowHdl_Impl, ListBox&, void ); public: @@ -428,10 +430,11 @@ private: DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK_TYPED( ChangeGradientHdl_Impl, ListBox&, void ); - DECL_LINK( ModifiedHdl_Impl, void * ); + DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); + void ModifiedHdl_Impl(void*); long CheckChanges_Impl(); void SetControlState_Impl( css::awt::GradientStyle eXGS ); @@ -504,8 +507,9 @@ private: SfxMapUnit m_ePoolUnit; DECL_LINK_TYPED( ChangeHatchHdl_Impl, ListBox&, void ); - DECL_LINK( ModifiedHdl_Impl, void * ); + DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); + void ModifiedHdl_Impl(void*); DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); @@ -729,7 +733,7 @@ private: DECL_LINK_TYPED( SelectValSetHdl_Impl, ValueSet*, void ); DECL_LINK_TYPED( SelectColorModelHdl_Impl, ListBox&, void ); void ChangeColor(const Color &rNewColor); - DECL_LINK( ModifiedHdl_Impl, void * ); + DECL_LINK_TYPED( ModifiedHdl_Impl, Edit&, void ); long CheckChanges_Impl(); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 3ad9556d69d4..e25562eef712 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -173,22 +173,22 @@ private: // handler for gallery popup menu button + size DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); DECL_LINK_TYPED( MenuCreateHdl_Impl, MenuButton *, void ); - DECL_LINK( SizeHdl_Impl, MetricField * ); + DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void ); DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickInvisibleHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ChangeStartClickHdl_Impl, Button*, void ); DECL_LINK_TYPED( ChangeStartListBoxHdl_Impl, ListBox&, void ); - DECL_LINK( ChangeStartModifyHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeStartModifyHdl_Impl, Edit&, void ); void ChangeStartHdl_Impl(void*); DECL_LINK_TYPED( ChangeEndListBoxHdl_Impl, ListBox&, void ); - DECL_LINK( ChangeEndModifyHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeEndModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ChangeEndClickHdl_Impl, Button*, void ); void ChangeEndHdl_Impl(void*); DECL_LINK_TYPED( ChangePreviewListBoxHdl_Impl, ListBox&, void ); - DECL_LINK( ChangePreviewModifyHdl_Impl, void* ); + DECL_LINK_TYPED( ChangePreviewModifyHdl_Impl, Edit&, void ); void ChangePreviewHdl_Impl(void*); - DECL_LINK( ChangeTransparentHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeTransparentHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ChangeEdgeStyleHdl_Impl, ListBox&, void ); @@ -293,9 +293,9 @@ private: DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK_TYPED( SelectLinestyleListBoxHdl_Impl, ListBox&, void ); void SelectLinestyleHdl_Impl(ListBox*); - DECL_LINK( ChangePreviewHdl_Impl, void * ); - DECL_LINK( ChangeNumber1Hdl_Impl, void * ); - DECL_LINK( ChangeNumber2Hdl_Impl, void * ); + DECL_LINK_TYPED( ChangePreviewHdl_Impl, Edit&, void ); + DECL_LINK_TYPED( ChangeNumber1Hdl_Impl, Edit&, void ); + DECL_LINK_TYPED( ChangeNumber2Hdl_Impl, Edit&, void ); DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); DECL_LINK_TYPED( ChangeMetricHdl_Impl, Button*, void ); diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 9b5289820ba0..ec765293c2ef 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -36,7 +36,7 @@ private: Link<SvxNameDialog&,bool> aCheckNameHdl; - DECL_LINK(ModifyHdl, void *); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); public: SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); @@ -85,7 +85,7 @@ private: // callback link for name uniqueness Link<SvxObjectNameDialog&,bool> aCheckNameHdl; - DECL_LINK(ModifyHdl, void *); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); public: // constructor diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 49ad01f2a9fd..d2497117c405 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -95,13 +95,13 @@ class SvxGrfCropPage : public SfxTabPage virtual ~SvxGrfCropPage(); virtual void dispose() override; - DECL_LINK( ZoomHdl, MetricField * ); - DECL_LINK( SizeHdl, MetricField * ); + DECL_LINK_TYPED( ZoomHdl, Edit&, void ); + DECL_LINK_TYPED( SizeHdl, Edit&, void ); DECL_LINK_TYPED( CropHdl, SpinField&, void ); DECL_LINK_TYPED( CropLoseFocusHdl, Control&, void ); - DECL_LINK( CropModifyHdl, MetricField * ); - DECL_LINK_TYPED(OrigSizeHdl, Button*, void); - DECL_LINK_TYPED(Timeout, Timer *, void); + DECL_LINK_TYPED( CropModifyHdl, Edit&, void ); + DECL_LINK_TYPED( OrigSizeHdl, Button*, void ); + DECL_LINK_TYPED( Timeout, Timer *, void ); void CalcZoom(); void CalcMinMaxBorder(); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index da6f675d7110..271d5a0e2834 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -183,7 +183,7 @@ namespace svx private: DECL_LINK_TYPED( OnOption, Button*, void ); - DECL_LINK( OnSuggestionModified, void* ); + DECL_LINK_TYPED( OnSuggestionModified, Edit&, void ); DECL_LINK_TYPED( OnSuggestionSelected, SuggestionDisplay&, void ); DECL_LINK_TYPED( OnConversionDirectionClicked, Button*, void ); DECL_LINK_TYPED( ClickByCharacterHdl, Button*, void ); @@ -237,7 +237,7 @@ namespace svx bool m_bEntered; DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK( ModifyHdl, void* ); + DECL_LINK_TYPED( ModifyHdl, Edit&, void ); public: HangulHanjaNewDictDialog( vcl::Window* _pParent ); virtual ~HangulHanjaNewDictDialog(); @@ -291,12 +291,12 @@ namespace svx bool m_bModifiedSuggestions; bool m_bModifiedOriginal; - DECL_LINK( OriginalModifyHdl, void* ); + DECL_LINK_TYPED( OriginalModifyHdl, Edit&, void ); DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK( EditModifyHdl1, Edit* ); - DECL_LINK( EditModifyHdl2, Edit* ); - DECL_LINK( EditModifyHdl3, Edit* ); - DECL_LINK( EditModifyHdl4, Edit* ); + DECL_LINK_TYPED( EditModifyHdl1, Edit&, void ); + DECL_LINK_TYPED( EditModifyHdl2, Edit&, void ); + DECL_LINK_TYPED( EditModifyHdl3, Edit&, void ); + DECL_LINK_TYPED( EditModifyHdl4, Edit&, void ); DECL_LINK_TYPED( BookLBSelectHdl, ListBox&, void ); DECL_LINK_TYPED( NewPBPushHdl, Button*, void ); diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 0aea2dc4dd5a..4589c46bfb3e 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -44,8 +44,8 @@ private: DECL_LINK_TYPED (ClickFileopenHdl_Impl, Button*, void ); DECL_LINK_TYPED (ClickTargetHdl_Impl , Button*, void ); - DECL_LINK (ModifiedPathHdl_Impl , void * ); ///< Contens of combobox "Path" modified - DECL_LINK (ModifiedTargetHdl_Impl, void * ); ///< Contens of editfield "Target" modified + DECL_LINK_TYPED (ModifiedPathHdl_Impl , Edit&, void ); ///< Contents of combobox "Path" modified + DECL_LINK_TYPED (ModifiedTargetHdl_Impl, Edit&, void ); ///< Contents of editfield "Target" modified DECL_LINK_TYPED( LostFocusPathHdl_Impl, Control&, void ); ///< Combobox "path" lost its focus diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index d964caea5334..f70b8f7d2d74 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -50,9 +50,9 @@ private: DECL_LINK_TYPED( Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP DECL_LINK_TYPED( ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User DECL_LINK_TYPED( ClickBrowseHdl_Impl , Button*, void ); ///< Button : Browse - DECL_LINK (ModifiedLoginHdl_Impl , void * ); ///< Contens of editfield "Login" modified + DECL_LINK_TYPED( ModifiedLoginHdl_Impl , Edit&, void ); ///< Contents of editfield "Login" modified DECL_LINK_TYPED( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus - DECL_LINK (ModifiedTargetHdl_Impl , void * ); ///< Contens of editfield "Target" modified + DECL_LINK_TYPED( ModifiedTargetHdl_Impl , Edit&, void ); ///< Contents of editfield "Target" modified DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 3c128ffd6688..df5235ec8e6a 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -37,7 +37,7 @@ private: DECL_STATIC_LINK_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void); ///< Button : Address book - DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified + DECL_LINK_TYPED (ModifiedReceiverHdl_Impl, Edit&, void ); ///< Combobox "receiver" modified void SetScheme(const OUString& rScheme); void RemoveImproperProtocol(const OUString& aProperScheme); diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 6e985c33c854..bc1e5ce32a75 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -61,9 +61,10 @@ private: void FillUnitLB(); DECL_LINK_TYPED( ClickAutoPosHdl_Impl, Button*, void ); - DECL_LINK( ChangeAttrHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ChangeAttrClickHdl_Impl, Button*, void ); + void ChangeAttrHdl_Impl(void*); public: diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 8fa538433390..f936e1f71f9b 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -158,10 +158,12 @@ private: DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void ); void SelFormatHdl_Impl(void*); DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); - DECL_LINK( EditHdl_Impl, Edit* ); - DECL_LINK( OptHdl_Impl, void * ); + DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void ); + DECL_LINK_TYPED( OptEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( OptClickHdl_Impl, Button*, void ); DECL_LINK_TYPED( TimeHdl_Impl, Timer *, void); + void EditHdl_Impl(Edit*); + void OptHdl_Impl(void*); }; #endif diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 8ffba711cc7c..8d83f106dfb4 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -325,17 +325,18 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK_TYPED( PopupActivateHdl_Impl, Menu *, bool); DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); DECL_LINK_TYPED( BulletHdl_Impl, Button*, void); - DECL_LINK( SizeHdl_Impl, MetricField * ); + DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void ); DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); DECL_LINK_TYPED( CharFmtHdl_Impl, ListBox&, void ); - DECL_LINK( EditModifyHdl_Impl, Edit* ); + DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( EditListBoxHdl_Impl, ListBox&, void ); - DECL_LINK( AllLevelHdl_Impl, NumericField * ); + DECL_LINK_TYPED( AllLevelHdl_Impl, Edit&, void ); DECL_LINK_TYPED( OrientHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( SameLevelHdl_Impl, Button*, void ); DECL_LINK_TYPED( BulColorHdl_Impl, ListBox&, void ); - DECL_LINK( BulRelSizeHdl_Impl, MetricField *); + DECL_LINK_TYPED( BulRelSizeHdl_Impl, Edit&, void); DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void); + void EditModifyHdl_Impl(Edit*); public: SvxNumOptionsTabPage(vcl::Window* pParent, diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 5d5189f0e74a..d3cb6140365e 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -50,7 +50,7 @@ class SvxAsianLayoutPage : public SfxTabPage DECL_LINK_TYPED(LanguageHdl, ListBox&, void); DECL_LINK_TYPED(ChangeStandardHdl, Button*, void); - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); public: SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index d64d80b82dd0..7f4d665e0d83 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -60,7 +60,7 @@ private: css::linguistic2::XDictionary > xNewDic; DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK(ModifyHdl_Impl, void *); + DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); public: SvxNewDictionaryDialog( vcl::Window* pParent, @@ -134,7 +134,7 @@ private: DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); DECL_LINK_TYPED(NewDelActionHdl, SvxDictEdit&, bool); - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); bool NewDelHdl(void*); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 3da4a8955114..be03c3abbc08 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -153,13 +153,13 @@ private: DECL_LINK_TYPED( PaperBinHdl_Impl, Control&, void); DECL_LINK_TYPED( SwapOrientation_Impl, Button*, void ); void SwapFirstValues_Impl( bool bSet ); - DECL_LINK( BorderModify_Impl, void *); + DECL_LINK_TYPED( BorderModify_Impl, Edit&, void); void InitHeadFoot_Impl( const SfxItemSet& rSet ); DECL_LINK_TYPED( CenterHdl_Impl, Button*, void); void UpdateExample_Impl( bool bResetbackground = false ); DECL_LINK_TYPED( PaperSizeSelect_Impl, ListBox&, void ); - DECL_LINK( PaperSizeModify_Impl, void *); + DECL_LINK_TYPED( PaperSizeModify_Impl, Edit&, void); DECL_LINK_TYPED( FrameDirectionModify_Impl, ListBox&, void ); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index f71e9f4010d6..df2f87b1ec2c 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -91,7 +91,7 @@ private: void UpdateExample_Impl(); DECL_LINK_TYPED( LineDistHdl_Impl, ListBox&, void ); - DECL_LINK(ModifyHdl_Impl, void *); + DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( AutoHdl_Impl, Button*, void ); protected: diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 12c686519a81..602dd555ae3f 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -106,7 +106,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage DECL_LINK_TYPED( PosHdl, ListBox&, void ); DECL_LINK_TYPED( RelHdl, ListBox&, void ); DECL_LINK_TYPED(MirrorHdl, Button*, void); - DECL_LINK( ModifyHdl, Edit * ); + DECL_LINK_TYPED( ModifyHdl, Edit&, void ); DECL_LINK_TYPED(ProtectHdl, Button*, void); void InitPos(short nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel, diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 0aede59214a8..82dbb831a9f0 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -108,14 +108,14 @@ private: // Handler DECL_LINK_TYPED( NewHdl_Impl, Button*, void ); - DECL_LINK_TYPED(DelHdl_Impl, Button*, void ); - DECL_LINK_TYPED(DelAllHdl_Impl, Button*, void ); + DECL_LINK_TYPED( DelHdl_Impl, Button*, void ); + DECL_LINK_TYPED( DelAllHdl_Impl, Button*, void ); DECL_LINK_TYPED( FillTypeCheckHdl_Impl, Button*, void ); DECL_LINK_TYPED( TabTypeCheckHdl_Impl, Button*, void ); DECL_LINK_TYPED( SelectHdl_Impl, ComboBox&, void ); - DECL_LINK(ModifyHdl_Impl, void *); + DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( GetFillCharHdl_Impl, Control&, void ); DECL_LINK_TYPED( GetDezCharHdl_Impl, Control&, void ); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index f79897f94e28..3490963393f5 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -137,8 +137,8 @@ private: void SetMinMaxPosition(); void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange); - DECL_LINK( ChangeWidthHdl, void * ); - DECL_LINK( ChangeHeightHdl, void * ); + DECL_LINK_TYPED( ChangeWidthHdl, Edit&, void ); + DECL_LINK_TYPED( ChangeHeightHdl, Edit&, void ); DECL_LINK_TYPED( ClickSizeProtectHdl, Button*, void ); DECL_LINK_TYPED( ClickAutoHdl, Button*, void ); diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 818d381c0a10..6b6000edee3e 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -49,9 +49,9 @@ private: bool mbModified; DECL_LINK_TYPED(UserHdl, Button*, void); - DECL_LINK(SpinHdl, void*); + DECL_LINK_TYPED(SpinHdl, Edit&, void); DECL_LINK_TYPED(ViewLayoutUserHdl, Button*, void); - DECL_LINK(ViewLayoutSpinHdl, NumericField*); + DECL_LINK_TYPED(ViewLayoutSpinHdl, Edit&, void); DECL_LINK_TYPED(ViewLayoutCheckHdl, Button*, void); DECL_LINK_TYPED(OKHdl, Button*, void); diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 1ed31255d216..5e08c75c447a 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -204,10 +204,9 @@ namespace svx } - IMPL_LINK_NOARG(ODocumentLinkDialog, OnTextModified) + IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnTextModified, Edit&, void) { validate( ); - return 0L; } diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index a3f86c803d5c..2ab3a88aacfe 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -59,7 +59,7 @@ namespace svx void getLink( OUString& _rName, OUString& _rURL ) const; protected: - DECL_LINK(OnTextModified, void *); + DECL_LINK_TYPED( OnTextModified, Edit&, void ); DECL_LINK_TYPED( OnBrowseFile, Button*, void ); DECL_LINK_TYPED( OnOk, Button*, void ); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 9b6537236c04..9a9e5ebd82f7 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -88,7 +88,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent, m_pCheckLB->setColSizes(); aTextColor = m_pCheckLB->GetTextColor(); - Link<> aLink(LINK(this, SvxFontSubstTabPage, SelectHdl)); + Link<Edit&,void> aLink(LINK(this, SvxFontSubstTabPage, SelectEditHdl)); Link<ComboBox&,void> aLink2(LINK(this, SvxFontSubstTabPage, SelectComboBoxHdl)); Link<Button*,void> aClickLink(LINK(this, SvxFontSubstTabPage, ClickHdl)); @@ -270,7 +270,11 @@ IMPL_LINK_TYPED(SvxFontSubstTabPage, SelectComboBoxHdl, ComboBox&, rBox, void) { SelectHdl(&rBox); } -IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin) +IMPL_LINK_TYPED(SvxFontSubstTabPage, SelectEditHdl, Edit&, rBox, void) +{ + SelectHdl(&rBox); +} +void SvxFontSubstTabPage::SelectHdl(vcl::Window* pWin) { if (pWin == m_pApply || pWin == m_pDelete) { @@ -342,8 +346,6 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin) } CheckEnable(); - - return 0; } diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 7615d9483f97..215cd506406e 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -81,11 +81,12 @@ class SvxFontSubstTabPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; - DECL_LINK(SelectHdl, vcl::Window *); + DECL_LINK_TYPED(SelectEditHdl, Edit&, void); DECL_LINK_TYPED(SelectComboBoxHdl, ComboBox&, void); DECL_LINK_TYPED(ClickHdl, Button*, void); DECL_LINK_TYPED(TreeListBoxSelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(NonPropFontsHdl, Button*, void); + void SelectHdl(vcl::Window*); SvTreeListEntry* CreateEntry(OUString& rFont1, OUString& rFont2); void CheckEnable(); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 1ccc1ce4af65..4f21f18fe5e6 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -142,7 +142,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& LanguageHdl(*m_pLanguageLB); m_pLanguageLB->SetSelectHdl(LINK(this, SvxAsianLayoutPage, LanguageHdl)); m_pStandardCB->SetClickHdl(LINK(this, SvxAsianLayoutPage, ChangeStandardHdl)); - Link<> aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl)); + Link<Edit&,void> aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl)); m_pStartED->SetModifyHdl(aLk); m_pEndED->SetModifyHdl(aLk); @@ -384,16 +384,16 @@ IMPL_LINK_TYPED(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void) m_pStartFT->Enable(!bCheck); m_pEndFT->Enable(!bCheck); - ModifyHdl(m_pStartED); + ModifyHdl(*m_pStartED); } -IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) +IMPL_LINK_TYPED(SvxAsianLayoutPage, ModifyHdl, Edit&, rEdit, void) { LanguageType eSelectLanguage = m_pLanguageLB->GetSelectLanguage(); Locale aLocale( LanguageTag::convertToLocale( eSelectLanguage )); OUString sStart = m_pStartED->GetText(); OUString sEnd = m_pEndED->GetText(); - bool bEnable = pEdit->IsEnabled(); + bool bEnable = rEdit.IsEnabled(); if(pImpl->xForbidden.is()) { try @@ -414,7 +414,6 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) } } pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0); - return 0; } const sal_uInt16* SvxAsianLayoutPage::GetRanges() diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 28535aaaa1d3..d8ddc4e9b0c3 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -206,13 +206,12 @@ IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) -IMPL_LINK_NOARG(SvxNewDictionaryDialog, ModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, ModifyHdl_Impl, Edit&, void) { if ( !pNameEdit->GetText().isEmpty() ) pOKBtn->Enable(); else pOKBtn->Disable(); - return 0; } // class SvxEditDictionaryDialog ------------------------------------------- @@ -690,15 +689,15 @@ bool SvxEditDictionaryDialog::NewDelHdl(void* pBtn) // which means EndDialog() - has to be evaluated in KeyInput return false; } - ModifyHdl(pWordED); + ModifyHdl(*pWordED); return true; } -IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) +IMPL_LINK_TYPED(SvxEditDictionaryDialog, ModifyHdl, Edit&, rEdt, void) { - OUString rEntry = pEdt->GetText(); + OUString rEntry = rEdt.GetText(); sal_Int32 nWordLen = rEntry.getLength(); const OUString& rRepString = pReplaceED->GetText(); @@ -707,7 +706,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) bool bEnableDelete = false; OUString aNewReplaceText = sNew; - if(pEdt == pWordED) + if(&rEdt == pWordED) { if(nWordLen>0) { @@ -768,7 +767,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) bDoNothing=false; } } - else if(pEdt == pReplaceED) + else if(&rEdt == pReplaceED) { OUString aReplaceText; OUString aWordText; @@ -791,8 +790,6 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) pNewReplacePB->SetText( aNewReplaceText ); pNewReplacePB->Enable( bEnableNewReplace && !IsDicReadonly_Impl() ); pDeletePB->Enable( bEnableDelete && !IsDicReadonly_Impl() ); - - return 0; } diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 4c216c9a52c2..6f14ea8c2814 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -411,10 +411,8 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) m_pCollectUsageInfo->SaveValue(); } -IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd ) +IMPL_LINK_NOARG_TYPED( OfaMiscTabPage, TwoFigureHdl, Edit&, void ) { - (void)pEd; - OUString aOutput( m_aStrDateInfo ); OUString aStr( m_pYearValueField->GetText() ); OUString sSep( SvtSysLocale().GetLocaleData().getNumThousandSep() ); @@ -430,7 +428,6 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd ) aOutput += OUString::number( nNum ); } m_pToYearFT->SetText( aOutput ); - return 0; } IMPL_LINK_TYPED( OfaMiscTabPage, TwoFigureConfigFocusHdl, Control&, rControl, void ) @@ -443,7 +440,7 @@ IMPL_LINK_TYPED( OfaMiscTabPage, TwoFigureConfigHdl, SpinField&, rEd, void ) OUString aOutput(OUString::number(nNum)); m_pYearValueField->SetText(aOutput); m_pYearValueField->SetSelection( Selection( 0, aOutput.getLength() ) ); - TwoFigureHdl( static_cast<NumericField*>(&rEd) ); + TwoFigureHdl( static_cast<Edit&>(rEd) ); } class CanvasSettings @@ -1699,9 +1696,9 @@ IMPL_LINK_TYPED( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void m_pDatePatternsED->SetText( aDatePatternsString); } -IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd ) +IMPL_LINK_TYPED( OfaLanguagesTabPage, DatePatternsHdl, Edit&, rEd, void ) { - const OUString aPatterns( pEd->GetText()); + const OUString aPatterns( rEd.GetText()); OUStringBuffer aBuf( aPatterns); sal_Int32 nChar = 0; bool bValid = true; @@ -1787,26 +1784,25 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd ) // Do not use SetText(...,GetSelection()) because internally the // reference's pointer of the selection is obtained resulting in the // entire text being selected at the end. - Selection aSelection( pEd->GetSelection()); - pEd->SetText( aBuf.makeStringAndClear(), aSelection); + Selection aSelection( rEd.GetSelection()); + rEd.SetText( aBuf.makeStringAndClear(), aSelection); } if (bValid) { - pEd->SetControlForeground(); - pEd->SetControlBackground(); + rEd.SetControlForeground(); + rEd.SetControlBackground(); } else { #if 0 //! Gives white on white!?! instead of white on reddish. - pEd->SetControlBackground( ::Color( RGB_COLORDATA( 0xff, 0x65, 0x63))); - pEd->SetControlForeground( ::Color( COL_WHITE)); + rEd.SetControlBackground( ::Color( RGB_COLORDATA( 0xff, 0x65, 0x63))); + rEd.SetControlForeground( ::Color( COL_WHITE)); #else - pEd->SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0))); + rEd.SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0))); #endif } m_bDatePatternsValid = bValid; - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 4d803ba3c8dd..695d03c0d100 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -58,7 +58,7 @@ private: VclPtr<CheckBox> m_pCollectUsageInfo; - DECL_LINK( TwoFigureHdl, NumericField* ); + DECL_LINK_TYPED( TwoFigureHdl, Edit&, void ); DECL_LINK_TYPED( TwoFigureConfigHdl, SpinField&, void ); DECL_LINK_TYPED( TwoFigureConfigFocusHdl, Control&, void ); #ifdef WNT @@ -161,7 +161,7 @@ class OfaLanguagesTabPage : public SfxTabPage DECL_LINK_TYPED( SupportHdl, Button*, void ) ; DECL_LINK_TYPED( LocaleSettingHdl, ListBox&, void ) ; - DECL_LINK( DatePatternsHdl, Edit* ) ; + DECL_LINK_TYPED( DatePatternsHdl, Edit&, void ) ; public: OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 7903b1cbea20..7de37b318247 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -290,7 +290,7 @@ void SvxGeneralTabPage::InitControls () void SvxGeneralTabPage::SetLinks () { // link for updating the initials - Link<> aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl ); Row& rNameRow = *vRows[nNameRow]; for (unsigned i = rNameRow.nFirstField; i != rNameRow.nLastField - 1; ++i) vFields[i]->pEdit->SetModifyHdl(aLink); @@ -347,7 +347,7 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet ) // ModifyHdl_Impl() // This handler updates the initials (short name) // when one of the name fields was updated. -IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit ) +IMPL_LINK_TYPED( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void ) { // short name field and row Field& rShortName = *vFields[nShortNameField]; @@ -358,7 +358,7 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit ) unsigned nField = nInits; for (unsigned i = 0; i != nInits; ++i) { - if (vFields[rNameRow.nFirstField + i]->pEdit == pEdit) + if (vFields[rNameRow.nFirstField + i]->pEdit == &rEdit) nField = i; } // updating the initial @@ -372,12 +372,11 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit ) } while ((unsigned)sShortName.getLength() < nInits) sShortName += " "; - OUString sName = pEdit->GetText(); + OUString sName = rEdit.GetText(); OUString sLetter = sName.isEmpty() ? OUString(sal_Unicode(' ')) : sName.copy(0, 1); rShortName.pEdit->SetText(sShortName.replaceAt(nField, 1, sLetter).trim()); } - return 0; } diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index c3b6dcfb98d0..8d53c397d4a9 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -815,7 +815,7 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) : m_pAssignedList->SetSelectHdl( LINK( this, SvxJavaParameterDlg, SelectHdl_Impl ) ); m_pAssignedList->SetDoubleClickHdl( LINK( this, SvxJavaParameterDlg, DblClickHdl_Impl ) ); - ModifyHdl_Impl( m_pParameterEdit ); + ModifyHdl_Impl( *m_pParameterEdit ); EnableRemoveButton(); } @@ -834,12 +834,10 @@ void SvxJavaParameterDlg::dispose() } -IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, ModifyHdl_Impl, Edit&, void) { OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' '); m_pAssignBtn->Enable(!sParam.isEmpty()); - - return 0; } @@ -854,7 +852,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void) nPos = m_pAssignedList->InsertEntry( sParam ); m_pAssignedList->SelectEntryPos( nPos ); m_pParameterEdit->SetText( OUString() ); - ModifyHdl_Impl( m_pParameterEdit ); + ModifyHdl_Impl( *m_pParameterEdit ); EnableRemoveButton(); } } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 271236dffa8b..84fdfa480e46 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -127,7 +127,7 @@ private: VclPtr<ListBox> m_pAssignedList; VclPtr<PushButton> m_pRemoveBtn; - DECL_LINK(ModifyHdl_Impl, void *); + DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void); DECL_LINK_TYPED(DblClickHdl_Impl, ListBox&, void); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index d9b843126f2e..8cd429800169 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -229,7 +229,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) tools::Time aTime( (sal_uInt16)( nTime / 3600 ), (sal_uInt16)( ( nTime % 3600 ) / 60 ), (sal_uInt16)( ( nTime % 3600 ) % 60 ) ); m_pTfGraphicObjectTime->SetTime( aTime ); - GraphicCacheConfigHdl(m_pNfGraphicCache); + GraphicCacheConfigHdl(*m_pNfGraphicCache); // OLECache m_pNfOLECache->SetValue( @@ -252,7 +252,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) -IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl) +IMPL_LINK_NOARG_TYPED(OfaMemoryOptionsPage, GraphicCacheConfigHdl, Edit&, void) { sal_Int32 n = GetNfGraphicCacheVal(); SetNfGraphicObjectCacheMax( n ); @@ -260,8 +260,6 @@ IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl) if( GetNfGraphicObjectCacheVal() > n ) SetNfGraphicObjectCacheVal( n ); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 5a8432d4041f..e7b80b29b484 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -41,7 +41,7 @@ private: VclPtr<VclContainer> m_pQuickStarterFrame; VclPtr<CheckBox> m_pQuickLaunchCB; - DECL_LINK(GraphicCacheConfigHdl, void *); + DECL_LINK_TYPED(GraphicCacheConfigHdl, Edit&, void); sal_Int32 GetNfGraphicCacheVal() const; // returns # of Bytes inline void SetNfGraphicCacheVal( long nSizeInBytes ); diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index c6263ff7dafc..db508a2d40dd 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -220,7 +220,7 @@ public: VclPtr<Edit> mpDriverVersion; DECL_LINK_TYPED(OSSelectHdl, ListBox&, void); - DECL_LINK(EditModifiedHdl, Edit*); + DECL_LINK_TYPED(EditModifiedHdl, Edit&, void); ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag); virtual ~ListEntryDialog() { disposeOnce(); } @@ -285,18 +285,16 @@ IMPL_LINK_TYPED(ListEntryDialog, OSSelectHdl, ListBox&, rListBox, void) } } -IMPL_LINK(ListEntryDialog, EditModifiedHdl, Edit*, pEdit) +IMPL_LINK_TYPED(ListEntryDialog, EditModifiedHdl, Edit&, rEdit, void) { - if (pEdit == mpOSVersion) - maEntry.maOSVersion = pEdit->GetText(); - else if (pEdit == mpPlatformVendor) - maEntry.maPlatformVendor = pEdit->GetText(); - else if (pEdit == mpDevice) - maEntry.maDevice = pEdit->GetText(); - else if (pEdit == mpDriverVersion) - maEntry.maDriverVersion = pEdit->GetText(); - - return 0; + if (&rEdit == mpOSVersion) + maEntry.maOSVersion = rEdit.GetText(); + else if (&rEdit == mpPlatformVendor) + maEntry.maPlatformVendor = rEdit.GetText(); + else if (&rEdit == mpDevice) + maEntry.maDevice = rEdit.GetText(); + else if (&rEdit == mpDriverVersion) + maEntry.maDriverVersion = rEdit.GetText(); } void openListDialog(SvxOpenCLTabPage* pTabPage, OpenCLConfig::ImplMatcher& rEntry, const OString& rTag) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 545988b6a51e..8292dbf335e5 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1143,7 +1143,7 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() ); pCompareClass->loadDefaultCollator( aLanguageTag.getLocale(), 0 ); pCharClass = new CharClass( aLanguageTag ); - ModifyHdl(m_pShortED); + ModifyHdl(*m_pShortED); } } @@ -1256,7 +1256,7 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn) { DeleteEntry(SvTabListBox::GetEntryText(pEntry, 0), SvTabListBox::GetEntryText(pEntry, 1)); m_pReplaceTLB->GetModel()->Remove(pEntry); - ModifyHdl(m_pShortED); + ModifyHdl(*m_pShortED); return false; } } @@ -1313,15 +1313,15 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn) // which means EndDialog() - has to be evaluated in KeyInput return false; } - ModifyHdl(m_pShortED); + ModifyHdl(*m_pShortED); return true; } -IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) +IMPL_LINK_TYPED(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void) { SvTreeListEntry* pFirstSel = m_pReplaceTLB->FirstSelected(); - bool bShort = pEdt == m_pShortED; - const OUString rEntry = pEdt->GetText(); + bool bShort = &rEdt == m_pShortED; + const OUString rEntry = rEdt.GetText(); const OUString rRepString = m_pReplaceED->GetText(); OUString aWordStr( pCharClass->lowercase( rEntry )); @@ -1402,8 +1402,6 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) } } m_pNewReplacePB->Enable( bEnableNew ); - - return 0; } static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rString) @@ -1613,8 +1611,8 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) delete pCompareClass; pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() ); pCompareClass->loadDefaultCollator( LanguageTag::convertToLocale( eLastDialogLanguage ), 0 ); - ModifyHdl(m_pAbbrevED); - ModifyHdl(m_pDoubleCapsED); + ModifyHdl(*m_pAbbrevED); + ModifyHdl(*m_pDoubleCapsED); } } @@ -1706,23 +1704,23 @@ bool OfaAutocorrExceptPage::NewDelHdl(void* pBtn) && !m_pAbbrevED->GetText().isEmpty()) { m_pAbbrevLB->InsertEntry(m_pAbbrevED->GetText()); - ModifyHdl(m_pAbbrevED); + ModifyHdl(*m_pAbbrevED); } else if(pBtn == m_pDelAbbrevPB) { m_pAbbrevLB->RemoveEntry(m_pAbbrevED->GetText()); - ModifyHdl(m_pAbbrevED); + ModifyHdl(*m_pAbbrevED); } else if((pBtn == m_pNewDoublePB || pBtn == m_pDoubleCapsED.get() ) && !m_pDoubleCapsED->GetText().isEmpty()) { m_pDoubleCapsLB->InsertEntry(m_pDoubleCapsED->GetText()); - ModifyHdl(m_pDoubleCapsED); + ModifyHdl(*m_pDoubleCapsED); } else if(pBtn == m_pDelDoublePB) { m_pDoubleCapsLB->RemoveEntry(m_pDoubleCapsED->GetText()); - ModifyHdl(m_pDoubleCapsED); + ModifyHdl(*m_pDoubleCapsED); } return false; } @@ -1743,16 +1741,16 @@ IMPL_LINK_TYPED(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void) } } -IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) +IMPL_LINK_TYPED(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void) { // sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry(); - const OUString& sEntry = pEdt->GetText(); + const OUString& sEntry = rEdt.GetText(); bool bEntryLen = !sEntry.isEmpty(); - if(pEdt == m_pAbbrevED) + if(&rEdt == m_pAbbrevED) { bool bSame = lcl_FindEntry(*m_pAbbrevLB, sEntry, *pCompareClass); if(bSame && sEntry != m_pAbbrevLB->GetSelectEntry()) - pEdt->SetText(m_pAbbrevLB->GetSelectEntry()); + rEdt.SetText(m_pAbbrevLB->GetSelectEntry()); m_pNewAbbrevPB->Enable(!bSame && bEntryLen); m_pDelAbbrevPB->Enable(bSame && bEntryLen); } @@ -1760,11 +1758,10 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) { bool bSame = lcl_FindEntry(*m_pDoubleCapsLB, sEntry, *pCompareClass); if(bSame && sEntry != m_pDoubleCapsLB->GetSelectEntry()) - pEdt->SetText(m_pDoubleCapsLB->GetSelectEntry()); + rEdt.SetText(m_pDoubleCapsLB->GetSelectEntry()); m_pNewDoublePB->Enable(!bSame && bEntryLen); m_pDelDoublePB->Enable(bSame && bEntryLen); } - return 0; } VCL_BUILDER_FACTORY(AutoCorrEdit) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 0dda1cd7af80..c1fb557acdc4 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -870,7 +870,7 @@ IMPL_LINK_TYPED( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void ) } } -IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void) { sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( m_pLineWidthMF->GetValue( ), @@ -880,8 +880,6 @@ IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl) m_pFrameSel->SetStyleToSelection( nVal, SvxBorderStyle( m_pLbLineStyle->GetSelectEntryStyle() ) ); - - return 0; } @@ -1179,21 +1177,20 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void) -IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField) +IMPL_LINK_TYPED( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void) { if ( mbSync ) { - sal_Int64 nVal = pField->GetValue(); - if(pField != m_pLeftMF) + sal_Int64 nVal = static_cast<MetricField&>(rField).GetValue(); + if(&rField != m_pLeftMF) m_pLeftMF->SetValue(nVal); - if(pField != m_pRightMF) + if(&rField != m_pRightMF) m_pRightMF->SetValue(nVal); - if(pField != m_pTopMF) + if(&rField != m_pTopMF) m_pTopMF->SetValue(nVal); - if(pField != m_pBottomMF) + if(&rField != m_pBottomMF) m_pBottomMF->SetValue(nVal); } - return 0; } IMPL_LINK_TYPED( SvxBorderTabPage, SyncHdl_Impl, Button*, pBox, void) diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 7efc88e6a102..4fb8d0457b91 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -423,7 +423,7 @@ void SvxCharNamePage::Initialize() // to handle the changes of the other pages SetExchangeSupport(); - Link<> aLink = LINK( this, SvxCharNamePage, FontModifyHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, SvxCharNamePage, FontModifyEditHdl_Impl ); m_pWestFontNameLB->SetModifyHdl( aLink ); m_pWestFontStyleLB->SetModifyHdl( aLink ); m_pWestFontSizeLB->SetModifyHdl( aLink ); @@ -1191,7 +1191,11 @@ IMPL_LINK_TYPED( SvxCharNamePage, FontModifyListBoxHdl_Impl, ListBox&, rBox, voi { FontModifyHdl_Impl(&rBox); } -IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox ) +IMPL_LINK_TYPED( SvxCharNamePage, FontModifyEditHdl_Impl, Edit&, rBox, void ) +{ + FontModifyHdl_Impl(&rBox); +} +void SvxCharNamePage::FontModifyHdl_Impl(void* pNameBox) { m_pImpl->m_aUpdateIdle.Start(); @@ -1200,7 +1204,6 @@ IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox ) FillStyleBox_Impl( static_cast<FontNameBox*>(pNameBox) ); FillSizeBox_Impl( static_cast<FontNameBox*>(pNameBox) ); } - return 0; } @@ -2724,7 +2727,7 @@ void SvxCharPositionPage::Initialize() m_p90degRB->SetClickHdl( aLink2 ); m_p270degRB->SetClickHdl( aLink2 ); - Link<> aLink = LINK( this, SvxCharPositionPage, FontModifyHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, SvxCharPositionPage, FontModifyHdl_Impl ); m_pHighLowMF->SetModifyHdl( aLink ); m_pFontSizeMF->SetModifyHdl( aLink ); @@ -2820,13 +2823,12 @@ IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) -IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) { sal_uInt8 nEscProp = (sal_uInt8)m_pFontSizeMF->GetValue(); short nEsc = (short)m_pHighLowMF->GetValue(); nEsc *= m_pLowPosBtn->IsChecked() ? -1 : 1; UpdatePreview_Impl( 100, nEscProp, nEsc ); - return 0; } @@ -2889,12 +2891,12 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningSelectHdl_Impl, ListBox&, void m_pKerningMF->Disable(); } - KerningModifyHdl_Impl( NULL ); + KerningModifyHdl_Impl( *m_pKerningMF ); } -IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) { long nVal = static_cast<long>(m_pKerningMF->GetValue()); nVal = LogicToLogic( nVal, MAP_POINT, MAP_TWIP ); @@ -2912,7 +2914,6 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl) rCJKFont.SetFixKerning( (short)nKern ); rCTLFont.SetFixKerning( (short)nKern ); m_pPreviewWin->Invalidate(); - return 0; } @@ -2942,11 +2943,9 @@ IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, voi -IMPL_LINK_NOARG(SvxCharPositionPage, ScaleWidthModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, ScaleWidthModifyHdl_Impl, Edit&, void) { m_pPreviewWin->SetFontWidthScale( sal_uInt16( m_pScaleWidthMF->GetValue() ) ); - - return 0; } void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet ) diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index e7fa56d2a6ab..d1696bd52380 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -120,7 +120,7 @@ SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rI // disable 3D border m_pCtlPreview->SetBorderStyle(WindowBorderStyle::MONO); - Link<> aLink( LINK( this, SvxConnectionPage, ChangeAttrHdl_Impl ) ); + Link<Edit&,void> aLink( LINK( this, SvxConnectionPage, ChangeAttrEditHdl_Impl ) ); m_pMtrFldHorz1->SetModifyHdl( aLink ); m_pMtrFldVert1->SetModifyHdl( aLink ); m_pMtrFldHorz2->SetModifyHdl( aLink ); @@ -400,7 +400,11 @@ IMPL_LINK_TYPED( SvxConnectionPage, ChangeAttrListBoxHdl_Impl, ListBox&, r, void { ChangeAttrHdl_Impl(&r); } -IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p ) +IMPL_LINK_TYPED( SvxConnectionPage, ChangeAttrEditHdl_Impl, Edit&, r, void ) +{ + ChangeAttrHdl_Impl(&r); +} +void SvxConnectionPage::ChangeAttrHdl_Impl(void* p) { if( p == m_pMtrFldHorz1 ) { @@ -483,8 +487,6 @@ IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p ) m_pMtrFldLine1->SetEmptyFieldValue(); } - - return 0L; } void SvxConnectionPage::FillTypeLB() diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index be6df3cd25a0..b833b5095500 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -87,7 +87,7 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet ) SetFieldUnit( *m_pTopMF , eMetric ); SetFieldUnit( *m_pBottomMF, eMetric ); - Link<> aLk = LINK(this, SvxGrfCropPage, SizeHdl); + Link<Edit&,void> aLk = LINK(this, SvxGrfCropPage, SizeHdl); m_pWidthMF->SetModifyHdl( aLk ); m_pHeightMF->SetModifyHdl( aLk ); @@ -414,19 +414,19 @@ SfxTabPage::sfxpg SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) description: scale changed, adjust size --------------------------------------------------------------------*/ -IMPL_LINK( SvxGrfCropPage, ZoomHdl, MetricField *, pField ) +IMPL_LINK_TYPED( SvxGrfCropPage, ZoomHdl, Edit&, rField, void ) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); FieldUnit eUnit = MapToFieldUnit( pPool->GetMetric( pPool->GetWhich( SID_ATTR_GRAF_CROP ) ) ); - if( pField == m_pWidthZoomMF ) + if( &rField == m_pWidthZoomMF ) { long nLRBorders = lcl_GetValue(*m_pLeftMF, eUnit) +lcl_GetValue(*m_pRightMF, eUnit); m_pWidthMF->SetValue( m_pWidthMF->Normalize( - ((aOrigSize.Width() - nLRBorders) * pField->GetValue())/100L), + ((aOrigSize.Width() - nLRBorders) * static_cast<MetricField&>(rField).GetValue())/100L), eUnit); } else @@ -434,18 +434,16 @@ IMPL_LINK( SvxGrfCropPage, ZoomHdl, MetricField *, pField ) long nULBorders = lcl_GetValue(*m_pTopMF, eUnit) +lcl_GetValue(*m_pBottomMF, eUnit); m_pHeightMF->SetValue( m_pHeightMF->Normalize( - ((aOrigSize.Height() - nULBorders ) * pField->GetValue())/100L) , + ((aOrigSize.Height() - nULBorders ) * static_cast<MetricField&>(rField).GetValue())/100L) , eUnit ); } - - return 0; } /*-------------------------------------------------------------------- description: change size, adjust scale --------------------------------------------------------------------*/ -IMPL_LINK( SvxGrfCropPage, SizeHdl, MetricField *, pField ) +IMPL_LINK_TYPED( SvxGrfCropPage, SizeHdl, Edit&, rField, void ) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -455,7 +453,7 @@ IMPL_LINK( SvxGrfCropPage, SizeHdl, MetricField *, pField ) Size aSize( lcl_GetValue(*m_pWidthMF, eUnit), lcl_GetValue(*m_pHeightMF, eUnit) ); - if(pField == m_pWidthMF) + if(&rField == m_pWidthMF) { long nWidth = aOrigSize.Width() - ( lcl_GetValue(*m_pLeftMF, eUnit) + @@ -475,8 +473,6 @@ IMPL_LINK( SvxGrfCropPage, SizeHdl, MetricField *, pField ) sal_uInt16 nZoom = (sal_uInt16)( aSize.Height() * 100L/ nHeight); m_pHeightZoomMF->SetValue(nZoom); } - - return 0; } /*-------------------------------------------------------------------- @@ -525,7 +521,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropHdl, SpinField&, rField, void ) if(bZoom) { // scale stays, recompute width - ZoomHdl(m_pWidthZoomMF); + ZoomHdl(*m_pWidthZoomMF); } } else @@ -554,7 +550,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropHdl, SpinField&, rField, void ) if(bZoom) { // scale stays, recompute height - ZoomHdl(m_pHeightZoomMF); + ZoomHdl(*m_pHeightZoomMF); } } m_pExampleWN->Invalidate(); @@ -747,11 +743,10 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void ) } -IMPL_LINK( SvxGrfCropPage, CropModifyHdl, MetricField *, pField ) +IMPL_LINK_TYPED( SvxGrfCropPage, CropModifyHdl, Edit&, rField, void ) { aTimer.Start(); - pLastCropField = pField; - return 0; + pLastCropField = static_cast<MetricField*>(&rField); } Size SvxGrfCropPage::GetGrfOrigSize( const Graphic& rGrf ) const diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 88a859564d61..2ffa6abf46cd 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -135,7 +135,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs m_pCtlPreview->SetBackground ( rStyles.GetWindowColor() ); m_pCtlPreview->SetBorderStyle(WindowBorderStyle::MONO); - Link<> aLink( LINK( this, SvxMeasurePage, ChangeAttrHdl_Impl ) ); + Link<Edit&,void> aLink( LINK( this, SvxMeasurePage, ChangeAttrEditHdl_Impl ) ); m_pMtrFldLineDist->SetModifyHdl( aLink ); m_pMtrFldHelplineOverhang->SetModifyHdl( aLink ); m_pMtrFldHelplineDist->SetModifyHdl( aLink ); @@ -668,7 +668,11 @@ IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrListBoxHdl_Impl, ListBox&, rBox, void { ChangeAttrHdl_Impl(&rBox); } -IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) +IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrEditHdl_Impl, Edit&, rBox, void ) +{ + ChangeAttrHdl_Impl(&rBox); +} +void SvxMeasurePage::ChangeAttrHdl_Impl( void* p ) { if( p == m_pMtrFldLineDist ) { @@ -794,8 +798,6 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) m_pCtlPreview->SetAttributes( aAttrSet ); m_pCtlPreview->Invalidate(); - - return 0L; } void SvxMeasurePage::FillUnitLB() diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 4e666c9bec2e..aacd985faf56 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -343,14 +343,14 @@ void SvxNumberFormatTabPage::Init_Impl() m_pLbCurrency->SetSelectHdl( aLink2 ); m_pCbSourceFormat->SetClickHdl( LINK( this, SvxNumberFormatTabPage, SelFormatClickHdl_Impl ) ); - Link<> aLink = LINK( this, SvxNumberFormatTabPage, OptHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, SvxNumberFormatTabPage, OptEditHdl_Impl ); m_pEdDecimals->SetModifyHdl( aLink ); m_pEdLeadZeroes->SetModifyHdl( aLink ); m_pBtnNegRed->SetClickHdl( LINK( this, SvxNumberFormatTabPage, OptClickHdl_Impl ) ); m_pBtnThousand->SetClickHdl( LINK( this, SvxNumberFormatTabPage, OptClickHdl_Impl ) ); m_pLbFormat->SetDoubleClickHdl( HDL( DoubleClickHdl_Impl ) ); - m_pEdFormat->SetModifyHdl( HDL( EditHdl_Impl ) ); + m_pEdFormat->SetModifyHdl( HDL( EditModifyHdl_Impl ) ); m_pIbAdd->SetClickHdl( HDL( ClickHdl_Impl ) ); m_pIbRemove->SetClickHdl( HDL( ClickHdl_Impl ) ); m_pIbInfo->SetClickHdl( HDL( ClickHdl_Impl ) ); @@ -1498,7 +1498,11 @@ bool SvxNumberFormatTabPage::Click_Impl(PushButton* pIB) #* #************************************************************************/ -IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) +IMPL_LINK_TYPED( SvxNumberFormatTabPage, EditModifyHdl_Impl, Edit&, rEdit, void ) +{ + EditHdl_Impl(&rEdit); +} +void SvxNumberFormatTabPage::EditHdl_Impl( Edit* pEdFormat ) { sal_uInt32 nCurKey = NUMKEY_UNDEFINED; @@ -1551,8 +1555,6 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) pNumFmtShell->SetCurNumFmtKey( nCurKey ); UpdateOptions_Impl( true ); } - - return 0; } @@ -1571,7 +1573,11 @@ IMPL_LINK_TYPED( SvxNumberFormatTabPage, OptClickHdl_Impl, Button*, pOptCtrl, vo { OptHdl_Impl(pOptCtrl); } -IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) +IMPL_LINK_TYPED( SvxNumberFormatTabPage, OptEditHdl_Impl, Edit&, rEdit, void ) +{ + OptHdl_Impl(&rEdit); +} +void SvxNumberFormatTabPage::OptHdl_Impl( void* pOptCtrl ) { if ( (pOptCtrl == m_pEdLeadZeroes) || (pOptCtrl == m_pEdDecimals) @@ -1617,7 +1623,6 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) m_pLbFormat->SetNoSelection(); } } - return 0; } IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 36e3f71135cc..741b96a47050 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1847,7 +1847,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer *, m_pPreviewWIN->Invalidate(); } -IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox ) +IMPL_LINK_TYPED( SvxNumOptionsTabPage, AllLevelHdl_Impl, Edit&, rBox, void ) { for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { @@ -1857,14 +1857,13 @@ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox ) if(nActNumLvl & nMask) { SvxNumberFormat aNumFmt(pActNum->GetLevel(e)); - aNumFmt.SetIncludeUpperLevels((sal_uInt8) std::min(pBox->GetValue(), sal_Int64(e + 1)) ); + aNumFmt.SetIncludeUpperLevels((sal_uInt8) std::min(static_cast<NumericField&>(rBox).GetValue(), sal_Int64(e + 1)) ); pActNum->SetLevel(e, aNumFmt); } nMask <<= 1; } } SetModified(); - return 0; } IMPL_LINK_TYPED( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox, void ) @@ -1956,7 +1955,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) SVX_NUM_CHARS_LOWER_LETTER_N == nNumberingType; m_pStartED->SetMin(bNoZeroAllowed ? 1 : 0); if(bIsNull && bNoZeroAllowed) - m_pStartED->GetModifyHdl().Call(m_pStartED); + m_pStartED->GetModifyHdl().Call(*m_pStartED); } IMPL_LINK_TYPED( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox&, rBox, void ) @@ -2021,9 +2020,9 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulColorHdl_Impl, ListBox&, rListBox, voi SetModified(); } -IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField) +IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, Edit&, rField, void) { - sal_uInt16 nRelSize = (sal_uInt16)pField->GetValue(); + sal_uInt16 nRelSize = (sal_uInt16)static_cast<MetricField&>(rField).GetValue(); sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -2037,7 +2036,6 @@ IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField) nMask <<= 1; } SetModified(); - return 0; } IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) @@ -2232,9 +2230,9 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void) } } -IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) +IMPL_LINK_TYPED( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void) { - bool bWidth = pField == m_pWidthMF; + bool bWidth = &rField == m_pWidthMF; bLastWidthModified = bWidth; bool bRatio = m_pRatioCB->IsChecked(); long nWidthVal = static_cast<long>(m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_100TH_MM))); @@ -2297,7 +2295,6 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) nMask <<= 1; } SetModified(bRepaint); - return 0; } IMPL_LINK_TYPED( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void ) @@ -2305,9 +2302,9 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void ) if (static_cast<CheckBox*>(pBox)->IsChecked()) { if (bLastWidthModified) - SizeHdl_Impl(m_pWidthMF); + SizeHdl_Impl(*m_pWidthMF); else - SizeHdl_Impl(m_pHeightMF); + SizeHdl_Impl(*m_pHeightMF); } } @@ -2340,7 +2337,11 @@ IMPL_LINK_NOARG_TYPED( SvxNumOptionsTabPage, EditListBoxHdl_Impl, ListBox&, void { EditModifyHdl_Impl(nullptr); } -IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit ) +IMPL_LINK_TYPED( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit&, rEdit, void ) +{ + EditModifyHdl_Impl(&rEdit); +} +void SvxNumOptionsTabPage::EditModifyHdl_Impl( Edit* pEdit ) { bool bPrefix = pEdit == m_pPrefixED; bool bSuffix = pEdit == m_pSuffixED; @@ -2372,8 +2373,6 @@ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit ) nMask <<= 1; } SetModified(); - - return 0; } static sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sal_uInt16 nXStart, diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 9310f1642371..5f379daf7280 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -422,7 +422,7 @@ void SvxPageDescPage::Init_Impl() m_pLandscapeBtn->SetClickHdl( LINK( this, SvxPageDescPage, SwapOrientation_Impl ) ); m_pPortraitBtn->SetClickHdl( LINK( this, SvxPageDescPage, SwapOrientation_Impl ) ); - Link<> aLink = LINK( this, SvxPageDescPage, BorderModify_Impl ); + Link<Edit&,void> aLink = LINK( this, SvxPageDescPage, BorderModify_Impl ); m_pLeftMarginEdit->SetModifyHdl( aLink ); m_pRightMarginEdit->SetModifyHdl( aLink ); m_pTopMarginEdit->SetModifyHdl( aLink ); @@ -1057,7 +1057,7 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) -IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl) +IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) { sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE ); SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich ); @@ -1077,7 +1077,6 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl) } } UpdateExample_Impl( true ); - return 0; } @@ -1178,12 +1177,11 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) -IMPL_LINK_NOARG(SvxPageDescPage, BorderModify_Impl) +IMPL_LINK_NOARG_TYPED(SvxPageDescPage, BorderModify_Impl, Edit&, void) { if ( !bBorderModified ) bBorderModified = true; UpdateExample_Impl(); - return 0; } void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground ) diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 7d9965c57fac..4b0830400560 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -834,10 +834,9 @@ IMPL_LINK_TYPED( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void UpdateExample_Impl(); } -IMPL_LINK_NOARG(SvxStdParagraphTabPage, ModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxStdParagraphTabPage, ModifyHdl_Impl, Edit&, void) { UpdateExample_Impl(); - return 0; } void SvxStdParagraphTabPage::Init_Impl() @@ -850,7 +849,7 @@ void SvxStdParagraphTabPage::Init_Impl() m_pLeftIndent->SetLoseFocusHdl( aLink2 ); m_pRightIndent->SetLoseFocusHdl( aLink2 ); - Link<> aLink = LINK( this, SvxStdParagraphTabPage, ModifyHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, SvxStdParagraphTabPage, ModifyHdl_Impl ); m_pFLineIndent->SetModifyHdl( aLink ); m_pLeftIndent->SetModifyHdl( aLink ); m_pRightIndent->SetModifyHdl( aLink ); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 4718180cd14f..5056604dc285 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -564,7 +564,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& m_pVertByMF->SetLoseFocusHdl( aLk3 ); m_pFollowCB->SetClickHdl( LINK(this, SvxSwPosSizeTabPage, RangeModifyClickHdl) ); - Link<> aLk = LINK(this, SvxSwPosSizeTabPage, ModifyHdl); + Link<Edit&,void> aLk = LINK(this, SvxSwPosSizeTabPage, ModifyHdl); m_pWidthMF->SetModifyHdl( aLk ); m_pHeightMF->SetModifyHdl( aLk ); m_pHoriByMF->SetModifyHdl( aLk ); @@ -1378,18 +1378,18 @@ IMPL_LINK_TYPED( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) } } -IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit ) +IMPL_LINK_TYPED( SvxSwPosSizeTabPage, ModifyHdl, Edit&, rEdit, void ) { sal_Int64 nWidth = m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_TWIP)); sal_Int64 nHeight = m_pHeightMF->Denormalize(m_pHeightMF->GetValue(FUNIT_TWIP)); if ( m_pKeepRatioCB->IsChecked() ) { - if ( pEdit == m_pWidthMF ) + if ( &rEdit == m_pWidthMF ) { nHeight = sal_Int64((double)nWidth / m_fWidthHeightRatio); m_pHeightMF->SetValue(m_pHeightMF->Normalize(nHeight), FUNIT_TWIP); } - else if(pEdit == m_pHeightMF) + else if(&rEdit == m_pHeightMF) { nWidth = sal_Int64((double)nHeight * m_fWidthHeightRatio); m_pWidthMF->SetValue(m_pWidthMF->Normalize(nWidth), FUNIT_TWIP); @@ -1397,7 +1397,6 @@ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit ) } m_fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0; UpdateExample(); - return 0; } IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, ProtectHdl, Button*, void) diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 066843953d96..20659bdc7f18 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -668,7 +668,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, SelectHdl_Impl, ComboBox&, void) } } -IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, ModifyHdl_Impl, Edit&, void) { sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) @@ -681,11 +681,10 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl) m_pNewBtn->Disable(); m_pDelBtn->Enable(); - return 0; + return; } m_pNewBtn->Enable(); m_pDelBtn->Disable(); - return 0; } void SvxTabulatorTabPage::PageCreated(const SfxAllItemSet& aSet) diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 31d8f9cdda63..35ff35f36152 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -97,7 +97,7 @@ IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, Button*, // preview rXFSet.ClearItem (XATTR_FILLFLOATTRANSPARENCE); - ModifyTransparentHdl_Impl (NULL); + ModifyTransparentHdl_Impl (*m_pMtrTransparent); } IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, Button*, void) @@ -143,7 +143,7 @@ void SvxTransparenceTabPage::ActivateLinear(bool bActivate) m_pMtrTransparent->Enable(bActivate); } -IMPL_LINK_NOARG(SvxTransparenceTabPage, ModifyTransparentHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, Edit&, void) { sal_uInt16 nPos = (sal_uInt16)m_pMtrTransparent->GetValue(); XFillTransparenceItem aItem(nPos); @@ -151,15 +151,17 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ModifyTransparentHdl_Impl) // preview InvalidatePreview(); - - return 0L; } IMPL_LINK_TYPED(SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl, ListBox&, rListBox, void) { ModifiedTrgrHdl_Impl(&rListBox); } -IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl, void *, pControl) +IMPL_LINK_TYPED(SvxTransparenceTabPage, ModifiedTrgrEditHdl_Impl, Edit&, rBox, void) +{ + ModifiedTrgrHdl_Impl(&rBox); +} +void SvxTransparenceTabPage::ModifiedTrgrHdl_Impl(void* pControl) { if(pControl == m_pLbTrgrGradientType || pControl == this) { @@ -184,8 +186,6 @@ IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl, void *, pControl) rXFSet.Put ( aItem ); InvalidatePreview(); - - return 0L; } void SvxTransparenceTabPage::ActivateGradient(bool bActivate) @@ -291,7 +291,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt // gradient transparency m_pMtrTrgrEndValue->SetValue( 100 ); m_pMtrTrgrStartValue->SetValue( 0 ); - Link<> aLink = LINK( this, SvxTransparenceTabPage, ModifiedTrgrHdl_Impl); + Link<Edit&,void> aLink = LINK( this, SvxTransparenceTabPage, ModifiedTrgrEditHdl_Impl); m_pLbTrgrGradientType->SetSelectHdl( LINK( this, SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl) ); m_pMtrTrgrCenterX->SetModifyHdl( aLink ); m_pMtrTrgrCenterY->SetModifyHdl( aLink ); @@ -439,7 +439,7 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs) // linear transparence sal_uInt16 nTransp = static_cast<const XFillTransparenceItem*>(pLinearItem)->GetValue(); m_pMtrTransparent->SetValue(bLinearActive ? nTransp : 50); - ModifyTransparentHdl_Impl(NULL); + ModifyTransparentHdl_Impl(*m_pMtrTransparent); // select the correct radio button if(bGradActive) @@ -745,9 +745,9 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs m_pLbBitmap->SetSelectHdl( LINK( this, SvxAreaTabPage, ModifyBitmapHdl_Impl ) ); m_pTsbStepCount->SetClickHdl( LINK( this, SvxAreaTabPage, ModifyStepCountClickHdl_Impl ) ); - m_pNumFldStepCount->SetModifyHdl( LINK( this, SvxAreaTabPage, ModifyStepCountHdl_Impl ) ); + m_pNumFldStepCount->SetModifyHdl( LINK( this, SvxAreaTabPage, ModifyStepCountEditHdl_Impl ) ); - Link<> aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) ); + Link<Edit&,void> aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) ); Link<Button*,void> aClickLink( LINK( this, SvxAreaTabPage, ModifyTileClickHdl_Impl ) ); m_pTsbTile->SetClickHdl( aClickLink ); m_pTsbStretch->SetClickHdl( aClickLink ); @@ -1740,7 +1740,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) m_pTsbOriginal->SetState( eOriginal ); // #93372# Setting proper state after changing button - ModifyTileHdl_Impl( NULL ); + ModifyTileHdl_Impl( *m_pMtrFldXSize ); //aRbtRow //aRbtColumn @@ -2135,7 +2135,7 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl() m_pBxBitmap->Show(); ModifyBitmapHdl_Impl( *m_pLbBitmap ); - ModifyTileHdl_Impl( m_pTsbOriginal ); + ModifyTileHdl_Impl( *m_pMtrFldXSize ); } @@ -2175,7 +2175,11 @@ IMPL_LINK_TYPED( SvxAreaTabPage, ModifyStepCountClickHdl_Impl, Button*, p, void { ModifyStepCountHdl_Impl(p); } -IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) +IMPL_LINK_TYPED( SvxAreaTabPage, ModifyStepCountEditHdl_Impl, Edit&, r, void ) +{ + ModifyStepCountHdl_Impl(&r); +} +void SvxAreaTabPage::ModifyStepCountHdl_Impl( void* p ) { if( p == m_pTsbStepCount ) { @@ -2200,8 +2204,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) m_rXFSet.Put( XGradientStepCountItem( nValue ) ); m_pCtlXRectPreview->SetAttributes( m_aXFillAttr.GetItemSet() ); m_pCtlXRectPreview->Invalidate(); - - return 0L; } IMPL_LINK_NOARG_TYPED( SvxAreaTabPage, ClickImportHdl_Impl, Button*, void ) @@ -2246,9 +2248,9 @@ IMPL_LINK_NOARG_TYPED( SvxAreaTabPage, ClickImportHdl_Impl, Button*, void ) IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyTileClickHdl_Impl, Button*, void) { - ModifyTileHdl_Impl(NULL); + ModifyTileHdl_Impl(*m_pMtrFldXSize); } -IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyTileHdl_Impl, Edit&, void) { TriState eState = m_pTsbTile->GetState(); if( eState == TRISTATE_TRUE ) @@ -2395,8 +2397,6 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) m_pCtlBitmapPreview->SetAttributes( m_aXFillAttr.GetItemSet() ); m_pCtlBitmapPreview->Invalidate(); - - return 0L; } @@ -2432,17 +2432,17 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ClickScaleHdl_Impl, Button*, void) m_pMtrFldYSize->SetLast( 100000 ); } - ModifyTileHdl_Impl( NULL ); + ModifyTileHdl_Impl( *m_pMtrFldXSize ); } -void SvxAreaTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) +void SvxAreaTabPage::PointChanged( vcl::Window* , RECT_POINT eRcPt ) { m_eRP = eRcPt; // alignment of the bitmap fill - ModifyTileHdl_Impl( pWindow ); + ModifyTileHdl_Impl( *m_pMtrFldXSize ); } void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet) diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 48455fdd16f6..4096920da5f2 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -382,7 +382,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr m_pLbColorModel->SetSelectHdl( LINK( this, SvxColorTabPage, SelectColorModelHdl_Impl ) ); - Link<> aLink = LINK( this, SvxColorTabPage, ModifiedHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, SvxColorTabPage, ModifiedHdl_Impl ); m_pR->SetModifyHdl( aLink ); m_pG->SetModifyHdl( aLink ); m_pB->SetModifyHdl( aLink ); @@ -656,7 +656,7 @@ VclPtr<SfxTabPage> SvxColorTabPage::Create( vcl::Window* pWindow, } // is called when the content of the MtrFields is changed for color values -IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ModifiedHdl_Impl, Edit&, void) { if (eCM == CM_RGB) { @@ -679,8 +679,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl) m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlPreviewNew->Invalidate(); - - return 0; } diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 62f69953475b..ba6e72c8a9c6 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -115,7 +115,7 @@ SvxGradientTabPage::SvxGradientTabPage m_pBtnDelete->SetClickHdl( LINK( this, SvxGradientTabPage, ClickDeleteHdl_Impl ) ); - Link<> aLink = LINK( this, SvxGradientTabPage, ModifiedHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, SvxGradientTabPage, ModifiedEditHdl_Impl ); Link<ListBox&,void> aLink2 = LINK( this, SvxGradientTabPage, ModifiedListBoxHdl_Impl ); m_pLbGradientType->SetSelectHdl( aLink2 ); m_pMtrCenterX->SetModifyHdl( aLink ); @@ -405,7 +405,11 @@ IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox { ModifiedHdl_Impl(&rListBox); } -IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl ) +IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedEditHdl_Impl, Edit&, rBox, void ) +{ + ModifiedHdl_Impl(&rBox); +} +void SvxGradientTabPage::ModifiedHdl_Impl( void* pControl ) { css::awt::GradientStyle eXGS = (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(); @@ -428,8 +432,6 @@ IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl ) m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() ); m_pCtlPreview->Invalidate(); - - return 0L; } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 2c6928c46ccc..490be9dbf4d4 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -116,7 +116,7 @@ SvxHatchTabPage::SvxHatchTabPage m_pLbHatchings->SetSelectHdl( LINK( this, SvxHatchTabPage, ChangeHatchHdl_Impl ) ); - Link<> aLink = LINK( this, SvxHatchTabPage, ModifiedHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, SvxHatchTabPage, ModifiedEditHdl_Impl ); Link<ListBox&,void> aLink2 = LINK( this, SvxHatchTabPage, ModifiedListBoxHdl_Impl ); m_pMtrDistance->SetModifyHdl( aLink ); m_pMtrAngle->SetModifyHdl( aLink ); @@ -371,7 +371,11 @@ IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, v { ModifiedHdl_Impl(&rListBox); } -IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p ) +IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedEditHdl_Impl, Edit&, rEdit, void ) +{ + ModifiedHdl_Impl(&rEdit); +} +void SvxHatchTabPage::ModifiedHdl_Impl( void* p ) { if( p == m_pMtrAngle ) { @@ -398,8 +402,6 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p ) m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() ); m_pCtlPreview->Invalidate(); - - return 0L; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 640b30bb84ff..c5bc272373be 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1424,7 +1424,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) { sal_uInt16 nTransp = static_cast<const XLineTransparenceItem&>( rAttrs->Get( XATTR_LINETRANSPARENCE ) ).GetValue(); m_pMtrTransparent->SetValue( nTransp ); - ChangeTransparentHdl_Impl( NULL ); + ChangeTransparentHdl_Impl( *m_pMtrTransparent ); } else m_pMtrTransparent->SetText( "" ); @@ -1526,10 +1526,9 @@ IMPL_LINK_TYPED( SvxLineTabPage, ChangePreviewListBoxHdl_Impl, ListBox&, rListBo { ChangePreviewHdl_Impl(&rListBox); } -IMPL_LINK( SvxLineTabPage, ChangePreviewModifyHdl_Impl, void *, pCntrl ) +IMPL_LINK_TYPED( SvxLineTabPage, ChangePreviewModifyHdl_Impl, Edit&, rEdit, void ) { - ChangePreviewHdl_Impl(pCntrl); - return 0; + ChangePreviewHdl_Impl(&rEdit); } void SvxLineTabPage::ChangePreviewHdl_Impl(void * pCntrl ) { @@ -1600,10 +1599,9 @@ IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartListBoxHdl_Impl, ListBox&, rListBox, { ChangeStartHdl_Impl(&rListBox); } -IMPL_LINK( SvxLineTabPage, ChangeStartModifyHdl_Impl, void *, p ) +IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartModifyHdl_Impl, Edit&, rEdit, void ) { - ChangeStartHdl_Impl(p); - return 0; + ChangeStartHdl_Impl(&rEdit); } void SvxLineTabPage::ChangeStartHdl_Impl( void * p ) { @@ -1678,10 +1676,9 @@ IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndListBoxHdl_Impl, ListBox&, rListBox, v { ChangeEndHdl_Impl(&rListBox); } -IMPL_LINK( SvxLineTabPage, ChangeEndModifyHdl_Impl, void *, p ) +IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndModifyHdl_Impl, Edit&, rEdit, void ) { - ChangeEndHdl_Impl(p); - return 0; + ChangeEndHdl_Impl(&rEdit); } void SvxLineTabPage::ChangeEndHdl_Impl( void * p ) { @@ -1700,7 +1697,7 @@ void SvxLineTabPage::ChangeEndHdl_Impl( void * p ) -IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void) { sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent->GetValue(); XLineTransparenceItem aItem( nVal ); @@ -1710,8 +1707,6 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) FillXLSet_Impl(); m_pCtlPreview->Invalidate(); - - return 0L; } @@ -1747,10 +1742,10 @@ IMPL_LINK_TYPED( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) SymbolSelected(pButton); } -IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField) +IMPL_LINK_TYPED( SvxLineTabPage, SizeHdl_Impl, Edit&, rField, void) { m_bNewSize = true; - bool bWidth = pField == m_pSymbolWidthMF; + bool bWidth = &rField == m_pSymbolWidthMF; m_bLastWidthModified = bWidth; bool bRatio = m_pSymbolRatioCB->IsChecked(); long nWidthVal = static_cast<long>(m_pSymbolWidthMF->Denormalize(m_pSymbolWidthMF->GetValue(FUNIT_100TH_MM))); @@ -1792,16 +1787,15 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField) } m_pCtlPreview->ResizeSymbol(m_aSymbolSize); m_aSymbolLastSize=m_aSymbolSize; - return 0; } IMPL_LINK_TYPED( SvxLineTabPage, RatioHdl_Impl, Button*, pBox, void ) { if (static_cast<CheckBox*>(pBox)->IsChecked()) { if (m_bLastWidthModified) - SizeHdl_Impl(m_pSymbolWidthMF); + SizeHdl_Impl(*m_pSymbolWidthMF); else - SizeHdl_Impl(m_pSymbolHeightMF); + SizeHdl_Impl(*m_pSymbolHeightMF); } } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 2107aef63627..4ed6ca472e1a 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -144,7 +144,7 @@ SvxLineDefTabPage::SvxLineDefTabPage Link<ListBox&, void> aLink = LINK( this, SvxLineDefTabPage, SelectTypeListBoxHdl_Impl ); m_pLbType1->SetSelectHdl( aLink ); m_pLbType2->SetSelectHdl( aLink ); - Link<> aLink2 = LINK( this, SvxLineDefTabPage, ChangePreviewHdl_Impl ); + Link<Edit&,void> aLink2 = LINK( this, SvxLineDefTabPage, ChangePreviewHdl_Impl ); m_pMtrLength1->SetModifyHdl( aLink2 ); m_pMtrLength2->SetModifyHdl( aLink2 ); m_pMtrDistance->SetModifyHdl( aLink2 ); @@ -393,15 +393,13 @@ void SvxLineDefTabPage::SelectLinestyleHdl_Impl(ListBox* p) -IMPL_LINK_NOARG(SvxLineDefTabPage, ChangePreviewHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangePreviewHdl_Impl, Edit&, void) { FillDash_Impl(); m_pCtlPreview->Invalidate(); - - return 0L; } -IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber1Hdl_Impl, Edit&, void) { if( m_pNumFldNumber1->GetValue() == 0L ) { @@ -414,14 +412,12 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl) m_pNumFldNumber2->SetFirst( 0L ); } - ChangePreviewHdl_Impl( this ); - - return 0L; + ChangePreviewHdl_Impl( *m_pMtrLength1 ); } -IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) { if( m_pNumFldNumber2->GetValue() == 0L ) { @@ -434,9 +430,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl) m_pNumFldNumber1->SetFirst( 0L ); } - ChangePreviewHdl_Impl( this ); - - return 0L; + ChangePreviewHdl_Impl( *m_pMtrLength1 ); } @@ -544,7 +538,7 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p) m_pMtrLength2->Reformat(); } } - ChangePreviewHdl_Impl( p ); + ChangePreviewHdl_Impl( *m_pMtrLength1 ); } @@ -728,7 +722,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) *pnDashListState |= ChangeType::MODIFIED; - ChangePreviewHdl_Impl( this ); + ChangePreviewHdl_Impl( *m_pMtrLength1 ); } } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 4722406423b8..afb9c9306b12 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -161,7 +161,7 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA m_pTsbShowShadow->SetClickHdl( LINK( this, SvxShadowTabPage, ClickShadowHdl_Impl ) ); m_pLbShadowColor->SetSelectHdl( LINK( this, SvxShadowTabPage, SelectShadowHdl_Impl ) ); - Link<> aLink = LINK( this, SvxShadowTabPage, ModifyShadowHdl_Impl ); + Link<Edit&,void> aLink = LINK( this, SvxShadowTabPage, ModifyShadowHdl_Impl ); m_pMtrTransparent->SetModifyHdl( aLink ); m_pMtrDistance->SetModifyHdl( aLink ); } @@ -248,7 +248,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) rAttribs.Put( aItem ); m_pCtlXRectPreview->SetRectangleAttributes( rAttribs ); - ModifyShadowHdl_Impl( this ); + ModifyShadowHdl_Impl( *m_pMtrTransparent ); } m_nPageType = PT_SHADOW; } @@ -478,7 +478,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) m_pMtrTransparent->SaveValue(); ClickShadowHdl_Impl( NULL ); - ModifyShadowHdl_Impl( NULL ); + ModifyShadowHdl_Impl( *m_pMtrTransparent ); } } @@ -504,16 +504,16 @@ IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) } m_pCtlPosition->Invalidate(); - ModifyShadowHdl_Impl( NULL ); + ModifyShadowHdl_Impl( *m_pMtrTransparent ); } -IMPL_LINK_TYPED(SvxShadowTabPage, SelectShadowHdl_Impl, ListBox&, rListBox, void) +IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, SelectShadowHdl_Impl, ListBox&, void) { - ModifyShadowHdl_Impl(&rListBox); + ModifyShadowHdl_Impl(*m_pMtrTransparent); } -IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void) { if( m_pTsbShowShadow->GetState() == TRISTATE_TRUE ) m_rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); @@ -550,18 +550,16 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) m_pCtlXRectPreview->SetShadowAttributes(m_aXFillAttr.GetItemSet()); //aCtlXRectPreview.SetFillAttr( aXFillAttr ); m_pCtlXRectPreview->Invalidate(); - - return 0L; } -void SvxShadowTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) +void SvxShadowTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt ) { m_eRP = eRcPt; // repaint shadow - ModifyShadowHdl_Impl( pWindow ); + ModifyShadowHdl_Impl( *m_pMtrTransparent ); } void SvxShadowTabPage::PageCreated(const SfxAllItemSet& aSet) diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 9cb7cc69b5fc..f6b1f26af278 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -920,12 +920,12 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) if ( m_pMtrWidth->HasFocus() ) { - ChangeWidthHdl( this ); + ChangeWidthHdl( *m_pMtrWidth ); } if ( m_pMtrHeight->HasFocus() ) { - ChangeHeightHdl( this ); + ChangeHeightHdl( *m_pMtrHeight ); } if( !mbPageDisabled ) @@ -1567,7 +1567,7 @@ void SvxPositionSizeTabPage::DisableProtect() -IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl) +IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) { if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() ) { @@ -1586,13 +1586,11 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl) m_pMtrWidth->SetUserValue(nWidth, FUNIT_NONE); } } - - return 0L; } -IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl) +IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) { if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() ) { @@ -1611,8 +1609,6 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl) m_pMtrHeight->SetUserValue(nHeight, FUNIT_NONE); } } - - return 0L; } |