core.git: sd/source

[Bogdan Buzea (via logerrit)]

 sd/source/ui/view/ToolBarManager.cxx |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 589974b0cad8d5f552b5c919b24f10b713c9b6e3
Author:     Bogdan Buzea <buzea.bog...@libreoffice.org>
AuthorDate: Sat Oct 19 18:41:50 2024 +0200
Commit:     David Gilbert <freedesk...@treblig.org>
CommitDate: Thu Oct 31 02:04:18 2024 +0100

    tdf#163486: PVS: Identical branches
    
    V1037 Two or more case-branches perform the same actions. Check lines: 962, 
979
    
    Change-Id: Ic31a6129828a41bd3450567ca8cb8884d60691cc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175220
    Reviewed-by: David Gilbert <freedesk...@treblig.org>
    Tested-by: Jenkins

diff --git a/sd/source/ui/view/ToolBarManager.cxx 
b/sd/source/ui/view/ToolBarManager.cxx
index d1152ec6ce23..0dcb3a1a919a 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -959,6 +959,7 @@ void ToolBarRules::MainViewShellChanged 
(ViewShell::ShellType nShellType)
         case ::sd::ViewShell::ST_IMPRESS:
         case ::sd::ViewShell::ST_NOTES:
         case ::sd::ViewShell::ST_HANDOUT:
+        case ::sd::ViewShell::ST_DRAW:
             mpToolBarManager->AddToolBar(
                 ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msToolBar);
@@ -975,18 +976,6 @@ void ToolBarRules::MainViewShellChanged 
(ViewShell::ShellType nShellType)
                                               ToolbarId::Draw_Text_Toolbox_Sd);
             break;
 
-        case ::sd::ViewShell::ST_DRAW:
-            mpToolBarManager->AddToolBar(
-                ToolBarManager::ToolBarGroup::Permanent,
-                ToolBarManager::msToolBar);
-            mpToolBarManager->AddToolBar(
-                ToolBarManager::ToolBarGroup::Permanent,
-                ToolBarManager::msOptionsToolBar);
-            mpToolBarManager->AddToolBar(
-                ToolBarManager::ToolBarGroup::Permanent,
-                ToolBarManager::msViewerToolBar);
-            break;
-
         case ViewShell::ST_OUTLINE:
             mpToolBarManager->AddToolBar(
                 ToolBarManager::ToolBarGroup::Permanent,