diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-11 08:49:53 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-11 08:54:26 +0100 |
| commit | 53f66fa6793d96f410acc7a256beb3284d65f296 (patch) | |
| tree | 75a178523cae21f1b933d51b1b3bf6b0da2e8d31 /framework | |
| parent | db17d3c17c40d6b0e92392cf3c6e343d1d17b771 (diff) | |
Fix NotebookBar not showing up when directly opening a document
Change-Id: I6bb154102d5e58e7c7e1f1b0d68629555a6d1697
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index fe10f2e52469..1c15c9faa55b 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -784,11 +784,6 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible ) if ( bSetVisible ) { pSysWindow->SetMenuBar(pMenuBar); - if (getenv("LO_USE_NOTEBOOKBAR")) - { - pSysWindow->CreateNotebookBar("vcl/ui/notebookbar.ui", m_xFrame); - pSysWindow->SetMenuBarMode(MenuBarMode::Hide); - } } else pSysWindow->SetMenuBar( nullptr ); @@ -1466,7 +1461,7 @@ throw (RuntimeException, std::exception) { // #i38743# don't create a menubar if frame isn't top if ( !bInPlaceMenu && !m_xMenuBar.is() && implts_isFrameOrWindowTop( xFrame )) - { + { m_xMenuBar = implts_createElement( aName ); if ( m_xMenuBar.is() ) { @@ -1508,6 +1503,11 @@ throw (RuntimeException, std::exception) } } } + if (getenv("LO_USE_NOTEBOOKBAR")) + { + pSysWindow->CreateNotebookBar("vcl/ui/notebookbar.ui", m_xFrame); + pSysWindow->SetMenuBarMode(MenuBarMode::Hide); + } } } } |