summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorRafael Lima <rafael.palma.lima@gmail.com>2023-08-09 01:30:25 +0200
committerRafael Lima <rafael.palma.lima@gmail.com>2023-08-17 14:16:32 +0200
commit188cff995830d52f4b04ee4d2ffcabeff5d17b27 (patch)
treeda469f9dd670f30c7d5ea8a86c4f992d59388177 /sd/source/ui
parentc6250e82472f0d36c0c0c4b33c76882c94da8170 (diff)
tdf#142489 Do not show the table toolbar when Notebookbar is active
When the Notebookbar UI is being used, all the commands are already accessible via the "Table" tab in the notebookbar, so showing the toolbar duplicates the commands on the screen. Therefore, this patch disables showing this toolbar when the Notebookbar UI is being used. Obviously, it can be enabled manually via View - Toolbars. Change-Id: I115effbd94f61df518ff90411a45431fefa9e844 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155473 Tested-by: Jenkins Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index b3ea6ee8ded2..4be073bac612 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -1129,7 +1129,9 @@ void ToolBarRules::SubShellAdded (
break;
case ToolbarId::Draw_Table_Toolbox:
- mpToolBarManager->AddToolBar(eGroup, ToolBarManager::msTableObjectBar);
+ // tdf#142489 Do not show the table toolbar when the Notebookbar UI is active
+ if (!sfx2::SfxNotebookBar::IsActive(true))
+ mpToolBarManager->AddToolBar(eGroup, ToolBarManager::msTableObjectBar);
break;
default: