diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-09-29 10:22:03 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-09-29 11:23:37 +0200 |
| commit | e124cd5213750b89e8a6a03dffc43172bc5402a6 (patch) | |
| tree | a68408382414c256b90e96b798342b209e345027 /vcl/source/window/syswin.cxx | |
| parent | d355207b45755cfe1eef0147bc25ead931741684 (diff) | |
XFrame parameter to SetMenuBar() is actually never used.
Change-Id: I9413f575c0964d6cbf8a32d0b85c9f2c686bb8fc
Diffstat (limited to 'vcl/source/window/syswin.cxx')
| -rw-r--r-- | vcl/source/window/syswin.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
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 |