diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-20 10:36:03 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-20 11:14:24 +0000 |
commit | 009face61bb5c7a8e19345ce5531075b7599dd79 (patch) | |
tree | 609d543450bbde83b59cf2a2f56bb257a907afad /framework | |
parent | 216879f1edced1b696bf27d40989280a363b69c4 (diff) |
Revert "vcl: Initial NotebookBar implementation."
Will use a different approach for NotebookBar.
Also this should not be in 5.1.
This reverts commit 8c1014021dbe9da2e18233d215b970f5359db67b.
Change-Id: Ic699723818a890bf4c3be3a2c045527148bd118b
Reviewed-on: https://gerrit.libreoffice.org/20075
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 1c15c9faa55b..eb66efea6e51 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -782,9 +782,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible ) if ( pSysWindow ) { if ( bSetVisible ) - { pSysWindow->SetMenuBar(pMenuBar); - } else pSysWindow->SetMenuBar( nullptr ); } @@ -1503,11 +1501,6 @@ throw (RuntimeException, std::exception) } } } - if (getenv("LO_USE_NOTEBOOKBAR")) - { - pSysWindow->CreateNotebookBar("vcl/ui/notebookbar.ui", m_xFrame); - pSysWindow->SetMenuBarMode(MenuBarMode::Hide); - } } } } |