diff options
Diffstat (limited to 'svx')
51 files changed, 125 insertions, 125 deletions
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 7ce191073b55..b735152ef15d 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -36,8 +36,8 @@ friend class ImpItemEdit; long nAktPaintRow; VclPtr<Edit> pEditControl; OUString aWNamMerk; - Link aEntryChangedHdl; - Link aSetDirtyHdl; + Link<> aEntryChangedHdl; + Link<> aSetDirtyHdl; ImpItemListRow* pAktChangeEntry; long nLastWhichOfs; sal_uInt16 nLastWhich; @@ -90,10 +90,10 @@ public: const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; } OUString GetNewEntryValue() const { return pEditControl->GetText(); } - void SetEntryChangedHdl(const Link& rLink) { aEntryChangedHdl=rLink; } - const Link& GetEntryChangedHdl() const { return aEntryChangedHdl; } - void SetSetDirtyHdl(const Link& rLink) { aSetDirtyHdl=rLink; } - const Link& GetSetDirtyHdl() const { return aSetDirtyHdl; } + void SetEntryChangedHdl(const Link<>& rLink) { aEntryChangedHdl=rLink; } + const Link<>& GetEntryChangedHdl() const { return aEntryChangedHdl; } + void SetSetDirtyHdl(const Link<>& rLink) { aSetDirtyHdl=rLink; } + const Link<>& GetSetDirtyHdl() const { return aSetDirtyHdl; } }; #define WB_STDSIZEABLEDOCKWIN (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE) diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index 6937bf9fd8ab..675ffd371939 100644 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -28,9 +28,9 @@ class ContourWindow : public GraphCtrl tools::PolyPolygon aPolyPoly; Color aPipetteColor; Rectangle aWorkRect; - Link aPipetteLink; - Link aPipetteClickLink; - Link aWorkplaceClickLink; + Link<> aPipetteLink; + Link<> aPipetteClickLink; + Link<> aWorkplaceClickLink; bool bPipetteMode; bool bWorkplaceMode; bool bClickValid; @@ -65,10 +65,10 @@ public: bool IsWorkplaceMode() const { return bWorkplaceMode; } const Rectangle& GetWorkRect() const { return aWorkRect; } - void SetPipetteHdl( const Link& rLink ) { aPipetteLink = rLink; } - void SetPipetteClickHdl( const Link& rLink ) { aPipetteClickLink = rLink; } + void SetPipetteHdl( const Link<>& rLink ) { aPipetteLink = rLink; } + void SetPipetteClickHdl( const Link<>& rLink ) { aPipetteClickLink = rLink; } - void SetWorkplaceClickHdl( const Link& rLink ) { aWorkplaceClickLink = rLink; } + void SetWorkplaceClickHdl( const Link<>& rLink ) { aWorkplaceClickLink = rLink; } }; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index c8ebc7ff591f..641926c98e72 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -387,7 +387,7 @@ SvxTPView::SvxTPView(vcl::Window *pParent, VclBuilderContainer *pTopLevel) pTable->set_height_request(aControlSize.Height()); m_pViewData = VclPtr<SvxRedlinTable>::Create(*pTable, 0); - Link aLink=LINK( this, SvxTPView, PbClickHdl); + Link<> aLink=LINK( this, SvxTPView, PbClickHdl); m_pAccept->SetClickHdl(aLink); m_pAcceptAll->SetClickHdl(aLink); @@ -566,20 +566,20 @@ SvxTPFilter::SvxTPFilter( vcl::Window * pParent) m_pIbClock2->SetClickHdl( LINK( this, SvxTPFilter,TimeHdl) ); m_pBtnRange->SetClickHdl( LINK( this, SvxTPFilter, RefHandle)); - Link aLink=LINK( this, SvxTPFilter, RowEnableHdl) ; + Link<> aLink=LINK( this, SvxTPFilter, RowEnableHdl) ; m_pCbDate->SetClickHdl(aLink); m_pCbAuthor->SetClickHdl(aLink); m_pCbRange->SetClickHdl(aLink); m_pCbAction->SetClickHdl(aLink); m_pCbComment->SetClickHdl(aLink); - Link a2Link=LINK( this, SvxTPFilter, ModifyDate); + Link<> a2Link=LINK( this, SvxTPFilter, ModifyDate); m_pDfDate->SetModifyHdl(a2Link); m_pTfDate->SetModifyHdl(a2Link); m_pDfDate2->SetModifyHdl(a2Link); m_pTfDate2->SetModifyHdl(a2Link); - Link a3Link=LINK( this, SvxTPFilter, ModifyHdl); + Link<> a3Link=LINK( this, SvxTPFilter, ModifyHdl); m_pEdRange->SetModifyHdl(a3Link); m_pEdComment->SetModifyHdl(a3Link); m_pLbAction->SetSelectHdl(a3Link); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 7900913aacaa..d25f61f46b8b 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -396,7 +396,7 @@ void DialControl::SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces mpImpl->mnLinkedFieldValueMultiplyer = 100 / std::pow(10.0, double(nDecimalPlaces)); // remove modify handler from old linked field - ImplSetFieldLink( Link() ); + ImplSetFieldLink( Link<>() ); // remember the new linked field mpImpl->mpLinkField = pField; // set modify handler at new linked field @@ -413,7 +413,7 @@ bool DialControl::IsValueModified() return mpImpl->mnInitialAngle != mpImpl->mnAngle; } -void DialControl::SetModifyHdl( const Link& rLink ) +void DialControl::SetModifyHdl( const Link<>& rLink ) { mpImpl->maModifyHdl = rLink; } @@ -465,7 +465,7 @@ void DialControl::SetRotation( sal_Int32 nAngle, bool bBroadcast ) } } -void DialControl::ImplSetFieldLink( const Link& rLink ) +void DialControl::ImplSetFieldLink( const Link<>& rLink ) { if( mpImpl->mpLinkField ) { diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 713b9e9847e8..3986a6a1a594 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -253,7 +253,7 @@ SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings *pBindinx, m_pTbxShadow->SetSizePixel(aSize); m_pTbxShadow->SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectShadowHdl_Impl) ); - Link aLink = LINK(this, SvxFontWorkDialog, ModifyInputHdl_Impl); + Link<> aLink = LINK(this, SvxFontWorkDialog, ModifyInputHdl_Impl); m_pMtrFldDistance->SetModifyHdl( aLink ); m_pMtrFldTextStart->SetModifyHdl( aLink ); m_pMtrFldShadowX->SetModifyHdl( aLink ); diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 123368477466..cc38f1ed0849 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -922,12 +922,12 @@ bool FrameSelector::GetVisibleColor( Color& rColor ) const } // frame border selection -const Link& FrameSelector::GetSelectHdl() const +const Link<>& FrameSelector::GetSelectHdl() const { return mxImpl->maSelectHdl; } -void FrameSelector::SetSelectHdl( const Link& rHdl ) +void FrameSelector::SetSelectHdl( const Link<>& rHdl ) { mxImpl->maSelectHdl = rHdl; } diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 4209190be843..ee823a521b37 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -94,7 +94,7 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper NotifyInfo aInfo; ImageMap aIMap; TargetList aTargetList; - Link aInfoLink; + Link<> aInfoLink; SfxItemPool* pIMapPool; SfxItemInfo* pItemInfo; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > @@ -145,8 +145,8 @@ public: void DoMacroAssign(); void DoPropertyDialog(); - void SetInfoLink( const Link& rLink ) { aInfoLink = rLink; } - const Link& GetInfoLink() const { return aInfoLink; } + void SetInfoLink( const Link<>& rLink ) { aInfoLink = rLink; } + const Link<>& GetInfoLink() const { return aInfoLink; } void SetTargetList( TargetList& rTargetList ); const TargetList& GetTargetList() const { return aTargetList; } diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index c82ac45ded8e..14efaed2b004 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -157,7 +157,7 @@ SvxGridTabPage::SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet pCbxRotate->SetClickHdl( LINK( this, SvxGridTabPage, ClickRotateHdl_Impl ) ); - Link aLink = LINK( this, SvxGridTabPage, ChangeGridsnapHdl_Impl ); + Link<> aLink = LINK( this, SvxGridTabPage, ChangeGridsnapHdl_Impl ); pCbxUseGridsnap->SetClickHdl( aLink ); pCbxSynchronize->SetClickHdl( aLink ); pCbxGridVisible->SetClickHdl( aLink ); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index d965b9f5743c..b840b4ec3910 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -235,13 +235,13 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings *pBind, SfxChildWindow *pCW, m_pPositionLB->SetSelectHdl(LINK(this, SvxRubyDialog, PositionHdl_Impl)); m_pCharStyleLB->SetSelectHdl(LINK(this, SvxRubyDialog, CharStyleHdl_Impl)); - Link aScrLk(LINK(this, SvxRubyDialog, ScrollHdl_Impl)); + Link<> aScrLk(LINK(this, SvxRubyDialog, ScrollHdl_Impl)); m_pScrollSB->SetScrollHdl( aScrLk ); m_pScrollSB->SetEndScrollHdl( aScrLk ); - Link aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl)); - Link aScrollLk(LINK(this, SvxRubyDialog, EditScrollHdl_Impl)); - Link aJumpLk(LINK(this, SvxRubyDialog, EditJumpHdl_Impl)); + Link<> aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl)); + Link<> aScrollLk(LINK(this, SvxRubyDialog, EditScrollHdl_Impl)); + Link<> aJumpLk(LINK(this, SvxRubyDialog, EditJumpHdl_Impl)); for(sal_uInt16 i = 0; i < 8; i++) { aEditArr[i]->SetModifyHdl(aEditLk); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 7f022235614a..6b66941b9219 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -632,7 +632,7 @@ void SvxSearchDialog::InitControls_Impl() m_pSearchLB->SetModifyHdl( LINK( this, SvxSearchDialog, ModifyHdl_Impl ) ); m_pReplaceLB->SetModifyHdl( LINK( this, SvxSearchDialog, ModifyHdl_Impl ) ); - Link aLink = LINK( this, SvxSearchDialog, FocusHdl_Impl ); + Link<> aLink = LINK( this, SvxSearchDialog, FocusHdl_Impl ); m_pSearchLB->SetGetFocusHdl( aLink ); m_pReplaceLB->SetGetFocusHdl( aLink ); @@ -807,7 +807,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) if ( pSearchItem->GetAppFlag() == SvxSearchApp::CALC ) { m_pCalcGrid->Show(); - Link aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl ); + Link<> aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl ); m_pCalcSearchInLB->SetSelectHdl( aLink ); m_pRowsBtn->SetClickHdl( aLink ); m_pColumnsBtn->SetClickHdl( aLink ); diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 0b84e42d68f6..dd66ce96a876 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -218,7 +218,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p m_pBtnAssign->SetClickHdl( LINK( this, Svx3DWin, ClickAssignHdl ) ); m_pBtnUpdate->SetClickHdl( LINK( this, Svx3DWin, ClickUpdateHdl ) ); - Link aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) ); + Link<> aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) ); m_pBtnGeo->SetClickHdl( aLink ); m_pBtnRepresentation->SetClickHdl( aLink ); m_pBtnLight->SetClickHdl( aLink ); @@ -357,7 +357,7 @@ void Svx3DWin::dispose() void Svx3DWin::Construct() { m_pBtnGeo->Check(); - Link aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) ); + Link<> aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) ); aLink.Call(m_pBtnGeo); m_pCtlLightPreview->Hide(); } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index ffc4d3465eaf..40874b41fbcb 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2693,7 +2693,7 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG DbFilterField::~DbFilterField() { if (m_nControlClass == ::com::sun::star::form::FormComponentType::CHECKBOX) - static_cast<CheckBoxControl*>(m_pWindow.get())->SetClickHdl( Link() ); + static_cast<CheckBoxControl*>(m_pWindow.get())->SetClickHdl( Link<>() ); } @@ -3612,7 +3612,7 @@ void FmXEditCell::disposing() m_aTextListeners.disposeAndClear(aEvt); m_aChangeListeners.disposeAndClear(aEvt); - m_pEditImplementation->SetModifyHdl( Link() ); + m_pEditImplementation->SetModifyHdl( Link<>() ); if ( m_bOwnEditImplementation ) delete m_pEditImplementation; m_pEditImplementation = NULL; @@ -3858,7 +3858,7 @@ void FmXCheckBoxCell::disposing() m_aItemListeners.disposeAndClear(aEvt); m_aActionListeners.disposeAndClear(aEvt); - static_cast< CheckBoxControl& >( m_pCellControl->GetWindow() ).SetClickHdl(Link()); + static_cast< CheckBoxControl& >( m_pCellControl->GetWindow() ).SetClickHdl(Link<>()); m_pBox = NULL; FmXDataCell::disposing(); @@ -4034,8 +4034,8 @@ void FmXListBoxCell::disposing() m_aItemListeners.disposeAndClear(aEvt); m_aActionListeners.disposeAndClear(aEvt); - m_pBox->SetSelectHdl( Link() ); - m_pBox->SetDoubleClickHdl( Link() ); + m_pBox->SetSelectHdl( Link<>() ); + m_pBox->SetDoubleClickHdl( Link<>() ); m_pBox = NULL; FmXTextCell::disposing(); @@ -4590,7 +4590,7 @@ void FmXFilterCell::disposing() ::com::sun::star::lang::EventObject aEvt(*this); m_aTextListeners.disposeAndClear(aEvt); - static_cast<DbFilterField*>(m_pCellControl)->SetCommitHdl(Link()); + static_cast<DbFilterField*>(m_pCellControl)->SetCommitHdl(Link<>()); FmXGridCell::disposing(); } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 75e63f556b4d..a92cca0876da 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1375,7 +1375,7 @@ namespace svxform // handler m_pModelsBox->SetSelectHdl( LINK( this, DataNavigatorWindow, ModelSelectHdl ) ); - Link aLink = LINK( this, DataNavigatorWindow, MenuSelectHdl ); + Link<> aLink = LINK( this, DataNavigatorWindow, MenuSelectHdl ); m_pModelBtn->SetSelectHdl( aLink ); m_pInstanceBtn->SetSelectHdl( aLink ); aLink = LINK( this, DataNavigatorWindow, MenuActivateHdl ); @@ -2534,7 +2534,7 @@ namespace svxform void AddDataItemDialog::InitDialog() { // set handler - Link aLink = LINK( this, AddDataItemDialog, CheckHdl ); + Link<> aLink = LINK( this, AddDataItemDialog, CheckHdl ); m_pRequiredCB->SetClickHdl( aLink ); m_pRelevantCB->SetClickHdl( aLink ); m_pConstraintCB->SetClickHdl( aLink ); @@ -2933,7 +2933,7 @@ namespace svxform sHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT /*| HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED*/ ); m_pNamespacesList->SetSelectHdl( LINK( this, NamespaceItemDialog, SelectHdl ) ); - Link aLink = LINK( this, NamespaceItemDialog, ClickHdl ); + Link<> aLink = LINK( this, NamespaceItemDialog, ClickHdl ); m_pAddNamespaceBtn->SetClickHdl( aLink ); m_pEditNamespaceBtn->SetClickHdl( aLink ); m_pDeleteNamespaceBtn->SetClickHdl( aLink ); diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 50943bd1a92f..7d2f2671e634 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -391,7 +391,7 @@ namespace svxform { if (m_pTransferable) { - m_pTransferable->setClipboardListener( Link() ); + m_pTransferable->setClipboardListener( Link<>() ); m_pTransferable->release(); m_pTransferable = NULL; } diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 6cd4924afd5e..3f3ddfd440d6 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -1287,7 +1287,7 @@ void FmFormShell::ForgetActiveControl() } -void FmFormShell::SetControlActivationHandler( const Link& _rHdl ) +void FmFormShell::SetControlActivationHandler( const Link<>& _rHdl ) { m_pImpl->SetControlActivationHandler( _rHdl ); } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index fe0c4d78d47a..f8e818239a13 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3618,7 +3618,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivate // remove callbacks at the page if ( pPage ) { - pPage->GetImpl().SetFormsCreationHdl( Link() ); + pPage->GetImpl().SetFormsCreationHdl( Link<>() ); } UpdateForms( true ); } @@ -3938,7 +3938,7 @@ void FmXFormShell::ForgetActiveControl() } -void FmXFormShell::SetControlActivationHandler( const Link& _rHdl ) +void FmXFormShell::SetControlActivationHandler( const Link<>& _rHdl ) { m_pTextShell->SetControlActivationHandler( _rHdl ); } diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index f5f86da6cb94..a3ed1a342843 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -107,9 +107,9 @@ FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star:: } -Link FmRecordCountListener::SetPropChangeHandler(const Link& lnk) +Link<> FmRecordCountListener::SetPropChangeHandler(const Link<>& lnk) { - Link lnkReturn = m_lnkWhoWantsToKnow; + Link<> lnkReturn = m_lnkWhoWantsToKnow; m_lnkWhoWantsToKnow = lnk; if (m_xListening.is()) diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index e695c6d8b79f..28c6c247dda5 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -433,7 +433,7 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) : css::uno::UNO_QUERY ); Image aDummyImage; - const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); + const Link<> aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); vcl::Font aInfoFont( maInfoBar->GetControlFont() ); maMiscOptions.AddListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) ); @@ -757,7 +757,7 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName ) mpListView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS)); mpPreview->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_PREVIEW)); - const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); + const Link<> aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); mpIconView->SetSelectHdl( aSelectHdl ); mpListView->SetSelectHdl( aSelectHdl ); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 9fd56751e8a3..ba1d23e2b317 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -510,7 +510,7 @@ bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos ) return true; } -void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProgress ) +void GalleryTheme::Actualize( const Link<>& rActualizeLink, GalleryProgress* pProgress ) { if( !IsReadOnly() ) { diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index 5f078aa9d3c7..b339fe9f6913 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -38,7 +38,7 @@ namespace svxform class DelayedEvent { public: - DelayedEvent( const Link& _rHandler ) + DelayedEvent( const Link<>& _rHandler ) :m_aHandler( _rHandler ) ,m_nEventId( 0 ) { @@ -62,7 +62,7 @@ namespace svxform void CancelPendingCall(); private: - Link m_aHandler; + Link<> m_aHandler; ImplSVEvent * m_nEventId; private: diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 09ab923081c5..a4289d966beb 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -48,7 +48,7 @@ namespace svxform class SVX_DLLPUBLIC OLocalExchange : public TransferableHelper { private: - Link m_aClipboardListener; + Link<> m_aClipboardListener; bool m_bDragging : 1; bool m_bClipboardOwner : 1; @@ -67,7 +67,7 @@ namespace svxform void startDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const GrantAccess& ); void copyToClipboard( vcl::Window* _pWindow, const GrantAccess& ); - void setClipboardListener( const Link& _rListener ) { m_aClipboardListener = _rListener; } + void setClipboardListener( const Link<>& _rListener ) { m_aClipboardListener = _rListener; } void clear(); @@ -112,7 +112,7 @@ namespace svxform inline bool isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); } inline void clear() { if ( isDataExchangeActive() ) m_pTransferable->clear(); } - SVX_DLLPRIVATE void setClipboardListener( const Link& _rListener ) { if ( m_pTransferable ) m_pTransferable->setClipboardListener( _rListener ); } + SVX_DLLPRIVATE void setClipboardListener( const Link<>& _rListener ) { if ( m_pTransferable ) m_pTransferable->setClipboardListener( _rListener ); } protected: SVX_DLLPRIVATE virtual OLocalExchange* createExchange() const = 0; diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index a3d52c147b8b..6e8860756f38 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -54,7 +54,7 @@ class SVX_DLLPRIVATE FmFormPageImpl ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XMap > m_aControlShapeMap; FmFormPage& m_rPage; - Link m_aFormsCreationHdl; + Link<> m_aFormsCreationHdl; bool m_bFirstActivation; bool m_bAttemptedFormCreation; @@ -93,8 +93,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& getForms( bool _bForceCreate = true ); - void SetFormsCreationHdl( const Link& _rFormsCreationHdl ) { m_aFormsCreationHdl = _rFormsCreationHdl; } - const Link& GetFormsCreationHdl() const { return m_aFormsCreationHdl; } + void SetFormsCreationHdl( const Link<>& _rFormsCreationHdl ) { m_aFormsCreationHdl = _rFormsCreationHdl; } + const Link<>& GetFormsCreationHdl() const { return m_aFormsCreationHdl; } protected: /** finds a form with a given data source signature diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 61ddbf23d301..c6d7404e190e 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -432,7 +432,7 @@ public: SAL_DLLPRIVATE void GetTextAttributeState( SfxItemSet& _rSet ); SAL_DLLPRIVATE bool IsActiveControl( bool _bCountRichTextOnly = false ) const; SAL_DLLPRIVATE void ForgetActiveControl(); - SAL_DLLPRIVATE void SetControlActivationHandler( const Link& _rHdl ); + SAL_DLLPRIVATE void SetControlActivationHandler( const Link<>& _rHdl ); /// classifies our host document SAL_DLLPRIVATE ::svxform::DocumentType diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index e00e532a5f91..fc679e30156d 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -108,7 +108,7 @@ namespace svx SfxViewFrame* m_pViewFrame; // invalidating slots SfxBindings& m_rBindings; - Link m_aControlActivationHandler; + Link<> m_aControlActivationHandler; AutoTimer m_aClipboardInvalidation; bool m_bNeedClipboardInvalidation; @@ -123,7 +123,7 @@ namespace svx void GetTextAttributeState( SfxItemSet& _rSet ); bool IsActiveControl( bool _bCountRichTextOnly = false ) const; void ForgetActiveControl(); - void SetControlActivationHandler( const Link& _rHdl ) { m_aControlActivationHandler = _rHdl; } + void SetControlActivationHandler( const Link<>& _rHdl ) { m_aControlActivationHandler = _rHdl; } /** to be called when a form in our document has been activated */ diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 51d94e1f861b..926fbe71d0f8 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -120,7 +120,7 @@ struct FrameSelectorImpl : public Resource FrameSelFlags mnFlags; /// Flags for enabled frame borders. FrameBorderPtrVec maAllBorders; /// Pointers to all frame borders. FrameBorderPtrVec maEnabBorders; /// Pointers to enables frame borders. - Link maSelectHdl; /// Selection handler. + Link<> maSelectHdl; /// Selection handler. long mnCtrlSize; /// Size of the control (always square). long mnArrowSize; /// Size of an arrow image. diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index bd379ce49d40..7cfeeb1294b0 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -683,7 +683,7 @@ class DbFilterField { ::com::sun::star::uno::Sequence< OUString > m_aValueList; OUString m_aText; - Link m_aCommitLink; + Link<> m_aCommitLink; sal_Int16 m_nControlClass; bool m_bFilterList : 1; bool m_bFilterListFilled : 1; @@ -704,8 +704,8 @@ public: const OUString& GetText() const {return m_aText;} void SetText(const OUString& rText); - void SetCommitHdl( const Link& rLink ) { m_aCommitLink = rLink; } - const Link& GetCommitHdl() const { return m_aCommitLink; } + void SetCommitHdl( const Link<>& rLink ) { m_aCommitLink = rLink; } + const Link<>& GetCommitHdl() const { return m_aCommitLink; } protected: diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 6e2294b56e1d..a0d41c24755c 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -171,7 +171,7 @@ void AreaPropertyPanel::Initialize() mpLbFillType->SetAccessibleName(OUString( "Fill")); //wj acc mpLbFillAttr->SetAccessibleName(OUString( "Fill")); //wj acc - Link aLink = LINK( this, AreaPropertyPanel, SelectFillTypeHdl ); + Link<> aLink = LINK( this, AreaPropertyPanel, SelectFillTypeHdl ); mpLbFillType->SetSelectHdl( aLink ); aLink = LINK( this, AreaPropertyPanel, SelectFillAttrHdl ); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index 9d31ad746ade..097b01c877b2 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -75,7 +75,7 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl ( mrAreaPropertyPanel(rPanel), mpBindings(NULL) { - Link aLink = LINK( this, AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl); + Link<> aLink = LINK( this, AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl); maMtrTrgrCenterX->SetModifyHdl( aLink ); maMtrTrgrCenterY->SetModifyHdl( aLink ); maMtrTrgrAngle->SetModifyHdl( aLink ); diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 004fef29dc0b..d63d3524e0b9 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -243,7 +243,7 @@ void LinePropertyPanel::Initialize() FillLineStyleList(); SelectLineStyle(); - Link aLink = LINK( this, LinePropertyPanel, ChangeLineStyleHdl ); + Link<> aLink = LINK( this, LinePropertyPanel, ChangeLineStyleHdl ); mpLBStyle->SetSelectHdl( aLink ); mpLBStyle->SetAccessibleName(OUString( "Style")); mpLBStyle->AdaptDropDownLineCountToMaximum(); diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index b4bf1af137ba..6a0a8fa53d9e 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -179,7 +179,7 @@ void LineWidthControl::Initialize() maVSWidth->SetImage(maIMGCusGray); maVSWidth->SetSelItem(0); - Link aLink = LINK( this, LineWidthControl, VSSelectHdl ) ; + Link<> aLink = LINK( this, LineWidthControl, VSSelectHdl ) ; maVSWidth->SetSelectHdl(aLink); aLink = LINK(this, LineWidthControl, MFModifyHdl); maMFWidth->SetModifyHdl(aLink); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 29f93b25ddc2..ff514d95b4b4 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -66,7 +66,7 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId) meLNSpaceUnit = SFX_MAPUNIT_100TH_MM; - Link aLink = LINK(this, ParaLineSpacingControl, PredefinedValuesHandler); + Link<> aLink = LINK(this, ParaLineSpacingControl, PredefinedValuesHandler); mpSpacing1Button->SetClickHdl(aLink); mpSpacing115Button->SetClickHdl(aLink); mpSpacing15Button->SetClickHdl(aLink); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index db3241acfc04..e69668101c28 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -199,7 +199,7 @@ void ParaPropertyPanel::ReSize(bool /* bSize */) void ParaPropertyPanel::InitToolBoxIndent() { - Link aLink = LINK( this, ParaPropertyPanel, ModifyIndentHdl_Impl ); + Link<> aLink = LINK( this, ParaPropertyPanel, ModifyIndentHdl_Impl ); mpLeftIndent->SetModifyHdl( aLink ); mpRightIndent->SetModifyHdl( aLink ); mpFLineIndent->SetModifyHdl( aLink ); @@ -232,7 +232,7 @@ void ParaPropertyPanel::InitToolBoxIndent() void ParaPropertyPanel::InitToolBoxSpacing() { - Link aLink = LINK( this, ParaPropertyPanel, ULSpaceHdl_Impl ); + Link<> aLink = LINK( this, ParaPropertyPanel, ULSpaceHdl_Impl ); mpTopDist->SetModifyHdl(aLink); mpBottomDist->SetModifyHdl( aLink ); diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index bd1489431c3c..7ada52b9a09e 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -64,7 +64,7 @@ TextCharacterSpacingControl::TextCharacterSpacingControl ( { initial(); FreeResource(); - Link aLink = LINK(this, TextCharacterSpacingControl, KerningSelectHdl); + Link<> aLink = LINK(this, TextCharacterSpacingControl, KerningSelectHdl); maLBKerning->SetSelectHdl(aLink); aLink =LINK(this, TextCharacterSpacingControl, KerningModifyHdl); maEditKerning->SetModifyHdl(aLink); @@ -146,7 +146,7 @@ void TextCharacterSpacingControl::initial() maVSSpacing->AddItem( maImgCus, 0, maStrCus, 0 ); maVSSpacing->SetNoSelection(); - Link aLink = LINK(this, TextCharacterSpacingControl,VSSelHdl ); + Link<> aLink = LINK(this, TextCharacterSpacingControl,VSSelHdl ); maVSSpacing->SetSelectHdl(aLink); maVSSpacing->StartSelection(); maVSSpacing->Show(); diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index b6d9e09a803b..484e5fd74cfa 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -196,7 +196,7 @@ void TextPropertyPanel::EndUnderlinePopupMode() void TextPropertyPanel::InitToolBoxFont() { - Link aLink = LINK(this, TextPropertyPanel, UnderlineClickHdl); + Link<> aLink = LINK(this, TextPropertyPanel, UnderlineClickHdl); mpToolBoxFont->SetDropdownClickHdl(aLink); } @@ -205,7 +205,7 @@ void TextPropertyPanel::InitToolBoxSpacing() const sal_uInt16 nId = mpToolBoxSpacing->GetItemId(UNO_SPACING); mpToolBoxSpacing->SetItemBits(nId, mpToolBoxSpacing->GetItemBits(nId) | ToolBoxItemBits::DROPDOWNONLY); - Link aLink = LINK(this, TextPropertyPanel, SpacingClickHdl); + Link<> aLink = LINK(this, TextPropertyPanel, SpacingClickHdl); mpToolBoxSpacing->SetDropdownClickHdl ( aLink ); mpToolBoxSpacing->SetSelectHdl( aLink ); } diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index a0eae0efb4b2..690578bf71e4 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -86,7 +86,7 @@ void TextUnderlineControl::initial() GetSettings().GetStyleSettings().GetMenuColor() : sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground )); - Link aLink = LINK( this, TextUnderlineControl, PBClickHdl ) ; + Link<> aLink = LINK( this, TextUnderlineControl, PBClickHdl ) ; maPBOptions->SetClickHdl(aLink); maVSUnderline->SetStyle( maVSUnderline->GetStyle()| WB_3DLOOK | WB_NO_DIRECTSELECT ); diff --git a/svx/source/svdraw/sdrundomanager.cxx b/svx/source/svdraw/sdrundomanager.cxx index ecb55c8dea68..adec049b539f 100644 --- a/svx/source/svdraw/sdrundomanager.cxx +++ b/svx/source/svdraw/sdrundomanager.cxx @@ -100,7 +100,7 @@ void SdrUndoManager::Clear() } } -void SdrUndoManager::SetEndTextEditHdl(const Link& rLink) +void SdrUndoManager::SetEndTextEditHdl(const Link<>& rLink) { maEndTextEditHdl = rLink; diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 0d4ee090e7d6..4899c4b97947 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -505,7 +505,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI) } } Outliner& rDrawOutl=pMod->GetDrawOutliner(pTextObj); - Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl(); + Link<> aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl(); if (!bOk && aDrawOutlLink.IsSet()) { aDrawOutlLink.Call(pFI); bOk = !rStr.isEmpty(); @@ -774,8 +774,8 @@ bool SdrObjEditView::SdrBeginTextEdit( else { pTextEditOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink); - pTextEditOutliner->SetBeginPasteOrDropHdl(Link()); - pTextEditOutliner->SetEndPasteOrDropHdl(Link()); + pTextEditOutliner->SetBeginPasteOrDropHdl(Link<>()); + pTextEditOutliner->SetEndPasteOrDropHdl(Link<>()); } } if (pTextEditOutliner != NULL) @@ -856,7 +856,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) // reset the callback link and let the undo manager cleanup all text edit // undo actions to get the stack back to the form before the text edit - pSdrUndoManager->SetEndTextEditHdl(Link()); + pSdrUndoManager->SetEndTextEditHdl(Link<>()); } else { @@ -907,8 +907,8 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) // Set old CalcFieldValue-Handler again, this // has to happen before Obj::EndTextEdit(), as this does UpdateFields(). pTEOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink); - pTEOutliner->SetBeginPasteOrDropHdl(Link()); - pTEOutliner->SetEndPasteOrDropHdl(Link()); + pTEOutliner->SetBeginPasteOrDropHdl(Link<>()); + pTEOutliner->SetEndPasteOrDropHdl(Link<>()); const bool bUndo = IsUndoEnabled(); if( bUndo ) diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index b5577781ad69..4afabbe9b7d8 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -97,7 +97,7 @@ OLEObjCache::OLEObjCache() { nSize = officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get(); pTimer = new AutoTimer(); - Link aLink = LINK(this, OLEObjCache, UnloadCheckHdl); + Link<> aLink = LINK(this, OLEObjCache, UnloadCheckHdl); pTimer->SetTimeoutHdl(aLink); pTimer->SetTimeout(20000); @@ -251,7 +251,7 @@ void SdrLinkList::Clear() aList.clear(); } -unsigned SdrLinkList::FindEntry(const Link& rLink) const +unsigned SdrLinkList::FindEntry(const Link<>& rLink) const { unsigned nAnz=GetLinkCount(); for (unsigned i=0; i<nAnz; i++) { @@ -260,15 +260,15 @@ unsigned SdrLinkList::FindEntry(const Link& rLink) const return 0xFFFF; } -void SdrLinkList::InsertLink(const Link& rLink, unsigned nPos) +void SdrLinkList::InsertLink(const Link<>& rLink, unsigned nPos) { unsigned nFnd=FindEntry(rLink); if (nFnd==0xFFFF) { if (rLink.IsSet()) { if(nPos==0xFFFF) - aList.push_back(new Link(rLink)); + aList.push_back(new Link<>(rLink)); else - aList.insert(aList.begin() + nPos, new Link(rLink)); + aList.insert(aList.begin() + nPos, new Link<>(rLink)); } else { OSL_FAIL("SdrLinkList::InsertLink(): Tried to insert a link that was not set already."); } @@ -277,11 +277,11 @@ void SdrLinkList::InsertLink(const Link& rLink, unsigned nPos) } } -void SdrLinkList::RemoveLink(const Link& rLink) +void SdrLinkList::RemoveLink(const Link<>& rLink) { unsigned nFnd=FindEntry(rLink); if (nFnd!=0xFFFF) { - Link* pLink = aList[nFnd]; + Link<>* pLink = aList[nFnd]; aList.erase( aList.begin() + nFnd ); delete pLink; } else { @@ -545,7 +545,7 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRange -SvdProgressInfo::SvdProgressInfo( Link *_pLink ) +SvdProgressInfo::SvdProgressInfo( Link<> *_pLink ) { DBG_ASSERT(_pLink!=NULL,"SvdProgressInfo(): No Link stated!"); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 8afbb4f969a4..edea77372da3 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3336,25 +3336,25 @@ SdrObject* SdrObjFactory::MakeNewObject( return pObj; } -void SdrObjFactory::InsertMakeObjectHdl(const Link& rLink) +void SdrObjFactory::InsertMakeObjectHdl(const Link<>& rLink) { SdrLinkList& rLL=ImpGetUserMakeObjHdl(); rLL.InsertLink(rLink); } -void SdrObjFactory::RemoveMakeObjectHdl(const Link& rLink) +void SdrObjFactory::RemoveMakeObjectHdl(const Link<>& rLink) { SdrLinkList& rLL=ImpGetUserMakeObjHdl(); rLL.RemoveLink(rLink); } -void SdrObjFactory::InsertMakeUserDataHdl(const Link& rLink) +void SdrObjFactory::InsertMakeUserDataHdl(const Link<>& rLink) { SdrLinkList& rLL=ImpGetUserMakeObjUserDataHdl(); rLL.InsertLink(rLink); } -void SdrObjFactory::RemoveMakeUserDataHdl(const Link& rLink) +void SdrObjFactory::RemoveMakeUserDataHdl(const Link<>& rLink) { SdrLinkList& rLL=ImpGetUserMakeObjUserDataHdl(); rLL.RemoveLink(rLink); diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 84ef3242fd46..71b4f7e7c649 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -126,8 +126,8 @@ namespace mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeContourTextPrimitive)); mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeContourBulletPrimitive)); mrOutliner.StripPortions(); - mrOutliner.SetDrawPortionHdl(Link()); - mrOutliner.SetDrawBulletHdl(Link()); + mrOutliner.SetDrawPortionHdl(Link<>()); + mrOutliner.SetDrawBulletHdl(Link<>()); } void decomposeBlockTextPrimitive( @@ -141,8 +141,8 @@ namespace mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeBlockTextPrimitive)); mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeBlockBulletPrimitive)); mrOutliner.StripPortions(); - mrOutliner.SetDrawPortionHdl(Link()); - mrOutliner.SetDrawBulletHdl(Link()); + mrOutliner.SetDrawPortionHdl(Link<>()); + mrOutliner.SetDrawBulletHdl(Link<>()); } void decomposeStretchTextPrimitive(const basegfx::B2DHomMatrix& rNewTransformA, const basegfx::B2DHomMatrix& rNewTransformB) @@ -152,8 +152,8 @@ namespace mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeStretchTextPrimitive)); mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeStretchBulletPrimitive)); mrOutliner.StripPortions(); - mrOutliner.SetDrawPortionHdl(Link()); - mrOutliner.SetDrawBulletHdl(Link()); + mrOutliner.SetDrawPortionHdl(Link<>()); + mrOutliner.SetDrawBulletHdl(Link<>()); } drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence(); diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 6d053e47ddb3..252d39ab0558 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -791,7 +791,7 @@ void SdrTextObj::impDecomposePathTextPrimitive( } // clean up outliner - rOutliner.SetDrawPortionHdl(Link()); + rOutliner.SetDrawPortionHdl(Link<>()); rOutliner.Clear(); rOutliner.setVisualizedPage(0); diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx index 3c733ef96ed7..c715a4dbb765 100644 --- a/svx/source/svdraw/svdoutlinercache.cxx +++ b/svx/source/svdraw/svdoutlinercache.cxx @@ -82,7 +82,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner ) pOutliner->SetVertical( false ); // Deregister on outliner, might be reused from outliner cache - pOutliner->SetNotifyHdl( Link() ); + pOutliner->SetNotifyHdl( Link<>() ); } else if( (OUTLINERMODE_TEXTOBJECT == nOutlMode) && (NULL == mpModeText) ) { @@ -91,7 +91,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner ) pOutliner->SetVertical( false ); // Deregister on outliner, might be reused from outliner cache - pOutliner->SetNotifyHdl( Link() ); + pOutliner->SetNotifyHdl( Link<>() ); } else { diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index a241d615c8e0..e0c83401f254 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -154,7 +154,7 @@ void SdrTableRTFParser::Read( SvStream& rStream ) { EditEngine& rEdit = const_cast< EditEngine& >( mpOutliner->GetEditEngine() ); - Link aOldLink( rEdit.GetImportHdl() ); + Link<> aOldLink( rEdit.GetImportHdl() ); rEdit.SetImportHdl( LINK( this, SdrTableRTFParser, RTFImportHdl ) ); mpOutliner->Read( rStream, OUString(), EE_FORMAT_RTF ); rEdit.SetImportHdl( aOldLink ); diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 68ab4fe1c114..022bf9bbedd4 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -125,7 +125,7 @@ NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController, appendEntry( 1, SVX_RESSTR( RID_SVXSTR_MORENUMBERING ), ::GetImage( rFrame, ".uno:OutlineBullet", false ) ); SetOutputSizePixel( getMenuSize() ); - Link aLink = LINK( this, NumberingPopup, VSSelectHdl ); + Link<> aLink = LINK( this, NumberingPopup, VSSelectHdl ); mpValueSet->SetSelectHdl( aLink ); SetSelectHdl( aLink ); diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 5cdf8b7a10fe..0aac5298c2d8 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -45,7 +45,7 @@ private: VclPtr<PushButton> mpButtonPicker; VclPtr<FixedLine> mpAutomaticSeparator; OUString maCommand; - Link maSelectedLink; + Link<> maSelectedLink; PaletteManager& mrPaletteManager; BorderColorStatus& mrBorderColorStatus; @@ -75,7 +75,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; virtual VclPtr<SfxPopupWindow> Clone() const SAL_OVERRIDE; - void SetSelectedHdl( const Link& rLink ) { maSelectedLink = rLink; } + void SetSelectedHdl( const Link<>& rLink ) { maSelectedLink = rLink; } }; #endif diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 09008172a790..c212d634234f 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -452,11 +452,11 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) { case KEY_RETURN: nHandled = true; - ( (Link&)GetSelectHdl() ).Call( this ); + ( (Link<>&)GetSelectHdl() ).Call( this ); break; case KEY_TAB: bRelease = false; - ( (Link&)GetSelectHdl() ).Call( this ); + ( (Link<>&)GetSelectHdl() ).Call( this ); bRelease = true; break; @@ -524,7 +524,7 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) switch ( pKEvt->GetKeyCode().GetCode() ) { case KEY_RETURN: - ( (Link&)GetSelectHdl() ).Call( this ); + ( (Link<>&)GetSelectHdl() ).Call( this ); nHandled = true; break; case KEY_TAB: diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index e84b027fd233..7daff1e20708 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -132,7 +132,7 @@ public: virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; - void SetVisibilityListener( const Link& aVisListener ) { aVisibilityListener = aVisListener; } + void SetVisibilityListener( const Link<>& aVisListener ) { aVisibilityListener = aVisListener; } void SetDefaultStyle( const OUString& rDefault ) { sDefaultStyle = rDefault; } @@ -146,7 +146,7 @@ private: sal_uInt16 nCurSel; bool bRelease; Size aLogicalSize; - Link aVisibilityListener; + Link<> aVisibilityListener; bool bVisible; Reference< XDispatchProvider > m_xDispatchProvider; Reference< XFrame > m_xFrame; diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 5c68c3592ac7..26a7269d685a 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -174,7 +174,7 @@ namespace { SvxDrawPage* mpUnoPage; - Link maOldCalcFieldValueHdl; + Link<> maOldCalcFieldValueHdl; sal_Int32 mnPageNumber; SdrPage* mpCurrentPage; SdrModel* mpDoc; diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 0cc0b43c5f9e..348f9a0c7791 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -435,7 +435,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) // remove as listener - outliner might outlive ourselves if( mpView && mpView->GetTextEditOutliner() ) - mpView->GetTextEditOutliner()->SetNotifyHdl( Link() ); + mpView->GetTextEditOutliner()->SetNotifyHdl( Link<>() ); // destroy view forwarder, OutlinerView no longer // valid (no need for UpdateData(), it's been diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 991ee29da563..edbd37fd4c7e 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -206,7 +206,7 @@ void SAL_CALL GalleryTheme::update( ) if( mpTheme ) { - const Link aDummyLink; + const Link<> aDummyLink; mpTheme->Actualize( aDummyLink ); } } diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index a0fbabb66600..434c7d2018d3 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -515,11 +515,11 @@ public: void SetRootAtom( const Atom* pAtom ); - void SetCollapsingHdl(const Link& rNewHdl){maCollapsingHdl=rNewHdl;} - const Link& GetCollapsingHdl() const { return maCollapsingHdl; } + void SetCollapsingHdl(const Link<>& rNewHdl){maCollapsingHdl=rNewHdl;} + const Link<>& GetCollapsingHdl() const { return maCollapsingHdl; } - void SetExpandingHdl(const Link& rNewHdl){maExpandingHdl=rNewHdl;} - const Link& GetExpandingHdl() const { return maExpandingHdl; } + void SetExpandingHdl(const Link<>& rNewHdl){maExpandingHdl=rNewHdl;} + const Link<>& GetExpandingHdl() const { return maExpandingHdl; } virtual BOOL Expand( SvTreeListEntry* pParent ); virtual BOOL Collapse( SvTreeListEntry* pParent ); @@ -538,8 +538,8 @@ private: Image maImgExpanded; Image maImgCollapsed; bool mbRecursiveGuard; - Link maCollapsingHdl; - Link maExpandingHdl; + Link<> maCollapsingHdl; + Link<> maExpandingHdl; }; typedef std::pair< AtomContainerTreeListBox*, SvTreeListEntry* > AtomContainerEntryPair; |