summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2022-06-06 22:50:14 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2022-06-13 18:47:01 +0200
commit9bc1ffa2153d2474b023e0860d3c9c68ee18727b (patch)
tree8dc9f3ac544442591af48b5e66b6fde4b09920d7 /sfx2/source/appl
parent0f01b42e73af0e0baa57a353554a53d936c4f5e2 (diff)
tdf#125040 Make single mode toolbar context aware
This patch modifies the "Standard (Single Mode)" toolbar to have an optional context-aware section, given that a corresponding singlemode-<context-name>.xml files exist. This is a lot like the "Contextual Single" NB, except that it's implemented with regular toolbars, so docking/ customization/extensions/uno api etc. are all working. In addition, the "Single Toolbar" mode was modified to not show any other contextual toolbar. (But of course the single mode toolbar itself is perfectly usable outside of this mode.) Change-Id: Id746d9df59340a81962a8689b132941deea54b6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135591 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/workwin.cxx2
1 files changed, 1 insertions, 1 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;