Kaydet (Commit) 200e336d authored tarafından Noel Grandin's avatar Noel Grandin

make Link<> instances typed

Change-Id: I7d20875cc498d54140cfe75b21373fdab9c369ce
üst 63e18906
...@@ -86,7 +86,7 @@ public: ...@@ -86,7 +86,7 @@ public:
void SetNumberFormatList( const SvxNumberInfoItem& rItem ) void SetNumberFormatList( const SvxNumberInfoItem& rItem )
{ SetInfoItem( rItem ); } { SetInfoItem( rItem ); }
void SetOkHdl( const Link<>& rOkHandler ); void SetOkHdl( const Link<SfxPoolItem*,void>& rOkHandler );
void HideLanguage(bool nFlag=true); void HideLanguage(bool nFlag=true);
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
...@@ -124,7 +124,7 @@ private: ...@@ -124,7 +124,7 @@ private:
SvxNumberInfoItem* pNumItem; SvxNumberInfoItem* pNumItem;
SvxNumberFormatShell* pNumFmtShell; SvxNumberFormatShell* pNumFmtShell;
sal_uLong nInitFormat; sal_uLong nInitFormat;
Link<> fnOkHdl; Link<SfxPoolItem*,void> fnOkHdl;
bool bNumItemFlag; ///< for handling with DocShell bool bNumItemFlag; ///< for handling with DocShell
bool bOneAreaFlag; bool bOneAreaFlag;
......
...@@ -1724,7 +1724,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) ...@@ -1724,7 +1724,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt )
#* #*
#************************************************************************/ #************************************************************************/
void SvxNumberFormatTabPage::SetOkHdl( const Link<>& rOkHandler ) void SvxNumberFormatTabPage::SetOkHdl( const Link<SfxPoolItem*,void>& rOkHandler )
{ {
fnOkHdl = rOkHandler; fnOkHdl = rOkHandler;
} }
......
...@@ -93,15 +93,17 @@ namespace sfx2 ...@@ -93,15 +93,17 @@ namespace sfx2
class SfxLinkItem : public SfxPoolItem class SfxLinkItem : public SfxPoolItem
{ {
Link<> aLink; Link<SfxPoolItem*, void> aLink;
public: public:
SfxLinkItem( sal_uInt16 nWhichId, const Link<SfxPoolItem*, void>& rValue ) : SfxPoolItem( nWhichId )
{ aLink = rValue; }
virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE
{ return new SfxLinkItem( *this ); } { return new SfxLinkItem( *this ); }
virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE
{ return static_cast<const SfxLinkItem&>(rL).aLink == aLink; } { return static_cast<const SfxLinkItem&>(rL).aLink == aLink; }
SfxLinkItem( sal_uInt16 nWhichId, const Link<>& rValue ) : SfxPoolItem( nWhichId ) const Link<SfxPoolItem*, void>&
{ aLink = rValue; } GetValue() const { return aLink; }
const Link<>& GetValue() const { return aLink; }
}; };
#ifndef SFX_DECL_OBJECTSHELL_DEFINED #ifndef SFX_DECL_OBJECTSHELL_DEFINED
......
...@@ -117,7 +117,7 @@ public: ...@@ -117,7 +117,7 @@ public:
void setOpenRegionHdl(const Link<void*,void> &rLink); void setOpenRegionHdl(const Link<void*,void> &rLink);
void setOpenTemplateHdl (const Link<> &rLink); void setOpenTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink);
static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height); static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height);
...@@ -142,7 +142,7 @@ protected: ...@@ -142,7 +142,7 @@ protected:
VclPtr<FixedText> maFTName; VclPtr<FixedText> maFTName;
Link<void*,void> maOpenRegionHdl; Link<void*,void> maOpenRegionHdl;
Link<> maOpenTemplateHdl; Link<ThumbnailViewItem*,void> maOpenTemplateHdl;
}; };
#endif // INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX #endif // INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX
......
...@@ -78,7 +78,7 @@ private: ...@@ -78,7 +78,7 @@ private:
DECL_LINK(DefaultTemplateMenuSelectHdl, Menu*); DECL_LINK(DefaultTemplateMenuSelectHdl, Menu*);
DECL_LINK_TYPED(OpenRegionHdl, void*, void); DECL_LINK_TYPED(OpenRegionHdl, void*, void);
DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*); DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void);
DECL_LINK(SearchUpdateHdl, void*); DECL_LINK(SearchUpdateHdl, void*);
......
...@@ -88,11 +88,9 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) ...@@ -88,11 +88,9 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
} }
} }
IMPL_LINK_NOARG(ScAttrDlg, OkHandler) IMPL_LINK_NOARG_TYPED(ScAttrDlg, OkHandler, SfxPoolItem*, void)
{ {
((Link<>&)GetOKButton().GetClickHdl()).Call( NULL ); GetOKButton().GetClickHdl().Call( NULL );
return 0;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -38,7 +38,7 @@ protected: ...@@ -38,7 +38,7 @@ protected:
virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE;
private: private:
DECL_LINK( OkHandler, void* ); // for closing by double clicking in TabPages DECL_LINK_TYPED( OkHandler, SfxPoolItem*, void ); // for closing by double clicking in TabPages
sal_uInt16 m_nNumberPageId; sal_uInt16 m_nNumberPageId;
sal_uInt16 m_nFontPageId; sal_uInt16 m_nFontPageId;
}; };
......
...@@ -224,7 +224,7 @@ void TemplateAbstractView::setOpenRegionHdl(const Link<void*,void> &rLink) ...@@ -224,7 +224,7 @@ void TemplateAbstractView::setOpenRegionHdl(const Link<void*,void> &rLink)
maOpenRegionHdl = rLink; maOpenRegionHdl = rLink;
} }
void TemplateAbstractView::setOpenTemplateHdl(const Link<> &rLink) void TemplateAbstractView::setOpenTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink)
{ {
maOpenTemplateHdl = rLink; maOpenTemplateHdl = rLink;
} }
......
...@@ -19,7 +19,7 @@ TemplateSearchView::TemplateSearchView (vcl::Window *pParent, WinBits nWinStyle) ...@@ -19,7 +19,7 @@ TemplateSearchView::TemplateSearchView (vcl::Window *pParent, WinBits nWinStyle)
VCL_BUILDER_FACTORY(TemplateSearchView) VCL_BUILDER_FACTORY(TemplateSearchView)
void TemplateSearchView::setOpenTemplateHdl(const Link<> &rLink) void TemplateSearchView::setOpenTemplateHdl(const Link<ThumbnailViewItem*, void> &rLink)
{ {
maOpenTemplateHdl = rLink; maOpenTemplateHdl = rLink;
} }
......
...@@ -655,7 +655,7 @@ IMPL_LINK_NOARG_TYPED( BackingWindow, OpenRegionHdl, void*, void) ...@@ -655,7 +655,7 @@ IMPL_LINK_NOARG_TYPED( BackingWindow, OpenRegionHdl, void*, void)
maSelTemplates.clear(); maSelTemplates.clear();
} }
IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem) IMPL_LINK_TYPED(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void)
{ {
if (!mbIsSaveMode) if (!mbIsSaveMode)
{ {
...@@ -681,8 +681,6 @@ IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem) ...@@ -681,8 +681,6 @@ IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem)
{ {
} }
} }
return 0;
} }
struct ImplDelayedDispatch struct ImplDelayedDispatch
......
...@@ -109,7 +109,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer ...@@ -109,7 +109,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer
DECL_LINK_TYPED(MenuSelectHdl, MenuButton*, void); DECL_LINK_TYPED(MenuSelectHdl, MenuButton*, void);
DECL_LINK(ExtLinkClickHdl, Button*); DECL_LINK(ExtLinkClickHdl, Button*);
DECL_LINK_TYPED(OpenRegionHdl, void*, void); DECL_LINK_TYPED(OpenRegionHdl, void*, void);
DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*); DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void);
void initControls(); void initControls();
......
...@@ -313,14 +313,14 @@ void SfxTemplateManagerDlg::dispose() ...@@ -313,14 +313,14 @@ void SfxTemplateManagerDlg::dispose()
// Ignore view events since we are cleaning the object // Ignore view events since we are cleaning the object
mpLocalView->setItemStateHdl(Link<>()); mpLocalView->setItemStateHdl(Link<>());
mpLocalView->setOpenRegionHdl(Link<void*,void>()); mpLocalView->setOpenRegionHdl(Link<void*,void>());
mpLocalView->setOpenTemplateHdl(Link<>()); mpLocalView->setOpenTemplateHdl(Link<ThumbnailViewItem*, void>());
mpRemoteView->setItemStateHdl(Link<>()); mpRemoteView->setItemStateHdl(Link<>());
mpRemoteView->setOpenRegionHdl(Link<void*,void>()); mpRemoteView->setOpenRegionHdl(Link<void*,void>());
mpRemoteView->setOpenTemplateHdl(Link<>()); mpRemoteView->setOpenTemplateHdl(Link<ThumbnailViewItem*,void>());
mpSearchView->setItemStateHdl(Link<>()); mpSearchView->setItemStateHdl(Link<>());
mpSearchView->setOpenTemplateHdl(Link<>()); mpSearchView->setOpenTemplateHdl(Link<ThumbnailViewItem*, void>());
mpTabControl.clear(); mpTabControl.clear();
mpSearchEdit.clear(); mpSearchEdit.clear();
...@@ -684,7 +684,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, OpenRegionHdl, void*, void) ...@@ -684,7 +684,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, OpenRegionHdl, void*, void)
mpActionBar->Show(); mpActionBar->Show();
} }
IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem) IMPL_LINK_TYPED(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void)
{ {
if (!mbIsSaveMode) if (!mbIsSaveMode)
{ {
...@@ -710,8 +710,6 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem) ...@@ -710,8 +710,6 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem)
Close(); Close();
} }
return 0;
} }
IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl) IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
......
...@@ -18,7 +18,7 @@ public: ...@@ -18,7 +18,7 @@ public:
TemplateSearchView ( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL); TemplateSearchView ( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL);
void setOpenTemplateHdl (const Link<> &rLink); void setOpenTemplateHdl (const Link<ThumbnailViewItem*, void> &rLink);
void AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionId, sal_uInt16 nIdx, void AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionId, sal_uInt16 nIdx,
const OUString &rTitle, const OUString &rSubtitle, const OUString &rTitle, const OUString &rSubtitle,
...@@ -28,7 +28,7 @@ protected: ...@@ -28,7 +28,7 @@ protected:
virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE;
protected: protected:
Link<> maOpenTemplateHdl; Link<ThumbnailViewItem*, void> maOpenTemplateHdl;
}; };
#endif // INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEW_HXX #endif // INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEW_HXX
......
...@@ -106,7 +106,7 @@ class SwNavigationPI : public vcl::Window, ...@@ -106,7 +106,7 @@ class SwNavigationPI : public vcl::Window,
DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void ); DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void );
DECL_LINK( EditAction, NumEditAction * ); DECL_LINK( EditAction, NumEditAction * );
DECL_LINK( EditGetFocus, NumEditAction * ); DECL_LINK( EditGetFocus, NumEditAction * );
DECL_LINK( DoneLink, SfxPoolItem * ); DECL_LINK_TYPED( DoneLink, SfxPoolItem *, void );
DECL_LINK( MenuSelectHdl, Menu * ); DECL_LINK( MenuSelectHdl, Menu * );
DECL_LINK_TYPED( ChangePageHdl, Idle*, void ); DECL_LINK_TYPED( ChangePageHdl, Idle*, void );
DECL_LINK( PageEditModifyHdl, void* ); DECL_LINK( PageEditModifyHdl, void* );
......
...@@ -1076,7 +1076,7 @@ void SwNavigationPI::UpdateListBox() ...@@ -1076,7 +1076,7 @@ void SwNavigationPI::UpdateListBox()
aDocListBox->SetUpdateMode(true); aDocListBox->SetUpdateMode(true);
} }
IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem) IMPL_LINK_TYPED(SwNavigationPI, DoneLink, SfxPoolItem *, pItem, void)
{ {
const SfxViewFrameItem* pFrameItem = PTR_CAST(SfxViewFrameItem, pItem ); const SfxViewFrameItem* pFrameItem = PTR_CAST(SfxViewFrameItem, pItem );
if( pFrameItem ) if( pFrameItem )
...@@ -1096,7 +1096,6 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem) ...@@ -1096,7 +1096,6 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
aContentTree->Update(); aContentTree->Update();
} }
} }
return 0;
} }
OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData ) OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment