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 /framework | |
| parent | d355207b45755cfe1eef0147bc25ead931741684 (diff) | |
XFrame parameter to SetMenuBar() is actually never used.
Change-Id: I9413f575c0964d6cbf8a32d0b85c9f2c686bb8fc
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 4b4b645b440b..a662ce8d970c 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -782,7 +782,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible ) if ( pSysWindow ) { if ( bSetVisible ) - pSysWindow->SetMenuBar(pMenuBar, m_xFrame); + pSysWindow->SetMenuBar(pMenuBar); else pSysWindow->SetMenuBar( 0 ); } @@ -1166,7 +1166,7 @@ throw (uno::RuntimeException, std::exception) SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow ); if ( pSysWindow ) - pSysWindow->SetMenuBar(pMenuBar, m_xFrame); + pSysWindow->SetMenuBar(pMenuBar); m_bInplaceMenuSet = true; m_xInplaceMenuBar = Reference< XComponent >( static_cast<OWeakObject *>(m_pInplaceMenuBar), UNO_QUERY ); @@ -1193,7 +1193,7 @@ throw (uno::RuntimeException) if ( pSysWindow ) { if ( pMenuBarWrapper ) - pSysWindow->SetMenuBar(static_cast<MenuBar *>(pMenuBarWrapper->GetMenuBarManager()->GetMenuBar()), m_xFrame); + pSysWindow->SetMenuBar(static_cast<MenuBar *>(pMenuBarWrapper->GetMenuBarManager()->GetMenuBar())); else pSysWindow->SetMenuBar(0); } @@ -1494,7 +1494,7 @@ throw (RuntimeException, std::exception) MenuBar* pMenuBar = static_cast<MenuBar*>(pAwtMenuBar->GetMenu()); if ( pMenuBar ) { - pSysWindow->SetMenuBar(pMenuBar, m_xFrame); + pSysWindow->SetMenuBar(pMenuBar); pMenuBar->SetDisplayable( m_bMenuVisible ); if ( m_bMenuVisible ) bNotify = true; @@ -2580,7 +2580,7 @@ bool LayoutManager::implts_resetMenuBar() SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow ); if ( pSysWindow && bMenuVisible && pSetMenuBar ) { - pSysWindow->SetMenuBar(pSetMenuBar, m_xFrame); + pSysWindow->SetMenuBar(pSetMenuBar); pSetMenuBar->SetDisplayable( true ); return true; } |