diff options
52 files changed, 81 insertions, 160 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 5deefb066087..67c633dfc8dd 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1843,7 +1843,7 @@ sal_Int32 StarBASIC::GetErl() bool StarBASIC::ErrorHdl() { - return aErrorHdl.IsSet() && aErrorHdl.Call( this ); + return aErrorHdl.Call( this ); } Link<StarBASIC*,bool> StarBASIC::GetGlobalErrorHdl() diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 84e7746ca517..00f2be300cea 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -226,9 +226,7 @@ SeriesHeader::~SeriesHeader() void SeriesHeader::notifyChanges() { - if( m_aChangeLink.IsSet()) - m_aChangeLink.Call( m_spSeriesName.get()); - + m_aChangeLink.Call( m_spSeriesName.get()); m_bSeriesNameChangePending = false; } @@ -745,7 +743,7 @@ void DataBrowser::CursorMoved() { EditBrowseBox::CursorMoved(); - if( GetUpdateMode() && m_aCursorMovedHdlLink.IsSet()) + if( GetUpdateMode() ) m_aCursorMovedHdlLink.Call( this ); } @@ -799,8 +797,7 @@ void DataBrowser::CellModified() { m_bDataValid = IsDataValid(); SetDirty(); - if( m_aCellModifiedLink.IsSet()) - m_aCursorMovedHdlLink.Call( this ); + m_aCursorMovedHdlLink.Call( this ); } void DataBrowser::SetDataFromModel( diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index df88b8429eb1..c11cd43bbf31 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1384,8 +1384,7 @@ namespace svx void SuggestionEdit::DoJump( bool _bUp ) { const Link<Control&,void>& rLoseFocusHdl = GetLoseFocusHdl(); - if( rLoseFocusHdl.IsSet() ) - rLoseFocusHdl.Call( *this ); + rLoseFocusHdl.Call( *this ); m_pScrollBar->SetThumbPos( m_pScrollBar->GetThumbPos() + ( _bUp? -1 : 1 ) ); ( static_cast< HangulHanjaEditDictDialog* >( GetParentDialog() ) )->UpdateScrollbar(); diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 91336b4bf68e..df51d084b28d 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -607,9 +607,7 @@ void AbstractSvxNameDialog_Impl::SetText( const OUString& rStr ) } IMPL_LINK_NOARG_TYPED(AbstractSvxNameDialog_Impl, CheckNameHdl, SvxNameDialog&, bool) { - if( aCheckNameHdl.IsSet() ) - return aCheckNameHdl.Call(*this); - return false; + return aCheckNameHdl.Call(*this); } void AbstractSvxObjectNameDialog_Impl::GetName(OUString& rName) @@ -633,12 +631,7 @@ void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link<AbstractSvxObj IMPL_LINK_NOARG_TYPED(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, SvxObjectNameDialog&, bool) { - if(aCheckNameHdl.IsSet()) - { - return aCheckNameHdl.Call(*this); - } - - return false; + return aCheckNameHdl.Call(*this); } void AbstractSvxObjectTitleDescDialog_Impl::GetTitle(OUString& rTitle) @@ -795,13 +788,11 @@ void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<AbstractSvxPostItDialo } IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, NextHdl, SvxPostItDialog&, void) { - if( aNextHdl.IsSet() ) - aNextHdl.Call(*this); + aNextHdl.Call(*this); } IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, PrevHdl, SvxPostItDialog&, void) { - if( aPrevHdl.IsSet() ) - aPrevHdl.Call(*this); + aPrevHdl.Call(*this); } vcl::Window * AbstractSvxPostItDialog_Impl::GetWindow() { diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index c115591a0af9..4718180cd14f 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1192,8 +1192,7 @@ IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void) aVal.nWidth = nWidth; aVal.nHeight = nHeight; - if(m_aValidateLink.IsSet()) - m_aValidateLink.Call(aVal); + m_aValidateLink.Call(aVal); nWidth = aVal.nWidth; nHeight = aVal.nHeight; diff --git a/dbaccess/source/ui/browser/AsynchronousLink.cxx b/dbaccess/source/ui/browser/AsynchronousLink.cxx index 92ce231abacb..7715c91bd5f0 100644 --- a/dbaccess/source/ui/browser/AsynchronousLink.cxx +++ b/dbaccess/source/ui/browser/AsynchronousLink.cxx @@ -78,8 +78,7 @@ IMPL_LINK_TYPED(OAsynchronousLink, OnAsyncCall, void*, _pArg, void) m_nEventId = 0; } } - if (m_aHandler.IsSet()) - m_aHandler.Call(_pArg); + m_aHandler.Call(_pArg); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 5c0075d0fe27..1db0893962b8 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -126,15 +126,12 @@ void DBTreeListBox::EnableExpandHandler(SvTreeListEntry* _pEntry) void DBTreeListBox::RequestingChildren( SvTreeListEntry* pParent ) { - if (m_aPreExpandHandler.IsSet()) + if (m_aPreExpandHandler.IsSet() && !m_aPreExpandHandler.Call(pParent)) { - if (!m_aPreExpandHandler.Call(pParent)) - { - // an error occurred. The method calling us will reset the entry flags, so it can't be expanded again. - // But we want that the user may do a second try (i.e. because he misstypes a password in this try), so - // we have to reset these flags controlling the expand ability - PostUserEvent(LINK(this, DBTreeListBox, OnResetEntry), pParent, true); - } + // an error occurred. The method calling us will reset the entry flags, so it can't be expanded again. + // But we want that the user may do a second try (i.e. because he misstypes a password in this try), so + // we have to reset these flags controlling the expand ability + PostUserEvent(LINK(this, DBTreeListBox, OnResetEntry), pParent, true); } } @@ -349,8 +346,7 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) if ( KEY_RETURN == nCode ) { bHandled = m_bHandleEnterKey; - if ( m_aEnterKeyHdl.IsSet() ) - m_aEnterKeyHdl.Call(this); + m_aEnterKeyHdl.Call(this); // this is a HACK. If the data source browser is opened in the "beamer", while the main frame // // contains a writer document, then pressing enter in the DSB would be rerouted to the writer diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 0291f06e9c25..60804e129908 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -165,8 +165,7 @@ void OMarkableTreeListBox::CheckButtons() void OMarkableTreeListBox::CheckButtonHdl() { checkedButton_noBroadcast(GetHdlEntry()); - if (m_aCheckButtonHandler.IsSet()) - m_aCheckButtonHandler.Call(this); + m_aCheckButtonHandler.Call(this); } void OMarkableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry) diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 23ecc2a54ed3..565e1babb012 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -217,8 +217,7 @@ namespace dbaui switchMessage(_sURLPrefix); - if ( m_aTypeSelectHandler.IsSet() ) - m_aTypeSelectHandler.Call(*this); + m_aTypeSelectHandler.Call(*this); } void OGeneralPage::implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) @@ -699,16 +698,14 @@ namespace dbaui IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnCreateDatabaseModeSelected, Button*, void ) { - if ( m_aCreationModeHandler.IsSet() ) - m_aCreationModeHandler.Call( *this ); + m_aCreationModeHandler.Call( *this ); OnEmbeddedDBTypeSelected( *m_pEmbeddedDBType ); } IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnSetupModeSelected, Button*, void ) { - if ( m_aCreationModeHandler.IsSet() ) - m_aCreationModeHandler.Call( *this ); + m_aCreationModeHandler.Call( *this ); OnDatasourceTypeSelected(*m_pDatasourceType); } diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 3ab7db66c55a..6506bd90d089 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -153,7 +153,7 @@ namespace dbaui { bool bReturn = SvTreeListBox::Select(pEntry, _bSelect); - if (m_aSelectHdl.IsSet() && !m_bSuspendSelectHdl && _bSelect) + if (!m_bSuspendSelectHdl && _bSelect) m_aSelectHdl.Call(*this); return bReturn; diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index abe080af2f0e..26004ae68ba8 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -74,10 +74,8 @@ namespace dbaui IMPL_LINK( DbaMouseDownListBoxController, OnMultiplexModify, void*, _pArg ) { - if (m_aAdditionalModifyHdl.IsSet()) - m_aAdditionalModifyHdl.Call(_pArg); - if (m_aOriginalModifyHdl.IsSet()) - m_aOriginalModifyHdl.Call(_pArg); + m_aAdditionalModifyHdl.Call(_pArg); + m_aOriginalModifyHdl.Call(_pArg); return 0L; } @@ -409,7 +407,7 @@ namespace dbaui IMPL_LINK( IndexFieldsControl, OnListEntrySelected, void*, p ) { ListBox* _pBox = static_cast<ListBox*>(p); - if (!_pBox->IsTravelSelect() && m_aModifyHdl.IsSet()) + if (!_pBox->IsTravelSelect()) m_aModifyHdl.Call(this); if (_pBox == m_pFieldNameCell) diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 902d6a0f518a..c14fbaf7a264 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -678,8 +678,7 @@ void OutlinerView::Cut() if ( !ImpCalcSelectedPages( false ) || pOwner->ImpCanDeleteSelectedPages( this ) ) { pEditView->Cut(); // Chaining handling - if (aEndCutPasteLink.IsSet()) - aEndCutPasteLink.Call(NULL); + aEndCutPasteLink.Call(NULL); } } @@ -712,8 +711,7 @@ void OutlinerView::PasteSpecial() // Chaining handling // NOTE: We need to do this last because it pEditView may be deleted if a switch of box occurs - if (aEndCutPasteLink.IsSet()) - aEndCutPasteLink.Call(NULL); + aEndCutPasteLink.Call(NULL); } } diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 63235def840d..1c83d4b8af7e 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -43,8 +43,7 @@ namespace pcr IMPL_LINK_NOARG_TYPED(OPropertyBrowserView, OnPageActivation, LinkParamNone*, void) { m_nActivePage = m_pPropBox->GetCurPage(); - if (m_aPageActivationHandler.IsSet()) - m_aPageActivationHandler.Call(NULL); + m_aPageActivationHandler.Call(NULL); } diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 5b9c0e648dd8..600bb7208404 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -149,10 +149,7 @@ namespace pcr IMPL_LINK( FieldLinkRow, OnFieldNameChanged, ComboBox*, /*_pBox*/ ) { - if ( m_aLinkChangeHandler.IsSet() ) - return m_aLinkChangeHandler.Call( this ); - - return 0L; + return m_aLinkChangeHandler.Call( this ); } VCL_BUILDER_FACTORY(FieldLinkRow) diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 126ee9284956..5586aa3affda 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -511,8 +511,7 @@ namespace pcr IMPL_LINK_NOARG_TYPED(OPropertyEditor, OnPageActivate, TabControl*, void) { - if (m_aPageActivationHandler.IsSet()) - m_aPageActivationHandler.Call(NULL); + m_aPageActivationHandler.Call(NULL); } diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index cb9f003007df..4aff1ef70d6c 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -309,8 +309,7 @@ namespace pcr void SQLCommandDesigner::impl_designerClosed_nothrow() { - if ( m_aCloseLink.IsSet() ) - m_aCloseLink.Call( *this ); + m_aCloseLink.Call( *this ); } diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 04a2c5cb77b3..b2b47b056b03 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -289,7 +289,7 @@ void ImageProducer::startProduction() throw(css::uno::RuntimeException, std::exc // graphic is cleared if a new Stream is set if( ( mpGraphic->GetType() == GRAPHIC_NONE ) || mpGraphic->GetContext() ) { - if ( ImplImportGraphic( *mpGraphic ) && maDoneHdl.IsSet() ) + if ( ImplImportGraphic( *mpGraphic ) ) maDoneHdl.Call( mpGraphic ); } @@ -314,8 +314,7 @@ void ImageProducer::startProduction() throw(css::uno::RuntimeException, std::exc (*iter)->complete( css::awt::ImageStatus::IMAGESTATUS_STATICIMAGEDONE, this ); } - if ( maDoneHdl.IsSet() ) - maDoneHdl.Call( NULL ); + maDoneHdl.Call( NULL ); } } } diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx index a9a7a46a29ee..25e172e623bc 100644 --- a/forms/source/richtext/richtextviewport.hxx +++ b/forms/source/richtext/richtextviewport.hxx @@ -54,8 +54,7 @@ namespace frm private: inline void implInvalidateAttributes() const { - if ( m_aInvalidationHandler.IsSet() ) - m_aInvalidationHandler.Call( NULL ); + m_aInvalidationHandler.Call( NULL ); } }; diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 3d7a35a6eb65..9220e31d0d2f 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2668,8 +2668,7 @@ throw( uno::RuntimeException, std::exception ) if ( !m_aAsyncLayoutTimer.IsActive() ) { const Link<Timer *, void>& aLink = m_aAsyncLayoutTimer.GetTimeoutHdl(); - if ( aLink.IsSet() ) - aLink.Call( &m_aAsyncLayoutTimer ); + aLink.Call( &m_aAsyncLayoutTimer ); } if ( m_nLockCount == 0 ) m_aAsyncLayoutTimer.Start(); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 9da77b696bb5..9f4f284709f5 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -506,8 +506,7 @@ IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnClickHdl, Button*, void ) IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnDoubleClickHdl, SvTreeListBox*, bool ) { - if ( m_aCreateLink.IsSet() ) - m_aCreateLink.Call(*this); + m_aCreateLink.Call(*this); return false; } diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index 448913ec501b..a4ec6faf4ddd 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -77,8 +77,7 @@ void OColorListener::setCollapsed(bool _bCollapsed) if ( m_bCollapsed != _bCollapsed ) { m_bCollapsed = _bCollapsed; - if ( m_aCollapsedLink.IsSet() ) - m_aCollapsedLink.Call(*this); + m_aCollapsedLink.Call(*this); } } diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 5bb48bc5ef5d..af9294c31bd2 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -182,8 +182,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt ) changeImage(); m_aVRuler->Show(!m_bCollapsed && m_bShowRuler); - if ( m_aCollapsedLink.IsSet() ) - m_aCollapsedLink.Call(*this); + m_aCollapsedLink.Call(*this); } m_pParent->showProperties(); diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 94b1148af7b7..009b84b39bf3 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -451,8 +451,7 @@ void ScFilterDlg::SetActive() if ( bRefInputMode ) { pEdCopyArea->GrabFocus(); - if ( pEdCopyArea->GetModifyHdl().IsSet() ) - ((Link<>&)pEdCopyArea->GetModifyHdl()).Call( pEdCopyArea ); + ((Link<>&)pEdCopyArea->GetModifyHdl()).Call( pEdCopyArea ); } else GrabFocus(); diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index f4f972d83bb2..560391eb5fa8 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -252,8 +252,7 @@ void ScSpecialFilterDlg::SetActive() if ( pRefInputEdit == pEdCopyArea ) { pEdCopyArea->GrabFocus(); - if ( pEdCopyArea->GetModifyHdl().IsSet() ) - ((Link<>&)pEdCopyArea->GetModifyHdl()).Call( pEdCopyArea ); + ((Link<>&)pEdCopyArea->GetModifyHdl()).Call( pEdCopyArea ); } else if ( pRefInputEdit == pEdFilterArea ) { diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 4cb613f5fd51..54a1930c21dd 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -420,8 +420,7 @@ IMPL_LINK_NOARG_TYPED(ScTableLink, RefreshHdl, Timer *, void) IMPL_LINK_TYPED( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink&, rLink, void ) { - if ( pImpl->m_aEndEditLink.IsSet() ) - pImpl->m_aEndEditLink.Call( rLink ); + pImpl->m_aEndEditLink.Call( rLink ); bInEdit = false; Application::SetDefDialogParent( pImpl->m_pOldParent ); } diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index b1c833cb028a..d1a12fc96939 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -271,8 +271,7 @@ void ScEditWindow::KeyInput( const KeyEvent& rKEvt ) else if ( !rKEvt.GetKeyCode().IsMod1() && !rKEvt.GetKeyCode().IsShift() && rKEvt.GetKeyCode().IsMod2() && rKEvt.GetKeyCode().GetCode() == KEY_DOWN ) { - if (aObjectSelectLink.IsSet() ) - aObjectSelectLink.Call(*this); + aObjectSelectLink.Call(*this); } } diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 1a2e538caac6..ee0435ecf8eb 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -147,8 +147,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) ReleaseMouse(); if( rMEvt.IsLeft() && (rMEvt.GetClicks() == 2) ) { - if( maDoubleClickHdl.IsSet() ) - maDoubleClickHdl.Call( *this ); + maDoubleClickHdl.Call( *this ); } else { diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 7540fa7a1946..38ded5a9b710 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -203,8 +203,7 @@ bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetWindow() == this ) { - if(aClickHdl.IsSet()) - aClickHdl.Call(*this); + aClickHdl.Call(*this); } } } diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index a3d1be1c462b..c3fc2275fcff 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -122,8 +122,7 @@ void SlotStateListener::statusChanged ( { ThrowIfDisposed(); OUString sSlotName (rState.FeatureURL.Complete); - if (maCallback.IsSet()) - maCallback.Call(sSlotName); + maCallback.Call(sSlotName); } void SlotStateListener::ReleaseListeners() diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 15168bc2290c..6d97ba0d31a4 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -418,8 +418,7 @@ void SvFileObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pLink, const Li sFile += OUString(::sfx2::cTokenSeparator); sFile += aDlg.GetCurrentFilter(); - if ( aEndEditLink.IsSet() ) - aEndEditLink.Call( sFile ); + aEndEditLink.Call( sFile ); } else sFile.clear(); @@ -525,8 +524,7 @@ IMPL_LINK_TYPED( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileD SAL_WARN( "sfx.appl", "SvFileObject::DialogClosedHdl(): wrong file type" ); } - if ( aEndEditLink.IsSet() ) - aEndEditLink.Call( sFile ); + aEndEditLink.Call( sFile ); } /* [Description] diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index f509183b69e2..421abc7c1b1a 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -253,8 +253,7 @@ IMPL_LINK_TYPED( SvBaseLink, EndEditHdl, const OUString&, _rNewName, void ) if ( !ExecuteEdit( sNewName ) ) sNewName.clear(); bWasLastEditOK = !sNewName.isEmpty(); - if ( pImpl->m_aEndEditLink.IsSet() ) - pImpl->m_aEndEditLink.Call( *this ); + pImpl->m_aEndEditLink.Call( *this ); } @@ -505,8 +504,7 @@ void SvBaseLink::Edit( vcl::Window* pParent, const Link<SvBaseLink&,void>& rEndE { ExecuteEdit( OUString() ); bWasLastEditOK = false; - if ( pImpl->m_aEndEditLink.IsSet() ) - pImpl->m_aEndEditLink.Call( *this ); + pImpl->m_aEndEditLink.Call( *this ); } } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 9141bd16ea4b..6bbddc0e744e 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2308,8 +2308,7 @@ void FileDialogHelper::SetContext( Context _eNewContext ) IMPL_LINK_NOARG_TYPED(FileDialogHelper, ExecuteSystemFilePicker, void*, void) { m_nError = mpImp->execute(); - if ( m_aDialogClosedLink.IsSet() ) - m_aDialogClosedLink.Call( this ); + m_aDialogClosedLink.Call( this ); } // rDirPath has to be a directory @@ -2573,8 +2572,7 @@ void SAL_CALL FileDialogHelper::DialogSizeChanged() void SAL_CALL FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent ) { m_nError = ( RET_OK == _rEvent.DialogResult ) ? ERRCODE_NONE : ERRCODE_ABORT; - if ( m_aDialogClosedLink.IsSet() ) - m_aDialogClosedLink.Call( this ); + m_aDialogClosedLink.Call( this ); } ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index b5e9067ad3ea..89d69a926ab6 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -289,8 +289,7 @@ namespace sfx2 { SfxDockingWindow::EndDocking( i_rRect, i_bFloatMode ); - if ( m_aEndDockingHdl.IsSet() ) - m_aEndDockingHdl.Call( this ); + m_aEndDockingHdl.Call( this ); } diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 951930e2c413..8c479a95f4cb 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -262,8 +262,7 @@ IMPL_LINK_NOARG_TYPED(DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper* m_sFilter = m_pFileDlg->GetRealFilter(); - if ( m_aDialogClosedLink.IsSet() ) - m_aDialogClosedLink.Call( m_pFileDlg ); + m_aDialogClosedLink.Call( m_pFileDlg ); } } // namespace sfx2 diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index f645bca41044..2bca60cf3a01 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1129,8 +1129,7 @@ void SfxPopupWindow::StateChanged( void SfxPopupWindow::Delete() { - if ( m_aDeleteLink.IsSet() ) - m_aDeleteLink.Call( this ); + m_aDeleteLink.Call( this ); disposeOnce(); } diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 68a435e001c5..db3192a7d66f 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -1387,8 +1387,7 @@ Size HeaderBar::CalcWindowSizePixel() const { if ( !mxAccessible.is() ) { - if ( maCreateAccessibleHdl.IsSet() ) - maCreateAccessibleHdl.Call( this ); + maCreateAccessibleHdl.Call( this ); if ( !mxAccessible.is() ) mxAccessible = Window::CreateAccessible(); diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index dc4122f6e7f8..12bddb846670 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -590,8 +590,7 @@ void TransferDataContainer::StartDrag( void TransferDataContainer::DragFinished( sal_Int8 nDropAction ) { - if( pImpl->aFinshedLnk.IsSet() ) - pImpl->aFinshedLnk.Call( nDropAction ); + pImpl->aFinshedLnk.Call( nDropAction ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 5b21b4a3a26c..6b560012db53 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -185,8 +185,7 @@ void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) { Control::MouseButtonUp( rMEvt ); - if ( aPipetteClickLink.IsSet() ) - aPipetteClickLink.Call( *this ); + aPipetteClickLink.Call( *this ); } else if ( bWorkplaceMode ) { @@ -210,8 +209,7 @@ void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) Invalidate( aGraphRect ); - if ( aWorkplaceClickLink.IsSet() ) - aWorkplaceClickLink.Call( *this ); + aWorkplaceClickLink.Call( *this ); } else GraphCtrl::MouseButtonUp( rMEvt ); diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index a013a990bfe9..272005bc12d5 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -199,8 +199,7 @@ void GraphCtrl::SetGraphic( const Graphic& rGraphic, bool bNewModel ) if ( bSdrMode && bNewModel ) InitSdrModel(); - if ( aGraphSizeLink.IsSet() ) - aGraphSizeLink.Call( this ); + aGraphSizeLink.Call( this ); Resize(); Invalidate(); @@ -745,8 +744,7 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) IMPL_LINK_TYPED( GraphCtrl, UpdateHdl, Idle*, pTimer, void ) { - if ( aUpdateLink.IsSet() ) - aUpdateLink.Call( this ); + aUpdateLink.Call( this ); pTimer->Start(); } diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index cf7673a83c75..d9b0911b2a0f 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -47,8 +47,7 @@ namespace svxform { if ( m_bClipboardOwner ) { // simulate a lostOwnership to notify parties interested in - if ( m_aClipboardListener.IsSet() ) - m_aClipboardListener.Call( *this ); + m_aClipboardListener.Call( *this ); } m_bClipboardOwner = true; @@ -80,8 +79,7 @@ namespace svxform TransferableHelper::implCallOwnLostOwnership( _rxClipboard, _rxTrans ); m_bClipboardOwner = false; - if ( m_aClipboardListener.IsSet() ) - m_aClipboardListener.Call( *this ); + m_aClipboardListener.Call( *this ); } diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 571334e3dfa4..5361cf735a32 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -78,8 +78,7 @@ void FmSearchThread::run() void FmSearchThread::onTerminated() { - if (m_aTerminationHdl.IsSet()) - m_aTerminationHdl.Call(this); + m_aTerminationHdl.Call(this); delete this; } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index e7aaeeca0a9c..7de8f4f4fe91 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -1256,8 +1256,7 @@ namespace svx // #i51621# / 2005-08-19 / frank.schoenheit@sun.com // bool bHaveAnyServeableSlots = m_xActiveTextComponent.is() || !m_aControlFeatures.empty(); // LEM: not calling m_aControlActivatonHandler causes fdo#63695, so disable this hack for now. - if ( m_aControlActivationHandler.IsSet() /* && bHaveAnyServeableSlots */ ) - m_aControlActivationHandler.Call( NULL ); + m_aControlActivationHandler.Call( NULL ); m_bNeedClipboardInvalidation = true; } diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index e05b8abd7c15..bf6e1c12a9ee 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -588,8 +588,7 @@ void GalleryListView::DoubleClick( const BrowserMouseEvent& rEvt ) void GalleryListView::Select() { - if( maSelectHdl.IsSet() ) - maSelectHdl.Call( this ); + maSelectHdl.Call( this ); } sal_Int8 GalleryListView::AcceptDrop( const BrowserAcceptDropEvent& ) diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 92ed90c9217a..6a2e179c71af 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -611,7 +611,7 @@ IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,v aDrawOutlLink.Call(pFI); bOk = !rStr.isEmpty(); } - if (!bOk && aOldCalcFieldValueLink.IsSet()) { + if (!bOk) { aOldCalcFieldValueLink.Call(pFI); } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 659b40d20e12..d100e1125ba5 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -561,14 +561,12 @@ void SvxStyleBox_Impl::StateChanged( StateChangedType nStateChange ) if ( nStateChange == StateChangedType::Visible ) { bVisible = IsReallyVisible(); - if ( aVisibilityListener.IsSet() ) - aVisibilityListener.Call( *this ); + aVisibilityListener.Call( *this ); } else if ( nStateChange == StateChangedType::InitShow ) { bVisible = true; - if ( aVisibilityListener.IsSet() ) - aVisibilityListener.Call( *this ); + aVisibilityListener.Call( *this ); } } @@ -1375,8 +1373,7 @@ IMPL_LINK_TYPED(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void) if ( IsInPopupMode() ) EndPopupMode(); - if ( maSelectedLink.IsSet() ) - maSelectedLink.Call(aColor); + maSelectedLink.Call(aColor); maColorSelectFunction(maCommand, aColor); } @@ -1415,8 +1412,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, AutoColorClickHdl, Button*, void) if ( IsInPopupMode() ) EndPopupMode(); - if ( maSelectedLink.IsSet() ) - maSelectedLink.Call(aColor); + maSelectedLink.Call(aColor); maColorSelectFunction(maCommand, aColor); } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index eeaa6ef8f822..282de8c9b02a 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1596,7 +1596,7 @@ void SwTOXEdit::KeyInput( const KeyEvent& rKEvt ) m_pParent->SetFocus2theAllBtn(); } } - if(bCall && aPrevNextControlLink.IsSet()) + if(bCall) aPrevNextControlLink.Call(*this); } @@ -3196,8 +3196,7 @@ void SwTokenWindow::RemoveControl(SwTOXButton* pDel, bool bInternalCall ) SetActiveControl(pLeftEdit); AdjustPositions(); - if(aModifyHdl.IsSet()) - aModifyHdl.Call(0); + aModifyHdl.Call(0); } void SwTokenWindow::AdjustPositions() @@ -3464,8 +3463,7 @@ IMPL_LINK(SwTokenWindow, EditResize, Edit*, pEdit) { static_cast<SwTOXEdit*>(pEdit)->AdjustSize(); AdjustPositions(); - if(aModifyHdl.IsSet()) - aModifyHdl.Call(0); + aModifyHdl.Call(0); return 0; } diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx index d17706730dcf..8a2a501b5855 100644 --- a/sw/source/uibase/cctrl/actctrl.cxx +++ b/sw/source/uibase/cctrl/actctrl.cxx @@ -55,8 +55,7 @@ void ReturnActionEdit::KeyInput( const KeyEvent& rEvt) if( aKeyCode.GetCode() == KEY_RETURN && !nModifier) { - if(aReturnActionLink.IsSet()) - aReturnActionLink.Call(*this); + aReturnActionLink.Call(*this); } else Edit::KeyInput(rEvt); diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 0b3525c63120..9afbb4ab79a1 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -368,8 +368,7 @@ IMPL_LINK_TYPED( SwOneExampleFrame, TimeoutHdl, Idle*, pTimer, void ) // can only be done here - the SFX changes the ScrollBar values disableScrollBars(xViewProps, (nStyleFlags&EX_SHOW_ONLINE_LAYOUT) != 0); - if (aInitializedLink.IsSet()) - aInitializedLink.Call(*this); + aInitializedLink.Call(*this); uno::Reference< text::XTextViewCursorSupplier > xCrsrSupp(_xController, uno::UNO_QUERY); uno::Reference< view::XScreenCursor > xScrCrsr(xCrsrSupp->getViewCursor(), uno::UNO_QUERY); diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 8d613d734299..09a55945ab00 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -698,8 +698,7 @@ void SvtSysLocaleOptions::ConfigurationChanged( utl::ConfigurationBroadcaster* p if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY ) { const Link<LinkParamNone*,void>& rLink = GetCurrencyChangeLink(); - if ( rLink.IsSet() ) - rLink.Call( NULL ); + rLink.Call( NULL ); } ::utl::detail::Options::ConfigurationChanged( p, nHint ); diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 7e3c7dd2a791..33dfccc3436d 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -42,7 +42,7 @@ #define VECT_MAP( _def_pIn, _def_pOut, _def_nVal ) _def_pOut[_def_nVal]=(_def_pIn[_def_nVal]=((_def_nVal)*4L)+1L)+5L; #define BACK_MAP( _def_nVal ) ((((_def_nVal)+2)>>2)-1) #define VECT_PROGRESS( _def_pProgress, _def_nVal ) \ - if(_def_pProgress && _def_pProgress->IsSet()) \ + if(_def_pProgress) \ (_def_pProgress->Call(_def_nVal)); class ImplVectMap; diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index af33e4f5d98c..115ec625e159 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -450,8 +450,7 @@ void Splitter::Split() void Splitter::EndSplit() { - if ( maEndSplitHdl.IsSet() ) - maEndSplitHdl.Call( this ); + maEndSplitHdl.Call( this ); } void Splitter::Splitting( Point& /* rSplitPos */ ) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 84a28c84c4e4..8b4308a9503a 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4421,8 +4421,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt ) void ToolBox::Command( const CommandEvent& rCEvt ) { - if ( maCommandHandler.IsSet() ) - maCommandHandler.Call( &rCEvt ); + maCommandHandler.Call( &rCEvt ); // depict StartDrag on MouseButton/Left/Alt if ( (rCEvt.GetCommand() == CommandEventId::StartDrag) && rCEvt.IsMouseEvent() && @@ -4515,8 +4514,7 @@ void ToolBox::StateChanged( StateChangedType nType ) Invalidate(); } - if ( maStateChangedHandler.IsSet() ) - maStateChangedHandler.Call( &nType ); + maStateChangedHandler.Call( &nType ); } void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) @@ -4535,8 +4533,7 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } - if ( maDataChangedHandler.IsSet() ) - maDataChangedHandler.Call( &rDCEvt ); + maDataChangedHandler.Call( &rDCEvt ); } bool ToolBox::PrepareToggleFloatingMode() |