diff options
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/workwin.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/notebookbar/SfxNotebookBar.cxx | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 4874db7ee5f6..fb3955ee2c5c 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1195,7 +1195,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl2() // Iterate over all Toolboxes xLayoutManager->lock(); - const bool isNotebookBarActive = sfx2::SfxNotebookBar::IsActive(); + const bool isNotebookBarActive = sfx2::SfxNotebookBar::IsActive(true); for ( auto const & n: aObjBarList ) { ToolbarId eId = n.eId; diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 451c94cf3966..ec1f5bf33c0d 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -221,7 +221,7 @@ void SfxNotebookBar::UnlockNotebookBar() m_bLock = false; } -bool SfxNotebookBar::IsActive() +bool SfxNotebookBar::IsActive(bool bConsiderSingleToolbar) { if (m_bHide) return false; @@ -265,6 +265,9 @@ bool SfxNotebookBar::IsActive() OUString aActive = comphelper::getString( aAppNode.getNodeValue( "Active" ) ); + if (bConsiderSingleToolbar && aActive == "Single") + return true; + if (comphelper::LibreOfficeKit::isActive() && aActive == "notebookbar_online.ui") return true; |