diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-09-22 11:45:37 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-09-22 11:57:00 +0200 |
| commit | 8da21eca455134a1d017893a9b1d26f827fba185 (patch) | |
| tree | ff6012cf56cc67eaf9b2ea37fe24249adeebca11 /vcl/source/window/syswin.cxx | |
| parent | b66dc3cd84c7031a0df75e9d782edebbaca6fdf1 (diff) | |
vcl: Allow creation of button content from action name (.uno: commands).
Change-Id: If4b2aef59d45a848fb77de9e1b7bf80d49548a75
Diffstat (limited to 'vcl/source/window/syswin.cxx')
| -rw-r--r-- | vcl/source/window/syswin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 0a2980bd4794..60c80929355d 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -879,7 +879,7 @@ OString SystemWindow::GetWindowState( sal_uLong nMask ) const return ImplWindowStateToStr(aData); } -void SystemWindow::SetMenuBar( MenuBar* pMenuBar ) +void SystemWindow::SetMenuBar(MenuBar* pMenuBar, const css::uno::Reference<css::frame::XFrame>& rFrame) { if ( mpMenuBar != pMenuBar ) { @@ -902,7 +902,7 @@ void SystemWindow::SetMenuBar( MenuBar* pMenuBar ) if ( pMenuBar ) { DBG_ASSERT( !pMenuBar->pWindow, "SystemWindow::SetMenuBar() - MenuBars can only set in one SystemWindow at time" ); - ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetMenuBarWindow( pNewWindow = MenuBar::ImplCreate( mpWindowImpl->mpBorderWindow, pOldWindow, pMenuBar ) ); + ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetMenuBarWindow(pNewWindow = MenuBar::ImplCreate(mpWindowImpl->mpBorderWindow, pOldWindow, pMenuBar, rFrame)); ImplCallEventListeners( VCLEVENT_WINDOW_MENUBARADDED, (void*) pMenuBar ); } else |