summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-15 10:50:45 +0200
committerNoel Grandin <noel@peralex.com>2015-09-16 08:38:53 +0200
commit44404a0c8ae8a7a12e7d9133323d0f7e32061c03 (patch)
tree5f31b8bf8a2a4df8eacf3c1d6eccbde8460a4e00 /vcl/source/window
parentc4fb1122b3b6c55d479c68c14101972254aa72a8 (diff)
convert Link<> to typed
Change-Id: If6334d32abbec379acbb9def98fdf6cb5144238b
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/menu.cxx2
-rw-r--r--vcl/source/window/menubarwindow.cxx4
-rw-r--r--vcl/source/window/menubarwindow.hxx4
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 574bdf7bc9c7..e49ff60f5ec4 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2737,7 +2737,7 @@ sal_uInt16 MenuBar::AddMenuBarButton( const Image& i_rImage, const Link<MenuBar:
return pMenuWin ? pMenuWin->AddMenuBarButton(i_rImage, i_rLink, i_rToolTip) : 0;
}
-void MenuBar::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<>& rLink )
+void MenuBar::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>& rLink )
{
MenuBarWindow* pMenuWin = getMenuBarWindow();
if (!pMenuWin)
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 7116eb1d1280..5380b05af57c 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -270,7 +270,7 @@ IMPL_LINK( MenuBarWindow, ToolboxEventHdl, VclWindowEvent*, pEvent )
std::map< sal_uInt16, AddButtonEntry >::iterator it = m_aAddButtons.find( aArg.nId );
if( it != m_aAddButtons.end() )
{
- it->second.m_aHighlightLink.Call( &aArg );
+ it->second.m_aHighlightLink.Call( aArg );
}
return 0;
}
@@ -1150,7 +1150,7 @@ sal_uInt16 MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link<Me
return nId;
}
-void MenuBarWindow::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<>& rLink )
+void MenuBarWindow::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>& rLink )
{
std::map< sal_uInt16, AddButtonEntry >::iterator it = m_aAddButtons.find( nId );
if( it != m_aAddButtons.end() )
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index 34c3aa1d9736..f460a770f45c 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -69,7 +69,7 @@ private:
{
sal_uInt16 m_nId;
Link<MenuBar::MenuBarButtonCallbackArg&,bool> m_aSelectLink;
- Link<> m_aHighlightLink;
+ Link<MenuBar::MenuBarButtonCallbackArg&,bool> m_aHighlightLink;
AddButtonEntry() : m_nId( 0 ) {}
};
@@ -143,7 +143,7 @@ public:
/// Add an arbitrary button to the menubar that will appear next to the close button.
sal_uInt16 AddMenuBarButton(const Image&, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>&, const OUString&);
- void SetMenuBarButtonHighlightHdl(sal_uInt16 nId, const Link<>&);
+ void SetMenuBarButtonHighlightHdl(sal_uInt16 nId, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>&);
Rectangle GetMenuBarButtonRectPixel(sal_uInt16 nId);
void RemoveMenuBarButton(sal_uInt16 nId);
bool HandleMenuButtonEvent(sal_uInt16 i_nButtonId);