summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-15 10:47:17 +0200
committerNoel Grandin <noel@peralex.com>2015-09-16 08:38:53 +0200
commitc4fb1122b3b6c55d479c68c14101972254aa72a8 (patch)
treefe35f48b24099b403cb04475279a5cedf43bdd9e /vcl/source/window
parent8f4c632b87a9c148a5d613839a091f01bcddd6c0 (diff)
convert Link<> to typed
Change-Id: I628de57f87b4ba20a797d345bdf71cf10cf148fc
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/menu.cxx2
-rw-r--r--vcl/source/window/menubarwindow.cxx6
-rw-r--r--vcl/source/window/menubarwindow.hxx4
3 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e6273775c503..574bdf7bc9c7 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2731,7 +2731,7 @@ bool MenuBar::HandleMenuCommandEvent( Menu *pMenu, sal_uInt16 nCommandEventId )
return false;
}
-sal_uInt16 MenuBar::AddMenuBarButton( const Image& i_rImage, const Link<>& i_rLink, const OUString& i_rToolTip )
+sal_uInt16 MenuBar::AddMenuBarButton( const Image& i_rImage, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>& i_rLink, const OUString& i_rToolTip )
{
MenuBarWindow* pMenuWin = getMenuBarWindow();
return pMenuWin ? pMenuWin->AddMenuBarButton(i_rImage, i_rLink, i_rToolTip) : 0;
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 772894334f59..7116eb1d1280 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -246,7 +246,7 @@ IMPL_LINK_NOARG_TYPED(MenuBarWindow, CloseHdl, ToolBox *, void)
aArg.nId = it->first;
aArg.bHighlight = (aCloseBtn->GetHighlightItemId() == it->first);
aArg.pMenuBar = dynamic_cast<MenuBar*>(pMenu);
- it->second.m_aSelectLink.Call( &aArg );
+ it->second.m_aSelectLink.Call( aArg );
}
}
}
@@ -1125,7 +1125,7 @@ css::uno::Reference<css::accessibility::XAccessible> MenuBarWindow::CreateAccess
return xAcc;
}
-sal_uInt16 MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link<>& i_rLink, const OUString& i_rToolTip )
+sal_uInt16 MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>& i_rLink, const OUString& i_rToolTip )
{
// find first free button id
sal_uInt16 nId = IID_DOCUMENTCLOSE;
@@ -1203,7 +1203,7 @@ bool MenuBarWindow::HandleMenuButtonEvent( sal_uInt16 i_nButtonId )
aArg.nId = it->first;
aArg.bHighlight = true;
aArg.pMenuBar = dynamic_cast<MenuBar*>(pMenu);
- return it->second.m_aSelectLink.Call( &aArg );
+ return it->second.m_aSelectLink.Call( aArg );
}
return false;
}
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index da15f86f9d61..34c3aa1d9736 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -68,7 +68,7 @@ private:
struct AddButtonEntry
{
sal_uInt16 m_nId;
- Link<> m_aSelectLink;
+ Link<MenuBar::MenuBarButtonCallbackArg&,bool> m_aSelectLink;
Link<> m_aHighlightLink;
AddButtonEntry() : m_nId( 0 ) {}
@@ -142,7 +142,7 @@ public:
Size MinCloseButtonSize();
/// Add an arbitrary button to the menubar that will appear next to the close button.
- sal_uInt16 AddMenuBarButton(const Image&, const Link<>&, const OUString&);
+ sal_uInt16 AddMenuBarButton(const Image&, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>&, const OUString&);
void SetMenuBarButtonHighlightHdl(sal_uInt16 nId, const Link<>&);
Rectangle GetMenuBarButtonRectPixel(sal_uInt16 nId);
void RemoveMenuBarButton(sal_uInt16 nId);