sd/source/ui/view/ToolBarManager.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 188cff995830d52f4b04ee4d2ffcabeff5d17b27
Author:     Rafael Lima <rafael.palma.l...@gmail.com>
AuthorDate: Wed Aug 9 01:30:25 2023 +0200
Commit:     Rafael Lima <rafael.palma.l...@gmail.com>
CommitDate: Thu Aug 17 14:16:32 2023 +0200

    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.tie...@documentfoundation.org>
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>

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:

Reply via email to