summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-09-29 10:22:03 +0200
committerJan Holesovsky <kendy@collabora.com>2015-09-29 11:23:37 +0200
commite124cd5213750b89e8a6a03dffc43172bc5402a6 (patch)
treea68408382414c256b90e96b798342b209e345027 /vcl/source/window
parentd355207b45755cfe1eef0147bc25ead931741684 (diff)
XFrame parameter to SetMenuBar() is actually never used.
Change-Id: I9413f575c0964d6cbf8a32d0b85c9f2c686bb8fc
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/menu.cxx2
-rw-r--r--vcl/source/window/syswin.cxx7
2 files changed, 6 insertions, 3 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 23f857aa3273..2505afa94939 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2549,7 +2549,7 @@ void MenuBar::SetDisplayable( bool bDisplayable )
}
}
-vcl::Window* MenuBar::ImplCreate(vcl::Window* pParent, vcl::Window* pWindow, MenuBar* pMenu, const css::uno::Reference<css::frame::XFrame> &/*rFrame*/)
+vcl::Window* MenuBar::ImplCreate(vcl::Window* pParent, vcl::Window* pWindow, MenuBar* pMenu)
{
MenuBarWindow *pMenuBarWindow = dynamic_cast<MenuBarWindow*>(pWindow);
if (!pMenuBarWindow)
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index b711cb342e0b..cac6542649a9 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -902,7 +902,7 @@ OString SystemWindow::GetWindowState( sal_uInt32 nMask ) const
return ImplWindowStateToStr(aData);
}
-void SystemWindow::SetMenuBar(MenuBar* pMenuBar, const css::uno::Reference<css::frame::XFrame>& rFrame)
+void SystemWindow::SetMenuBar(MenuBar* pMenuBar)
{
if ( mpMenuBar != pMenuBar )
{
@@ -925,7 +925,10 @@ void SystemWindow::SetMenuBar(MenuBar* pMenuBar, const css::uno::Reference<css::
if ( pMenuBar )
{
DBG_ASSERT( !pMenuBar->pWindow, "SystemWindow::SetMenuBar() - MenuBars can only set in one SystemWindow at time" );
- static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->SetMenuBarWindow( pNewWindow = MenuBar::ImplCreate( mpWindowImpl->mpBorderWindow, pOldWindow, pMenuBar, rFrame));
+
+ pNewWindow = MenuBar::ImplCreate(mpWindowImpl->mpBorderWindow, pOldWindow, pMenuBar);
+ static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->SetMenuBarWindow(pNewWindow);
+
CallEventListeners( VCLEVENT_WINDOW_MENUBARADDED, static_cast<void*>(pMenuBar) );
}
else