Kaydet (Commit) 95da55e5 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky Kaydeden (comit) Andras Timar

tdf#92017 Don't attempt to show commontaskbar in Draw

Regression from 1191ed85

Change-Id: Ib631c7ac7d0c8688907555d0fb2e4343ce37d660
(cherry picked from commit 5d19f90e)
Reviewed-on: https://gerrit.libreoffice.org/16839Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
üst 8f403a41
......@@ -1067,7 +1067,7 @@ void ToolBarRules::MainViewShellChanged (const ViewShell& rMainViewShell)
mpToolBarManager->AddToolBar(
ToolBarManager::TBG_MASTER_MODE,
ToolBarManager::msMasterViewToolBar);
else
else if ( rMainViewShell.GetShellType() != ::sd::ViewShell::ST_DRAW )
mpToolBarManager->AddToolBar(
ToolBarManager::TBG_COMMON_TASK,
ToolBarManager::msCommonTaskToolBar);
......
......@@ -364,7 +364,8 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
bool bShowMasterViewToolbar (meEditMode == EM_MASTERPAGE
&& GetShellType() != ViewShell::ST_HANDOUT);
bool bShowPresentationToolbar (meEditMode != EM_MASTERPAGE
&& GetShellType() != ViewShell::ST_HANDOUT);
&& GetShellType() != ViewShell::ST_HANDOUT
&& GetShellType() != ViewShell::ST_DRAW);
// If the master view toolbar is not shown we hide it before
// switching the edit mode.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment