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 /framework | |
| parent | b66dc3cd84c7031a0df75e9d782edebbaca6fdf1 (diff) | |
vcl: Allow creation of button content from action name (.uno: commands).
Change-Id: If4b2aef59d45a848fb77de9e1b7bf80d49548a75
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 89d1fe472dbc..a9fad1ae8898 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -770,7 +770,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible ) if ( pSysWindow ) { if ( bSetVisible ) - pSysWindow->SetMenuBar( pMenuBar ); + pSysWindow->SetMenuBar(pMenuBar, m_xFrame); else pSysWindow->SetMenuBar( 0 ); bMustDoLayout = true; @@ -1154,7 +1154,7 @@ throw (uno::RuntimeException) SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow ); if ( pSysWindow ) - pSysWindow->SetMenuBar(pMenuBar); + pSysWindow->SetMenuBar(pMenuBar, m_xFrame); m_bInplaceMenuSet = true; m_xInplaceMenuBar = Reference< XComponent >( (OWeakObject *)m_pInplaceMenuBar, UNO_QUERY ); @@ -1181,7 +1181,7 @@ throw (uno::RuntimeException) if ( pSysWindow ) { if ( pMenuBarWrapper ) - pSysWindow->SetMenuBar((MenuBar *)pMenuBarWrapper->GetMenuBarManager()->GetMenuBar()); + pSysWindow->SetMenuBar((MenuBar *)pMenuBarWrapper->GetMenuBarManager()->GetMenuBar(), m_xFrame); else pSysWindow->SetMenuBar(0); } @@ -1489,7 +1489,7 @@ throw (RuntimeException, std::exception) MenuBar* pMenuBar = (MenuBar*)pAwtMenuBar->GetMenu(); if ( pMenuBar ) { - pSysWindow->SetMenuBar( pMenuBar ); + pSysWindow->SetMenuBar(pMenuBar, m_xFrame); pMenuBar->SetDisplayable( m_bMenuVisible ); if ( m_bMenuVisible ) bNotify = true; @@ -2574,7 +2574,7 @@ bool LayoutManager::implts_resetMenuBar() SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow ); if ( pSysWindow && bMenuVisible && pSetMenuBar ) { - pSysWindow->SetMenuBar( pSetMenuBar ); + pSysWindow->SetMenuBar(pSetMenuBar, m_xFrame); pSetMenuBar->SetDisplayable( true ); return true; } |