diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-08 00:05:26 +0300 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-07-08 03:25:19 +0000 |
| commit | 66ed003f66b7b3171684d9aa8f753d5aeddb8e81 (patch) | |
| tree | 8c1fbec9cb09a0243997baf1796ea73e6fdca2f7 /sd/source/ui/view | |
| parent | d9aeb1c0f1fef130d759f01c6bceefbca43e8d4a (diff) | |
tdf#92017 Don't attempt to show commontaskbar in Draw
Regression from 1191ed8584f9fd63c39514dd2e3e71682913d4bc
Change-Id: Ib631c7ac7d0c8688907555d0fb2e4343ce37d660
(cherry picked from commit 5d19f90eb247275420a6774403cb77940ac6131b)
Reviewed-on: https://gerrit.libreoffice.org/16839
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/ToolBarManager.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 9e59223ecaf3..e2bafba0142d 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -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); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 109d82c72e74..ec192473ec6e 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -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. |