diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /sw/source/ui | |
parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff) |
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and
return types, but provide default template arguments that keep the generic,
unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the
Link class can be updated over time.
All the related macros are duplicated with ..._TYPED counterparts, that
additionally take the RetType (except for LINK_TYPED, which manages to infer the
relevant types from the supplied Member).
(It would have been attractive to change the "untyped" LinkStubs from taking a
void* to a properly typed ArgType parameter, too, but that would cause
-fsanitize=function to flag uses of "untyped" Link::Call.)
Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'sw/source/ui')
46 files changed, 104 insertions, 104 deletions
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 7026d43d35f2..e3833679e5c1 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -137,7 +137,7 @@ SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS ) m_pPageNumEdit->SetAccessibleName(m_pPageNumBox->GetText()); - Link aLk = LINK(this,SwBreakDlg,ClickHdl); + Link<> aLk = LINK(this,SwBreakDlg,ClickHdl); m_pPageBtn->SetClickHdl( aLk ); m_pLineBtn->SetClickHdl( aLk ); m_pColumnBtn->SetClickHdl( aLk ); diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 9e461fc14622..9511cd2f9043 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -254,7 +254,7 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet) OUString sURL = m_pURLED->GetText(); if(!sURL.isEmpty()) { - sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link(), false ); + sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link<>(), false ); // #i100683# file URLs should be normalized in the UI if ( sURL.startsWith("file:") ) sURL = URIHelper::simpleNormalizedMakeRelative(OUString(), sURL); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 691023c23b52..7a053dadc51b 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -562,7 +562,7 @@ SwDropCapsPage::SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pPict->SetBorderStyle( WindowBorderStyle::MONO ); // Install handler - Link aLk = LINK(this, SwDropCapsPage, ModifyHdl); + Link<> aLk = LINK(this, SwDropCapsPage, ModifyHdl); m_pDropCapsField->SetModifyHdl( aLk ); m_pLinesField->SetModifyHdl( aLk ); m_pDistanceField->SetModifyHdl( aLk ); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 72f201c365f9..578909554f0b 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -425,7 +425,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( get(m_pOKPB,"ok"); m_pAuthenticationCB->SetClickHdl( LINK( this, SwAuthenticationSettingsDialog, CheckBoxHdl_Impl)); - Link aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl ); + Link<> aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl ); m_pSeparateAuthenticationRB->SetClickHdl( aRBLink ); m_pSMTPAfterPOPRB->SetClickHdl( aRBLink ); m_pOKPB->SetClickHdl( LINK( this, SwAuthenticationSettingsDialog, OKHdl_Impl)); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 9764b8f22cb6..5f0cc8b5222c 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -121,7 +121,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pUseCharUnit->Hide(); } - Link aLink = LINK(this, SwLoadOptPage, StandardizedPageCountCheckHdl); + Link<> aLink = LINK(this, SwLoadOptPage, StandardizedPageCountCheckHdl); m_pShowStandardizedPageCount->SetClickHdl(aLink); } @@ -523,7 +523,7 @@ SwCaptionOptPage::SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet m_pLbLevel->SelectEntryPos( nLvl < MAXLEVEL ? nLvl + 1 : 0 ); m_pEdDelim->SetText( sDelim ); - Link aLk = LINK( this, SwCaptionOptPage, ModifyHdl ); + Link<> aLk = LINK( this, SwCaptionOptPage, ModifyHdl ); m_pCategoryBox->SetModifyHdl( aLk ); m_pNumberingSeparatorED->SetModifyHdl( aLk ); m_pTextEdit->SetModifyHdl( aLk ); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 4b02931e58eb..3186484c52a4 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -341,7 +341,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent, get(m_pPaperFromSetupCB, "papertray"); get(m_pFaxLB, "fax"); - Link aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl); + Link<> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl); m_pGrfCB->SetClickHdl( aLk ); m_pRightPageCB->SetClickHdl( aLk ); m_pLeftPageCB->SetClickHdl( aLk ); @@ -609,14 +609,14 @@ SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent, pListBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); pLabelBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); pIdxBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); - Link aFocusLink = LINK( this, SwStdFontTabPage, LoseFocusHdl); + Link<> aFocusLink = LINK( this, SwStdFontTabPage, LoseFocusHdl); pStandardBox->SetLoseFocusHdl( aFocusLink ); pTitleBox ->SetLoseFocusHdl( aFocusLink ); pListBox ->SetLoseFocusHdl( aFocusLink ); pLabelBox ->SetLoseFocusHdl( aFocusLink ); pIdxBox ->SetLoseFocusHdl( aFocusLink ); - Link aModifyHeightLink( LINK( this, SwStdFontTabPage, ModifyHeightHdl)); + Link<> aModifyHeightLink( LINK( this, SwStdFontTabPage, ModifyHeightHdl)); pStandardHeightLB->SetModifyHdl( aModifyHeightLink ); pTitleHeightLB-> SetModifyHdl( aModifyHeightLink ); pListHeightLB-> SetModifyHdl( aModifyHeightLink ); @@ -1147,7 +1147,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxIte get(pFixPropRB,"fixprop"); get(pVarRB,"var"); - Link aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl)); + Link<> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl)); pNumFormattingCB->SetClickHdl(aLnk); pNumFmtFormattingCB->SetClickHdl(aLnk); pHeaderCB->SetClickHdl(aLnk); @@ -1827,7 +1827,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent, pDeletedLB->RemoveEntry(4); pDeletedLB->RemoveEntry(3); - Link aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl); + Link<> aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl); pInsertLB->SetSelectHdl( aLk ); pDeletedLB->SetSelectHdl( aLk ); pChangedLB->SetSelectHdl( aLk ); @@ -2359,7 +2359,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage( vcl::Window* pParent, const S get(m_pLenNF, "ignorelen"); get(m_pStoreRsidCB, "storeRSID"); - Link aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) ); + Link<> aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) ); m_pAutoRB->SetClickHdl( aLnk ); m_pWordRB->SetClickHdl( aLnk ); m_pCharRB->SetClickHdl( aLnk ); @@ -2588,7 +2588,7 @@ void SwTestTabPage::Reset( const SfxItemSet* ) void SwTestTabPage::Init() { // handler - Link aLk = LINK( this, SwTestTabPage, AutoClickHdl ); + Link<> aLk = LINK( this, SwTestTabPage, AutoClickHdl ); m_pTest1CBox->SetClickHdl( aLk ); m_pTest2CBox->SetClickHdl( aLk ); m_pTest3CBox->SetClickHdl( aLk ); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 1d8a63103802..ff9455e8af4f 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -101,7 +101,7 @@ SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits m_pWindow->Show(); m_pScrollBar->Show(); - Link aScrollLink = LINK(this, SwAddressControl_Impl, ScrollHdl_Impl); + Link<> aScrollLink = LINK(this, SwAddressControl_Impl, ScrollHdl_Impl); m_pScrollBar->SetScrollHdl(aScrollLink); m_pScrollBar->SetEndScrollHdl(aScrollLink); m_pScrollBar->EnableDrag(); @@ -172,8 +172,8 @@ void SwAddressControl_Impl::SetData(SwCSVData& rDBData) long nEDYPos = m_pWindow->LogicToPixel(Size(RSC_SP_CTRL_DESC_Y, RSC_SP_CTRL_DESC_Y), MAP_APPFONT).Height(); long nFTYPos = nEDYPos + nEDHeight - nFTHeight; - Link aFocusLink = LINK(this, SwAddressControl_Impl, GotFocusHdl_Impl); - Link aEditModifyLink = LINK(this, SwAddressControl_Impl, EditModifyHdl_Impl); + Link<> aFocusLink = LINK(this, SwAddressControl_Impl, GotFocusHdl_Impl); + Link<> aEditModifyLink = LINK(this, SwAddressControl_Impl, EditModifyHdl_Impl); Edit* pLastEdit = 0; sal_Int32 nVisibleLines = 0; sal_uIntPtr nLines = 0; @@ -420,7 +420,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog( m_pCustomizePB->SetClickHdl(LINK(this, SwCreateAddressListDialog, CustomizeHdl_Impl)); m_pOK->SetClickHdl(LINK(this, SwCreateAddressListDialog, OkHdl_Impl)); - Link aLk = LINK(this, SwCreateAddressListDialog, DBCursorHdl_Impl); + Link<> aLk = LINK(this, SwCreateAddressListDialog, DBCursorHdl_Impl); m_pStartPB->SetClickHdl(aLk); m_pPrevPB->SetClickHdl(aLk); m_pSetNoNF->SetModifyHdl(LINK(this, SwCreateAddressListDialog, DBNumCursorHdl_Impl)); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 7ade01841ee4..1eb60f31b841 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -40,11 +40,11 @@ SwCustomizeAddressListDialog::SwCustomizeAddressListDialog( get(m_pDownPB, "down"); m_pFieldsLB->SetSelectHdl(LINK(this, SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl)); - Link aAddRenameLk = LINK(this, SwCustomizeAddressListDialog, AddRenameHdl_Impl ); + Link<> aAddRenameLk = LINK(this, SwCustomizeAddressListDialog, AddRenameHdl_Impl ); m_pAddPB->SetClickHdl(aAddRenameLk); m_pRenamePB->SetClickHdl(aAddRenameLk); m_pDeletePB->SetClickHdl(LINK(this, SwCustomizeAddressListDialog, DeleteHdl_Impl )); - Link aUpDownLk = LINK(this, SwCustomizeAddressListDialog, UpDownHdl_Impl); + Link<> aUpDownLk = LINK(this, SwCustomizeAddressListDialog, UpDownHdl_Impl); m_pUpPB->SetClickHdl(aUpDownLk); m_pDownPB->SetClickHdl(aUpDownLk); diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 3a235582c605..341bedef6873 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -302,7 +302,7 @@ short SwMailMergeWizard::Execute() return RET_CANCEL; } -void SwMailMergeWizard::StartExecuteModal( const Link& rEndDialogHdl ) +void SwMailMergeWizard::StartExecuteModal( const Link<>& rEndDialogHdl ) { ::svt::RoadmapWizard::StartExecuteModal( rEndDialogHdl ); } diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 3c455092c585..152df21a6af9 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -88,7 +88,7 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pP m_pSettingsWIN->SetSelectHdl(LINK(this, SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl)); m_pHideEmptyParagraphsCB->SetClickHdl(LINK(this, SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl)); - Link aLink = LINK(this, SwMailMergeAddressBlockPage, InsertDataHdl_Impl); + Link<> aLink = LINK(this, SwMailMergeAddressBlockPage, InsertDataHdl_Impl); m_pPrevSetIB->SetClickHdl(aLink); m_pNextSetIB->SetClickHdl(aLink); } @@ -340,13 +340,13 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog( get(m_pDependentRB, "dependent"); get(m_pCountryED, "country"); - Link aCustomizeHdl = LINK(this, SwSelectAddressBlockDialog, NewCustomizeHdl_Impl); + Link<> aCustomizeHdl = LINK(this, SwSelectAddressBlockDialog, NewCustomizeHdl_Impl); m_pNewPB->SetClickHdl(aCustomizeHdl); m_pCustomizePB->SetClickHdl(aCustomizeHdl); m_pDeletePB->SetClickHdl(LINK(this, SwSelectAddressBlockDialog, DeleteHdl_Impl)); - Link aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl); + Link<> aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl); m_pNeverRB->SetClickHdl(aLk); m_pAlwaysRB->SetClickHdl(aLk); m_pDependentRB->SetClickHdl(aLk); @@ -558,10 +558,10 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( m_pAddressElementsLB->SetSelectHdl(LINK(this, SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl )); m_pDragED->SetModifyHdl(LINK(this, SwCustomizeAddressBlockDialog, EditModifyHdl_Impl)); m_pDragED->SetSelectionChangedHdl( LINK( this, SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl)); - Link aFieldsLink = LINK(this, SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl); + Link<> aFieldsLink = LINK(this, SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl); m_pFieldCB->SetModifyHdl(aFieldsLink); m_pFieldCB->SetSelectHdl(aFieldsLink); - Link aImgButtonHdl = LINK(this, SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl); + Link<> aImgButtonHdl = LINK(this, SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl); m_pInsertFieldIB->SetClickHdl(aImgButtonHdl); m_pRemoveFieldIB->SetClickHdl(aImgButtonHdl); m_pUpIB->SetClickHdl(aImgButtonHdl); @@ -816,7 +816,7 @@ class SwAssignFieldsControl : public Control SwMailMergeConfigItem* m_rConfigItem; - Link m_aModifyHdl; + Link<> m_aModifyHdl; long m_nLBStartTopPos; long m_nYOffset; @@ -836,7 +836,7 @@ public: virtual void dispose() SAL_OVERRIDE; void Init(SwMailMergeConfigItem& rConfigItem); - void SetModifyHdl(const Link& rModifyHdl) + void SetModifyHdl(const Link<>& rModifyHdl) { m_aModifyHdl = rModifyHdl; m_aModifyHdl.Call(this); @@ -897,8 +897,8 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) //each position in this sequence matches the position in the header array rHeaders //if no assignment is available an empty sequence will be returned uno::Sequence< OUString> aAssignments = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); - Link aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl); - Link aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_Impl); + Link<> aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl); + Link<> aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_Impl); //fill the controls long nControlWidth = aOutputSize.Width() / 3; diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 2f93a750f1b1..2071361d0d76 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -140,7 +140,7 @@ public: class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener { - Link m_aSelectionLink; + Link<> m_aSelectionLink; VclPtr<SwCustomizeAddressBlockDialog> m_pParentDialog; using VclMultiLineEdit::Notify; @@ -160,7 +160,7 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetSelectionChangedHdl( const Link& rLink ) {m_aSelectionLink = rLink;} + void SetSelectionChangedHdl( const Link<>& rLink ) {m_aSelectionLink = rLink;} void SetText( const OUString& rStr ) SAL_OVERRIDE; OUString GetAddress(); diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 76035a2f3ef2..15c91b1e365e 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -61,14 +61,14 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pParent) m_pCurrentDocRB->Check(); DocSelectHdl(m_pNewDocRB); - Link aDocSelectLink = LINK(this, SwMailMergeDocSelectPage, DocSelectHdl); + Link<> aDocSelectLink = LINK(this, SwMailMergeDocSelectPage, DocSelectHdl); m_pCurrentDocRB->SetClickHdl(aDocSelectLink); m_pNewDocRB->SetClickHdl(aDocSelectLink); m_pLoadDocRB->SetClickHdl(aDocSelectLink); m_pLoadTemplateRB->SetClickHdl(aDocSelectLink); m_pRecentDocRB->SetClickHdl(aDocSelectLink); - Link aFileSelectHdl = LINK(this, SwMailMergeDocSelectPage, FileSelectHdl); + Link<> aFileSelectHdl = LINK(this, SwMailMergeDocSelectPage, FileSelectHdl); m_pBrowseDocPB->SetClickHdl(aFileSelectHdl); m_pBrowseTemplatePB->SetClickHdl(aFileSelectHdl); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 171478787c69..36fa922db9b4 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -258,13 +258,13 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* _pParent) m_bIsTabPage = true; m_pGreetingLineCB->SetClickHdl(LINK(this, SwMailMergeGreetingsPage, ContainsHdl_Impl)); - Link aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); + Link<> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); m_pPersonalizedCB->SetClickHdl(aIndividualLink); - Link aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl); + Link<> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl); m_pFemalePB->SetClickHdl(aGreetingLink); m_pMalePB->SetClickHdl(aGreetingLink); m_pAssignPB->SetClickHdl(LINK(this, SwMailMergeGreetingsPage, AssignHdl_Impl)); - Link aLBoxLink = LINK(this, SwMailMergeGreetingsPage, GreetingSelectHdl_Impl); + Link<> aLBoxLink = LINK(this, SwMailMergeGreetingsPage, GreetingSelectHdl_Impl); m_pFemaleLB->SetSelectHdl(aLBoxLink); m_pMaleLB->SetSelectHdl(aLBoxLink); m_pFemaleColumnLB->SetSelectHdl(aLBoxLink); @@ -273,7 +273,7 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* _pParent) m_pNeutralCB->SetSelectHdl(aLBoxLink); m_pNeutralCB->SetModifyHdl(aLBoxLink); - Link aDataLink = LINK(this, SwMailMergeGreetingsPage, InsertDataHdl_Impl); + Link<> aDataLink = LINK(this, SwMailMergeGreetingsPage, InsertDataHdl_Impl); m_pPrevSetIB->SetClickHdl(aDataLink); m_pNextSetIB->SetClickHdl(aDataLink); @@ -447,9 +447,9 @@ SwMailBodyDialog::SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* _pWi m_pNeutralCB->SetHelpId( HID_MM_BODY_CB_NEUTRAL ); m_pGreetingLineCB->SetClickHdl(LINK(this, SwMailBodyDialog, ContainsHdl_Impl)); - Link aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); + Link<> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); m_pPersonalizedCB->SetClickHdl(aIndividualLink); - Link aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl); + Link<> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl); m_pFemalePB->SetClickHdl(aGreetingLink); m_pMalePB->SetClickHdl(aGreetingLink); m_pOK->SetClickHdl(LINK(this, SwMailBodyDialog, OKHdl)); diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index e00f986e5ef0..a0f99e956e59 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -118,7 +118,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : uno::Reference< frame::XStorable > xStore( pView->GetDocShell()->GetModel(), uno::UNO_QUERY); xStore->storeToURL( m_sExampleURL, aValues ); - Link aLink(LINK(this, SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)); + Link<> aLink(LINK(this, SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)); m_pExampleFrame = new SwOneExampleFrame( *m_pExampleContainerWIN, EX_SHOW_DEFAULT_PAGE, &aLink, &m_sExampleURL ); @@ -134,7 +134,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : m_pZoomLB->SelectEntryPos(0); //page size m_pZoomLB->SetSelectHdl(LINK(this, SwMailMergeLayoutPage, ZoomHdl_Impl)); - Link aFrameHdl = LINK(this, SwMailMergeLayoutPage, ChangeAddressHdl_Impl); + Link<> aFrameHdl = LINK(this, SwMailMergeLayoutPage, ChangeAddressHdl_Impl); m_pLeftMF->SetUpHdl(aFrameHdl); m_pLeftMF->SetDownHdl(aFrameHdl); m_pLeftMF->SetLoseFocusHdl(aFrameHdl); @@ -146,7 +146,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : ::SetFieldUnit( *m_pLeftMF, eFieldUnit ); ::SetFieldUnit( *m_pTopMF, eFieldUnit ); - Link aUpDownHdl = LINK(this, SwMailMergeLayoutPage, GreetingsHdl_Impl ); + Link<> aUpDownHdl = LINK(this, SwMailMergeLayoutPage, GreetingsHdl_Impl ); m_pUpPB->SetClickHdl(aUpDownHdl); m_pDownPB->SetClickHdl(aUpDownHdl); m_pAlignToBodyCB->SetClickHdl(LINK(this, SwMailMergeLayoutPage, AlignToTextHdl_Impl)); diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 5fc51147d4c5..db1b8e6fab00 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -271,7 +271,7 @@ SwMailMergeOutputPage::SwMailMergeOutputPage(SwMailMergeWizard* _pParent) if(!rConfigItem.IsMailAvailable()) m_pSendMailRB->Hide(); - Link aLink = LINK(this, SwMailMergeOutputPage, OutputTypeHdl_Impl); + Link<> aLink = LINK(this, SwMailMergeOutputPage, OutputTypeHdl_Impl); m_pSaveStartDocRB->SetClickHdl(aLink); m_pSaveMergedDocRB->SetClickHdl(aLink); m_pPrintRB->SetClickHdl(aLink); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 28920d03090f..4b7bbfe27794 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -35,7 +35,7 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pParent) get(m_pLetterHint, "letterft"); get(m_pMailHint, "emailft"); - Link aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl); + Link<> aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl); m_pLetterRB->SetClickHdl(aLink); m_pMailRB->SetClickHdl(aLink); diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index 0c5cf3cc19c5..644ffab4a855 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -48,7 +48,7 @@ SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pP get(m_pEditPB, "edit"); m_pEditPB->SetClickHdl( LINK( this, SwMailMergePrepareMergePage, EditDocumentHdl_Impl)); - Link aMoveLink(LINK( this, SwMailMergePrepareMergePage, MoveHdl_Impl)); + Link<> aMoveLink(LINK( this, SwMailMergePrepareMergePage, MoveHdl_Impl)); m_pFirstPB->SetClickHdl( aMoveLink ); m_pPrevPB->SetClickHdl( aMoveLink ); m_pNextPB->SetClickHdl( aMoveLink ); diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index a372be0067d2..28d8bbd25233 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -168,7 +168,7 @@ IMPL_LINK_NOARG(AbstractApplyTabDialog_Impl, ApplyHdl) return 0; } -void AbstractApplyTabDialog_Impl::SetApplyHdl( const Link& rLink ) +void AbstractApplyTabDialog_Impl::SetApplyHdl( const Link<>& rLink ) { m_aHandler = rLink; pDlg->SetApplyHandler(LINK(this, AbstractApplyTabDialog_Impl, ApplyHdl)); @@ -598,7 +598,7 @@ AbstractMailMergeWizard_Impl::~AbstractMailMergeWizard_Impl() pDlg.disposeAndClear(); } -void AbstractMailMergeWizard_Impl::StartExecuteModal( const Link& rEndDialogHdl ) +void AbstractMailMergeWizard_Impl::StartExecuteModal( const Link<>& rEndDialogHdl ) { aEndDlgHdl = rEndDialogHdl; pDlg->StartExecuteModal( @@ -616,7 +616,7 @@ IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, pDial (void) pDialog; // unused in non-debug aEndDlgHdl.Call( this ); - aEndDlgHdl = Link(); + aEndDlgHdl = Link<>(); return 0L; } diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 8384f03b98c3..7ef801594e14 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -137,8 +137,8 @@ public: } DECL_LINK(ApplyHdl, void*); private: - Link m_aHandler; - virtual void SetApplyHdl( const Link& rLink ) SAL_OVERRIDE; + Link<> m_aHandler; + virtual void SetApplyHdl( const Link<>& rLink ) SAL_OVERRIDE; }; class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg @@ -350,7 +350,7 @@ class SwMailMergeWizard; class AbstractMailMergeWizard_Impl : public AbstractMailMergeWizard { VclPtr<SwMailMergeWizard> pDlg; - Link aEndDlgHdl; + Link<> aEndDlgHdl; DECL_LINK( EndDialogHdl, SwMailMergeWizard* ); public: @@ -358,7 +358,7 @@ public: : pDlg(p) {} virtual ~AbstractMailMergeWizard_Impl(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; virtual long GetResult() SAL_OVERRIDE; virtual void SetReloadDocument(const OUString& rURL) SAL_OVERRIDE; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 65a40c87b2d9..d72739d5c533 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1874,7 +1874,7 @@ SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( vcl::Window *pParent, get(pEndSuffixFT,"endsuffix_label"); get(pEndSuffixED,"endsuffix"); - Link aLk( LINK( this, SwSectionFtnEndTabPage, FootEndHdl)); + Link<> aLk( LINK( this, SwSectionFtnEndTabPage, FootEndHdl)); pFtnNtAtTextEndCB->SetClickHdl( aLk ); pFtnNtNumCB->SetClickHdl( aLk ); pEndNtAtTextEndCB->SetClickHdl( aLk ); @@ -2165,7 +2165,7 @@ SwSectionIndentTabPage::SwSectionIndentTabPage(vcl::Window *pParent, const SfxIt get(m_pBeforeMF, "before"); get(m_pAfterMF, "after"); get(m_pPreviewWin, "preview"); - Link aLk = LINK(this, SwSectionIndentTabPage, IndentModifyHdl); + Link<> aLk = LINK(this, SwSectionIndentTabPage, IndentModifyHdl); m_pBeforeMF->SetModifyHdl(aLk); m_pAfterMF->SetModifyHdl(aLk); } diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 96c7e92e3b09..f549fbf747ab 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -142,7 +142,7 @@ SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet) SetMetric(*m_pSizeHeightField, aMetric); // Install handlers - Link aLk = LINK(this, SwEnvFmtPage, ModifyHdl); + Link<> aLk = LINK(this, SwEnvFmtPage, ModifyHdl); m_pAddrLeftField->SetUpHdl( aLk ); m_pAddrTopField->SetUpHdl( aLk ); m_pSendLeftField->SetUpHdl( aLk ); diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index bfcbb44dc61d..d1d4d27ca74a 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -38,7 +38,7 @@ using namespace ::comphelper; void SwVisitingCardPage::InitFrameControl() { - Link aLink(LINK(this, SwVisitingCardPage, FrameControlInitializedHdl)); + Link<> aLink(LINK(this, SwVisitingCardPage, FrameControlInitializedHdl)); m_pExampleWIN->Show(); pExampleFrame = new SwOneExampleFrame( *m_pExampleWIN, EX_SHOW_BUSINESS_CARDS, &aLink ); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 4a73392b0166..cba7b7082166 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -321,7 +321,7 @@ SwLabFmtPage::SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet) SetMetric(*m_pPHeightField, aMetric); // Install handlers - Link aLk = LINK(this, SwLabFmtPage, ModifyHdl); + Link<> aLk = LINK(this, SwLabFmtPage, ModifyHdl); m_pHDistField->SetModifyHdl( aLk ); m_pVDistField->SetModifyHdl( aLk ); m_pWidthField->SetModifyHdl( aLk ); @@ -606,7 +606,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) get(m_pOKPB, "ok"); m_pOKPB->SetClickHdl(LINK(this, SwSaveLabelDlg, OkHdl)); - Link aLk(LINK(this, SwSaveLabelDlg, ModifyHdl)); + Link<> aLk(LINK(this, SwSaveLabelDlg, ModifyHdl)); m_pMakeCB->SetModifyHdl(aLk); m_pTypeED->SetModifyHdl(aLk); diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 9443dfcb9622..ae5970d4f4f6 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -45,7 +45,7 @@ SwLabPrtPage::SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet) SetExchangeSupport(); // Install handlers - Link aLk = LINK(this, SwLabPrtPage, CountHdl); + Link<> aLk = LINK(this, SwLabPrtPage, CountHdl); m_pPageButton->SetClickHdl( aLk ); m_pSingleButton->SetClickHdl( aLk ); diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 25397c3f66ef..ff483c39a3c4 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -264,7 +264,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, m_pAllRB->Check(true); // Install handlers - Link aLk = LINK(this, SwMailMergeDlg, ButtonHdl); + Link<> aLk = LINK(this, SwMailMergeDlg, ButtonHdl); m_pOkBTN->SetClickHdl(aLk); m_pPathPB->SetClickHdl(LINK(this, SwMailMergeDlg, InsertPathHdl)); diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 12ebb825233a..f7deb4c63f95 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -44,7 +44,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r get(m_pNextPB, "next"); get(m_pEditPB, "edit"); - Link aButtonLk = LINK(this, DropDownFieldDialog, ButtonHdl); + Link<> aButtonLk = LINK(this, DropDownFieldDialog, ButtonHdl); m_pEditPB->SetClickHdl(aButtonLk); if( bNextButton ) { diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index b94c049dd59f..3f4c1d9f48bb 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -75,7 +75,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) m_pUsedDBTLB->SetSpaceBetweenEntries(0); m_pUsedDBTLB->SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), aImageList.GetImage(IMG_EXPAND)); - Link aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl); + Link<> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl); m_pUsedDBTLB->SetSelectHdl(aLink); m_pUsedDBTLB->SetDeselectHdl(aLink); diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index bb18eb27fe82..c8328c445b03 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -52,7 +52,7 @@ class SwFldDBPage : public SwFldPage OUString m_sOldColumnName; sal_uLong m_nOldFormat; sal_uInt16 m_nOldSubType; - Link m_aOldNumSelectHdl; + Link<> m_aOldNumSelectHdl; DECL_LINK( TypeHdl, ListBox* ); DECL_LINK( NumSelectHdl, NumFormatListBox* pLB = 0); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index f8dc98f74e6a..c7d3761069c2 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -300,7 +300,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl) } } } - m_pSelectionLB->SetSelectHdl(Link()); + m_pSelectionLB->SetSelectHdl(Link<>()); } else { diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index f079e8787d90..967ce6d8a7b5 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -168,13 +168,13 @@ void SwFldFuncPage::Reset(const SfxItemSet* ) m_pSelectionLB->SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertMacroHdl)); m_pFormatLB->SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl)); m_pMacroBT->SetClickHdl (LINK(this, SwFldFuncPage, MacroHdl)); - Link aListModifyLk( LINK(this, SwFldFuncPage, ListModifyHdl)); + Link<> aListModifyLk( LINK(this, SwFldFuncPage, ListModifyHdl)); m_pListAddPB->SetClickHdl(aListModifyLk); m_pListRemovePB->SetClickHdl(aListModifyLk); m_pListUpPB->SetClickHdl(aListModifyLk); m_pListDownPB->SetClickHdl(aListModifyLk); m_pListItemED->SetReturnActionLink(aListModifyLk); - Link aListEnableLk = LINK(this, SwFldFuncPage, ListEnableHdl); + Link<> aListEnableLk = LINK(this, SwFldFuncPage, ListEnableHdl); m_pListItemED->SetModifyHdl(aListEnableLk); m_pListItemsLB->SetSelectHdl(aListEnableLk); diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index ac5e749bf732..2b073110aa7d 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -64,7 +64,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) : m_pNextBtn->SetClickHdl( LINK( this, SwJavaEditDialog, NextHdl ) ); m_pOKBtn->SetClickHdl( LINK( this, SwJavaEditDialog, OKHdl ) ); - Link aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl); + Link<> aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl); m_pUrlRB->SetClickHdl(aLk); m_pEditRB->SetClickHdl(aLk); m_pUrlPB->SetClickHdl(LINK(this, SwJavaEditDialog, InsertFileHdl)); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 0d645d34da9d..c4b915af4190 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -476,9 +476,9 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pDefaultVS->SetSelectHdl(LINK(this, SwColumnPage, SetDefaultsHdl)); - Link aCLNrLk = LINK(this, SwColumnPage, ColModify); + Link<> aCLNrLk = LINK(this, SwColumnPage, ColModify); m_pCLNrEdt->SetModifyHdl(aCLNrLk); - Link aLk = LINK(this, SwColumnPage, GapModify); + Link<> aLk = LINK(this, SwColumnPage, GapModify); aDistEd1.SetModifyHdl(aLk); aDistEd2.SetModifyHdl(aLk); diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index b43f86fa9a07..374265889c87 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -130,7 +130,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : xNameAccess = xObjs->getEmbeddedObjects(); } - Link aLk = LINK( this, SwCaptionDialog, ModifyHdl ); + Link<> aLk = LINK( this, SwCaptionDialog, ModifyHdl ); m_pCategoryBox->SetModifyHdl( aLk ); m_pTextEdit->SetModifyHdl( aLk ); m_pNumberingSeparatorED->SetModifyHdl ( aLk ); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 5fa3585fad84..f8a8a500a8d0 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -676,7 +676,7 @@ SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet) SetExchangeSupport(); - Link aLk = LINK(this, SwFrmPage, RangeModifyHdl); + Link<> aLk = LINK(this, SwFrmPage, RangeModifyHdl); m_aWidthED.SetLoseFocusHdl( aLk ); m_aHeightED.SetLoseFocusHdl( aLk ); m_pAtHorzPosED->SetLoseFocusHdl( aLk ); @@ -3063,7 +3063,7 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet ) } else pNextLB->SelectEntryPos(0); - Link aLink(LINK(this, SwFrmAddPage, ChainModifyHdl)); + Link<> aLink(LINK(this, SwFrmAddPage, ChainModifyHdl)); pPrevLB->SetSelectHdl(aLink); pNextLB->SetSelectHdl(aLink); } diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 49cba0337bcf..df2a7378ddaa 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -95,7 +95,7 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet) SetExchangeSupport(); - Link aLk = LINK(this, SwWrapTabPage, RangeModifyHdl); + Link<> aLk = LINK(this, SwWrapTabPage, RangeModifyHdl); m_pLeftMarginED->SetUpHdl(aLk); m_pLeftMarginED->SetDownHdl(aLk); m_pLeftMarginED->SetFirstHdl(aLk); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 8e8f90cc24ee..fefe6b925a25 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -495,7 +495,7 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl ) } else { - Link aLink(LINK(this, SwMultiTOXTabDialog, CreateExample_Hdl)); + Link<> aLink(LINK(this, SwMultiTOXTabDialog, CreateExample_Hdl)); pExampleFrame = new SwOneExampleFrame( *m_pExampleContainerWIN, EX_SHOW_ONLINE_LAYOUT, &aLink, &sTemplate); @@ -874,7 +874,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r pMenu->SetActivateHdl(LINK(this, SwTOXSelectTabPage, MenuEnableHdl)); pMenu->SetSelectHdl(LINK(this, SwTOXSelectTabPage, MenuExecuteHdl)); - Link aLk = LINK(this, SwTOXSelectTabPage, CheckBoxHdl); + Link<> aLk = LINK(this, SwTOXSelectTabPage, CheckBoxHdl); m_pAddStylesCB->SetClickHdl(aLk); m_pFromHeadingsCB->SetClickHdl(aLk); m_pTOXMarksCB->SetClickHdl(aLk); @@ -885,7 +885,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r m_pInitialCapsCB->SetClickHdl(aLk); m_pKeyAsEntryCB->SetClickHdl(aLk); - Link aModifyLk = LINK(this, SwTOXSelectTabPage, ModifyHdl); + Link<> aModifyLk = LINK(this, SwTOXSelectTabPage, ModifyHdl); m_pTitleED->SetModifyHdl(aModifyLk); m_pLevelNF->SetModifyHdl(aModifyLk); m_pSortAlgorithmLB->SetSelectHdl(aModifyLk); @@ -1526,7 +1526,7 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu) class SwTOXEdit : public Edit { SwFormToken aFormToken; - Link aPrevNextControlLink; + Link<> aPrevNextControlLink; bool bNextControl; VclPtr<SwTokenWindow> m_pParent; public: @@ -1545,7 +1545,7 @@ public: virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; bool IsNextControl() const {return bNextControl;} - void SetPrevNextLink( const Link& rLink ) {aPrevNextControlLink = rLink;} + void SetPrevNextLink( const Link<>& rLink ) {aPrevNextControlLink = rLink;} const SwFormToken& GetFormToken() { @@ -1613,7 +1613,7 @@ void SwTOXEdit::AdjustSize() class SwTOXButton : public PushButton { SwFormToken aFormToken; - Link aPrevNextControlLink; + Link<> aPrevNextControlLink; bool bNextControl; VclPtr<SwTokenWindow> m_pParent; public: @@ -1632,7 +1632,7 @@ public: virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; bool IsNextControl() const {return bNextControl;} - void SetPrevNextLink(const Link& rLink) {aPrevNextControlLink = rLink;} + void SetPrevNextLink(const Link<>& rLink) {aPrevNextControlLink = rLink;} const SwFormToken& GetFormToken() const {return aFormToken;} void SetCharStyleName(const OUString& rSet, sal_uInt16 nPoolId) @@ -2135,8 +2135,8 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) else m_pLevelFT->SetText(sLevelStr); - Link aLink = m_pLevelLB->GetSelectHdl(); - m_pLevelLB->SetSelectHdl(Link()); + Link<> aLink = m_pLevelLB->GetSelectHdl(); + m_pLevelLB->SetSelectHdl(Link<>()); m_pLevelLB->Select( m_pLevelLB->GetEntry( bToxIsIndex ? 1 : 0 ) ); m_pLevelLB->SetSelectHdl(aLink); @@ -2731,7 +2731,7 @@ SwTokenWindow::SwTokenWindow(vcl::Window* pParent) sAdditionalAccnameString2 = SW_RESSTR(STR_ADDITIONAL_ACCNAME_STRING2); sAdditionalAccnameString3 = SW_RESSTR(STR_ADDITIONAL_ACCNAME_STRING3); - Link aLink(LINK(this, SwTokenWindow, ScrollHdl)); + Link<> aLink(LINK(this, SwTokenWindow, ScrollHdl)); m_pLeftScrollWin->SetClickHdl(aLink); m_pRightScrollWin->SetClickHdl(aLink); } @@ -2768,8 +2768,8 @@ void SwTokenWindow::dispose() for (ctrl_iterator it = aControlList.begin(); it != aControlList.end(); ++it) { VclPtr<Control> pControl = (*it); - pControl->SetGetFocusHdl( Link() ); - pControl->SetLoseFocusHdl( Link() ); + pControl->SetGetFocusHdl( Link<>() ); + pControl->SetLoseFocusHdl( Link<>() ); pControl.disposeAndClear(); } aControlList.clear(); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 5d31733e90ca..9fb0662c407b 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -992,7 +992,7 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog VclPtr<OKButton> m_pOKBT; - Link aShortNameCheckLink; + Link<> aShortNameCheckLink; SwWrtShell& rWrtSh; @@ -1014,7 +1014,7 @@ public: OUString GetEntryText(ToxAuthorityField eField) const; - void SetCheckNameHdl(const Link& rLink) {aShortNameCheckLink = rLink;} + void SetCheckNameHdl(const Link<>& rLink) {aShortNameCheckLink = rLink;} }; @@ -1347,7 +1347,7 @@ IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton) IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, Edit*, pEdit) { - Link aAllowed = LINK(this, SwAuthorMarkPane, IsEntryAllowedHdl); + Link<> aAllowed = LINK(this, SwAuthorMarkPane, IsEntryAllowedHdl); long nResult = aAllowed.Call(pEdit); m_pActionBT->Enable(nResult > 0); if(nResult) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index b1413b3d60e1..46132d095073 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -1072,7 +1072,7 @@ void SwGlossaryDlg::ShowPreview() //create example if (!pExampleFrame) { - Link aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl)); + Link<> aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl)); pExampleFrame = new SwOneExampleFrame( *m_pExampleWIN, EX_SHOW_ONLINE_LAYOUT, &aLink ); } diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 86f38ed7a559..0cd2f805018c 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -116,7 +116,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent, m_pAlign2LB->SetDropDownLineCount( m_pAlign2LB->GetEntryCount() ); m_pAlign2FT->SetText( m_pAlignFT->GetText() ); - Link aLk = LINK(this, SwNumPositionTabPage, DistanceHdl); + Link<> aLk = LINK(this, SwNumPositionTabPage, DistanceHdl); m_pDistBorderMF->SetUpHdl(aLk); m_pDistNumMF->SetUpHdl(aLk); m_pIndentMF->SetUpHdl(aLk); diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 43a013598177..6a2b42a12f58 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -187,7 +187,7 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet) } m_pMaxHeightPageBtn->SetClickHdl(LINK(this,SwFootNotePage,HeightPage)); m_pMaxHeightBtn->SetClickHdl(LINK(this,SwFootNotePage,HeightMetric)); - Link aLk = LINK(this, SwFootNotePage, HeightModify); + Link<> aLk = LINK(this, SwFootNotePage, HeightModify); m_pMaxHeightEdit->SetLoseFocusHdl( aLk ); m_pDistEdit->SetLoseFocusHdl( aLk ); m_pLineDistEdit->SetLoseFocusHdl( aLk ); diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 100a2c4d8d67..f725eba0734d 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -76,7 +76,7 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) : get(m_pPrintCB,"checkCB_PRINT"); get(m_pColorLB,"listLB_COLOR"); - Link aLink = LINK(this, SwTextGridPage, CharorLineChangedHdl); + Link<> aLink = LINK(this, SwTextGridPage, CharorLineChangedHdl); m_pCharsPerLineNF->SetUpHdl(aLink); m_pCharsPerLineNF->SetDownHdl(aLink); m_pCharsPerLineNF->SetLoseFocusHdl(aLink); @@ -84,7 +84,7 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) : m_pLinesPerPageNF->SetDownHdl(aLink); m_pLinesPerPageNF->SetLoseFocusHdl(aLink); - Link aSizeLink = LINK(this, SwTextGridPage, TextSizeChangedHdl); + Link<> aSizeLink = LINK(this, SwTextGridPage, TextSizeChangedHdl); m_pTextSizeMF->SetUpHdl(aSizeLink); m_pTextSizeMF->SetDownHdl(aSizeLink); m_pTextSizeMF->SetLoseFocusHdl(aSizeLink); @@ -95,12 +95,12 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) : m_pCharWidthMF->SetDownHdl(aSizeLink); m_pCharWidthMF->SetLoseFocusHdl(aSizeLink); - Link aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl); + Link<> aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl); m_pNoGridRB->SetClickHdl(aGridTypeHdl); m_pLinesGridRB->SetClickHdl(aGridTypeHdl); m_pCharsGridRB->SetClickHdl(aGridTypeHdl); - Link aModifyLk = LINK(this, SwTextGridPage, GridModifyHdl); + Link<> aModifyLk = LINK(this, SwTextGridPage, GridModifyHdl); m_pColorLB->SetSelectHdl(aModifyLk); m_pPrintCB->SetClickHdl(aModifyLk); m_pRubyBelowCB->SetClickHdl(aModifyLk); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 3856070dbf63..1fd265201f01 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -178,7 +178,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) } // initialise - Link aLk = LINK(this,SwSortDlg, CheckHdl); + Link<> aLk = LINK(this,SwSortDlg, CheckHdl); m_pKeyCB1->SetClickHdl( aLk ); m_pKeyCB2->SetClickHdl( aLk ); m_pKeyCB3->SetClickHdl( aLk ); diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 5f888f3f7497..ecf49356c47c 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -216,7 +216,7 @@ SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) : m_pDocumentStartRB->Check(); m_pPageStartNF->Enable(false); m_pPageStartNF->SetValue(lcl_GetCurrentPage(mpSh)); - Link aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl); + Link<> aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl); m_pDocumentStartRB->SetClickHdl(aStartPageHdl); m_pPageStartRB->SetClickHdl(aStartPageHdl); diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 63fb7aa83277..20e3cb9b28f0 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -147,7 +147,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) } mpKeepColumn->SaveValue(); - Link aLk( LINK(this, SwConvertTableDlg, BtnHdl) ); + Link<> aLk( LINK(this, SwConvertTableDlg, BtnHdl) ); mpTabBtn->SetClickHdl( aLk ); mpSemiBtn->SetClickHdl( aLk ); mpParaBtn->SetClickHdl( aLk ); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 00ee90230378..9d60ec655343 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -137,7 +137,7 @@ void SwFormatTablePage::Init() m_aRightMF.SetMetricFieldMin(-999999); //handler - Link aLk = LINK( this, SwFormatTablePage, AutoClickHdl ); + Link<> aLk = LINK( this, SwFormatTablePage, AutoClickHdl ); m_pFullBtn->SetClickHdl( aLk ); m_pFreeBtn->SetClickHdl( aLk ); m_pLeftBtn->SetClickHdl( aLk ); @@ -845,9 +845,9 @@ void SwTableColumnPage::Reset( const SfxItemSet* ) void SwTableColumnPage::Init(bool bWeb) { FieldUnit aMetric = ::GetDfltMetric(bWeb); - Link aLkUp = LINK( this, SwTableColumnPage, UpHdl ); - Link aLkDown = LINK( this, SwTableColumnPage, DownHdl ); - Link aLkLF = LINK( this, SwTableColumnPage, LoseFocusHdl ); + Link<> aLkUp = LINK( this, SwTableColumnPage, UpHdl ); + Link<> aLkDown = LINK( this, SwTableColumnPage, DownHdl ); + Link<> aLkLF = LINK( this, SwTableColumnPage, LoseFocusHdl ); for( sal_uInt16 i = 0; i < MET_FIELDS; i++ ) { aValueTbl[i] = i; @@ -858,7 +858,7 @@ void SwTableColumnPage::Init(bool bWeb) } SetMetric(*m_pSpaceED, aMetric); - Link aLk = LINK( this, SwTableColumnPage, AutoClickHdl ); + Link<> aLk = LINK( this, SwTableColumnPage, AutoClickHdl ); m_pUpBtn->SetClickHdl( aLk ); m_pDownBtn->SetClickHdl( aLk ); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 5ff495ddafe8..9e1500a926df 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -209,7 +209,7 @@ void SwAutoFormatDlg::dispose() void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt ) { - Link aLk( LINK( this, SwAutoFormatDlg, CheckHdl ) ); + Link<> aLk( LINK( this, SwAutoFormatDlg, CheckHdl ) ); m_pBtnBorder->SetClickHdl( aLk ); m_pBtnFont->SetClickHdl( aLk ); m_pBtnPattern->SetClickHdl( aLk ); |