diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-15 15:30:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-16 08:38:55 +0200 |
| commit | 7beefb1fe6e56bfaf24d4660e11baf5abfa3b675 (patch) | |
| tree | 3545b6093a6764a095f963c1b3cf7ba4296e5938 /sfx2 | |
| parent | 16e0ee6e6a4eb1802e06dd1d682b1a3b1affeb5c (diff) | |
convert Link<> to typed
Change-Id: If80d43267ce498f713a318f281e5fe86d787d601
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 10 | ||||
| -rw-r--r-- | sfx2/source/inc/templdgi.hxx | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index b5124e98e602..8649a4d6ad98 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -476,7 +476,7 @@ TriState StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, return TRISTATE_FALSE; aParent = GetEntryText(pTarget); aStyle = GetEntryText(pEntry); - const bool bRet = (bool)aDropLink.Call(this); + const bool bRet = aDropLink.Call(*this); rpNewParent = pTarget; lPos=0; IntlWrapper aIntlWrapper( Application::GetSettings().GetLanguageTag() ); @@ -1864,13 +1864,13 @@ SfxObjectShell* SfxCommonTemplateDialog_Impl::SaveSelection() return pDocShell; } -IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox ) +IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl&, rBox, bool ) { - bDontUpdate=true; + bDontUpdate = true; const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl(); const SfxStyleFamily eFam = pItem->GetFamily(); - long ret= pStyleSheetPool->SetParent(eFam,pBox->GetStyle(), pBox->GetParent())? 1L: 0L; - bDontUpdate=false; + bool ret = pStyleSheetPool->SetParent(eFam, rBox.GetStyle(), rBox.GetParent()); + bDontUpdate = false; return ret; } diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index d0c77161a3c4..040645165623 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -98,9 +98,9 @@ class StyleTreeListBox_Impl : public DropListBox_Impl private: SvTreeListEntry* pCurEntry; Link<LinkParamNone*,void> aDoubleClickLink; - Link<> aDropLink; + Link<StyleTreeListBox_Impl&,bool> aDropLink; OUString aParent; - OUString aStyle; + OUString aStyle; protected: virtual void Command(const CommandEvent& rMEvt) SAL_OVERRIDE; @@ -120,7 +120,7 @@ public: { aDoubleClickLink = rLink; } - void SetDropHdl(const Link<> &rLink) + void SetDropHdl(const Link<StyleTreeListBox_Impl&,bool> &rLink) { aDropLink = rLink; } @@ -219,7 +219,7 @@ protected: DECL_LINK_TYPED( FmtSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( ApplyHdl, LinkParamNone*, void ); DECL_LINK_TYPED( TreeListApplyHdl, SvTreeListBox*, bool ); - DECL_LINK( DropHdl, StyleTreeListBox_Impl* ); + DECL_LINK_TYPED( DropHdl, StyleTreeListBox_Impl&, bool ); DECL_LINK_TYPED( TimeOut, Idle*, void ); virtual void EnableItem(sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true) |