diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-06 12:05:08 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-07 06:56:57 +0000 |
commit | 9af27324f5f5ef9bd340c6df8640b146a3eba21c (patch) | |
tree | 1bab2dbd1185adf86714718f5fb1a757c1a101e9 /sd | |
parent | 67a5fbeb8e2d6775ff6bd7bfd35ff5027d38457c (diff) |
convert Link<> to typed
Change-Id: I38f2c15b4f8bb1d7187b019d26a2644b087898c1
Reviewed-on: https://gerrit.libreoffice.org/18357
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/inc/navigatr.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index e0ae7d049e15..803f8e9bbe0e 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -473,7 +473,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) * Set DrageType and set image accordingly to it. * If the handler is called with NULL, the default (URL) is set. */ -IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu ) +IMPL_LINK_TYPED( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu, bool ) { sal_uInt16 nMenuId; if( pMenu ) @@ -501,10 +501,10 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu ) maTlbObjects->SetSelectionMode( MULTIPLE_SELECTION ); } } - return 0; + return false; } -IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) +IMPL_LINK_TYPED( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu, bool ) { if (pMenu != NULL) { @@ -548,7 +548,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) } } - return 0; + return false; } void SdNavigatorWin::Resize() diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 33fd9593b59c..bdfbed19477a 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -148,8 +148,8 @@ private: DECL_LINK( ClickPageHdl, void * ); DECL_LINK( ClickObjectHdl, void * ); DECL_LINK( SelectDocumentHdl, void * ); - DECL_LINK( MenuSelectHdl, Menu * ); - DECL_LINK( ShapeFilterCallback, Menu * ); + DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); + DECL_LINK_TYPED( ShapeFilterCallback, Menu *, bool ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetDragImage(); diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 0d731a5458ed..0494f47a3b17 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -642,12 +642,12 @@ IMPL_LINK_NOARG(LayoutMenu, StateChangeHandler) return 0; } -IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu) +IMPL_LINK_TYPED(LayoutMenu, OnMenuItemSelected, Menu*, pMenu, bool) { if (pMenu == NULL) { OSL_ENSURE(pMenu!=NULL, "LayoutMenu::OnMenuItemSelected: illegal menu!"); - return 0; + return false; } pMenu->Deactivate(); @@ -664,7 +664,7 @@ IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu) InsertPageWithLayout(GetSelectedAutoLayout()); } - return 0; + return false; } void LayoutMenu::UpdateSelection() diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index c5ef058f6588..917c5541b4bc 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -193,7 +193,7 @@ private: DECL_LINK(StateChangeHandler, void *); DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent*); DECL_LINK(WindowEventHandler, VclWindowEvent*); - DECL_LINK(OnMenuItemSelected, Menu*); + DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool); }; } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 2dcf5c278d86..014787244fd0 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -252,17 +252,17 @@ void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu) rMenu.EnableItem(SID_TP_SHOW_LARGE_PREVIEW, false); } -IMPL_LINK(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu) +IMPL_LINK_TYPED(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu, bool) { if (pMenu == NULL) { OSL_ENSURE(pMenu!=NULL, "MasterPagesSelector::OnMenuItemSelected: illegal menu!"); - return 0; + return false; } pMenu->Deactivate(); ExecuteCommand(pMenu->GetCurItemId()); - return 0; + return false; } void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 801254b0ead5..5f6819a522f2 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -195,7 +195,7 @@ private: DECL_LINK(RightClickHandler, MouseEvent*); DECL_LINK(ContextMenuCallback, CommandEvent*); DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent*); - DECL_LINK(OnMenuItemSelected, Menu*); + DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool); void SetItem ( sal_uInt16 nIndex, diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 59cae0341c12..d36cd09a2e6c 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2224,7 +2224,7 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void) resume(); } -IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) +IMPL_LINK_TYPED( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool ) { if( pMenu ) { @@ -2375,7 +2375,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) } } - return 0; + return false; } Reference< XSlideShow > SlideshowImpl::createSlideShow() diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 4085a4ec71ca..a7af2838e268 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -278,7 +278,7 @@ private: DECL_LINK( PostYieldListener, void* ); DECL_LINK_TYPED(ReadyForNextInputHdl, Timer *, void); DECL_LINK_TYPED( endPresentationHdl, void*, void ); - DECL_LINK( ContextMenuSelectHdl, Menu * ); + DECL_LINK_TYPED( ContextMenuSelectHdl, Menu *, bool ); DECL_LINK_TYPED( ContextMenuHdl, void*, void ); DECL_LINK_TYPED(deactivateHdl, Timer *, void); DECL_LINK( EventListenerHdl, VclSimpleEvent* ); |