diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-08 00:05:26 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-08 00:26:45 +0300 |
| commit | 5d19f90eb247275420a6774403cb77940ac6131b (patch) | |
| tree | 538a77f96139fa6743502a87bd2f3376714d943e | |
| parent | 9a9b192ba57063311a7af8e48590272520f8aff9 (diff) | |
tdf#92017 Don't attempt to show commontaskbar in Draw
Regression from 1191ed8584f9fd63c39514dd2e3e71682913d4bc
Change-Id: Ib631c7ac7d0c8688907555d0fb2e4343ce37d660
| -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 2d1add3a91ab..4fe12fac0026 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 8b605b02f51c..28fd92c80565 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -365,7 +365,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. |