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 /svx/source/gallery2 | |
| 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 'svx/source/gallery2')
| -rw-r--r-- | svx/source/gallery2/galbrws1.cxx | 4 | ||||
| -rw-r--r-- | svx/source/gallery2/galbrws1.hxx | 2 | ||||
| -rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index bf1e04d68bd0..9eaefc72f438 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -608,10 +608,10 @@ IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ShowContextMenuHdl, void*, void) } } -IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu ) +IMPL_LINK_TYPED( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu, bool ) { ImplExecute( pMenu->GetCurItemId() ); - return 0L; + return false; } IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl) diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 74a655206452..4cd406432846 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -112,7 +112,7 @@ private: DECL_LINK_TYPED( ClickNewThemeHdl, Button*, void ); DECL_LINK( SelectThemeHdl, void* ); DECL_LINK_TYPED( ShowContextMenuHdl, void*, void ); - DECL_LINK( PopupMenuHdl, Menu* ); + DECL_LINK_TYPED( PopupMenuHdl, Menu*, bool ); DECL_LINK( EndNewThemePropertiesDlgHdl, VclAbstractDialog2* ); DECL_LINK( EndThemePropertiesDlgHdl, VclAbstractDialog2* ); DECL_LINK_TYPED( DestroyThemePropertiesDlgHdl, void*, void ); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 6f0d17364d10..2f4fcf57431f 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -121,8 +121,8 @@ private: static void Execute( const CommandInfo &rCmdInfo, const css::uno::Sequence< css::beans::PropertyValue > &rArguments ); - DECL_LINK( MenuSelectHdl, Menu* ); - DECL_LINK( BackgroundMenuSelectHdl, Menu* ); + DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); + DECL_LINK_TYPED( BackgroundMenuSelectHdl, Menu*, bool ); public: GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, @@ -340,10 +340,10 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos maPopupMenu.Execute( pWindow, aPos ); } -IMPL_LINK( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu ) +IMPL_LINK_TYPED( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu, bool ) { if( !pMenu ) - return 0; + return false; sal_uInt16 nId( pMenu->GetCurItemId() ); switch ( nId ) @@ -362,13 +362,13 @@ IMPL_LINK( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu ) mpBrowser->Execute( nId ); } - return 0; + return false; } -IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu ) +IMPL_LINK_TYPED( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu, bool ) { if( !pMenu ) - return 0; + return false; sal_uInt16 nPos( pMenu->GetCurItemId() - 1 ); OUString aURL( mpBrowser->GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); @@ -392,7 +392,7 @@ IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu ) if ( it != m_aCommandInfo.end() ) Execute( it->second, aArgs ); - return 0; + return false; } } // end anonymous namespace |