[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source

[Philippe Jung]

 sd/source/ui/inc/ToolBarManager.hxx  |    1 +
 sd/source/ui/view/ToolBarManager.cxx |    9 ++++++---
 sd/source/ui/view/drviews1.cxx       |   24 ++++++++++++++++--------
 3 files changed, 23 insertions(+), 11 deletions(-)

New commits:
commit db79d2710e78c712763aaba0dc74165da5ad01cc
Author: Philippe Jung <phil.j...@free.fr>
Date:   Wed Jun 3 16:28:02 2015 +0200

    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/16060
    Reviewed-by: Yousuf Philips <philip...@hotmail.com>
    Tested-by: Yousuf Philips <philip...@hotmail.com>
    (cherry picked from commit 1191ed8584f9fd63c39514dd2e3e71682913d4bc)
    Reviewed-on: https://gerrit.libreoffice.org/16061
    Reviewed-by: Jan Holesovsky <ke...@collabora.com>

diff --git a/sd/source/ui/inc/ToolBarManager.hxx 
b/sd/source/ui/inc/ToolBarManager.hxx
index b5b9f80..5263dd0 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/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
diff --git a/sd/source/ui/view/ToolBarManager.cxx 
b/sd/source/ui/view/ToolBarManager.cxx
index 403230c..9e59223 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -1001,9 +1001,6 @@ void ToolBarRules::MainViewShellChanged 
(ViewShell::ShellType nShellType)
                 ToolBarManager::msOptionsToolBar);
             mpToolBarManager->AddToolBar(
                 ToolBarManager::TBG_PERMANENT,
-                ToolBarManager::msCommonTaskToolBar);
-            mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
                 ToolBarManager::msViewerToolBar);
             break;
 
@@ -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;
         }
 
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 9aa19da..109d82c 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits