tdf#87822 Impress: hide common task toolbar in master view

When Master Slide or Master Notes are active,
hides the Common task toolbar as it it not usefull.

Change-Id: Ice07661bf203c029d733614e1eceb5ef3d0661f9
Reviewed-on: https://gerrit.libreoffice.org/16060Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
(cherry picked from commit 1191ed85)
Reviewed-on: https://gerrit.libreoffice.org/16061Reviewed-by: Jan Holesovsky <kendy@collabora.com>

sd/source/ui/inc/ToolBarManager.hxx

@@ -126,6 +126,7 @@ public:
 
         TBG_PERMANENT = TBG__FIRST,
         TBG_FUNCTION,
+        TBG_COMMON_TASK,
         TBG_MASTER_MODE,
 
         TBG__LAST = TBG_MASTER_MODE

sd/source/ui/view/ToolBarManager.cxx

@@ -999,9 +999,6 @@ void ToolBarRules::MainViewShellChanged (ViewShell::ShellType nShellType)
             mpToolBarManager->AddToolBar(
                 ToolBarManager::TBG_PERMANENT,
                 ToolBarManager::msOptionsToolBar);
-            mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
-                ToolBarManager::msCommonTaskToolBar);
             mpToolBarManager->AddToolBar(
                 ToolBarManager::TBG_PERMANENT,
                 ToolBarManager::msViewerToolBar);
@@ -1065,10 +1062,16 @@ void ToolBarRules::MainViewShellChanged (const ViewShell& rMainViewShell)
             const DrawViewShell* pDrawViewShell
                 = dynamic_cast<const DrawViewShell*>(&rMainViewShell);
             if (pDrawViewShell != NULL)
+            {
                 if (pDrawViewShell->GetEditMode() == EM_MASTERPAGE)
                     mpToolBarManager->AddToolBar(
                         ToolBarManager::TBG_MASTER_MODE,
                         ToolBarManager::msMasterViewToolBar);
+                else
+                    mpToolBarManager->AddToolBar(
+                        ToolBarManager::TBG_COMMON_TASK,
+                        ToolBarManager::msCommonTaskToolBar);
+            }
             break;
         }
 

sd/source/ui/view/drviews1.cxx

@@ -363,14 +363,18 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
         // view.
         bool bShowMasterViewToolbar (meEditMode == EM_MASTERPAGE
              && GetShellType() != ViewShell::ST_HANDOUT);
+        bool bShowPresentationToolbar (meEditMode != EM_MASTERPAGE
+             && GetShellType() != ViewShell::ST_HANDOUT);
 
         // If the master view toolbar is not shown we hide it before
         // switching the edit mode.
         if (::sd::ViewShell::mpImpl->mbIsInitialized
-            && IsMainViewShell()
-            && ! bShowMasterViewToolbar)
+            && IsMainViewShell())
         {
-            GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::TBG_MASTER_MODE);
+            if ( !bShowMasterViewToolbar )
+                GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::TBG_MASTER_MODE);
+            if ( !bShowPresentationToolbar )
+                GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::TBG_COMMON_TASK);
         }
 
         if (meEditMode == EM_PAGE)
@@ -441,12 +445,16 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
         // If the master view toolbar is to be shown we turn it on after the
         // edit mode has been changed.
         if (::sd::ViewShell::mpImpl->mbIsInitialized
-            && IsMainViewShell()
-            && bShowMasterViewToolbar)
+            && IsMainViewShell())
         {
-            GetViewShellBase().GetToolBarManager()->SetToolBar(
-                ToolBarManager::TBG_MASTER_MODE,
-                ToolBarManager::msMasterViewToolBar);
+            if (bShowMasterViewToolbar)
+                GetViewShellBase().GetToolBarManager()->SetToolBar(
+                    ToolBarManager::TBG_MASTER_MODE,
+                    ToolBarManager::msMasterViewToolBar);
+            if (bShowPresentationToolbar)
+                GetViewShellBase().GetToolBarManager()->SetToolBar(
+                    ToolBarManager::TBG_COMMON_TASK,
+                    ToolBarManager::msCommonTaskToolBar);
         }
 
         if ( ! mbIsLayerModeActive)