sd/source/ui/view/ToolBarManager.cxx | 2 +-
sd/source/ui/view/drviews1.cxx | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 5d19f90eb247275420a6774403cb77940ac6131b
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Wed Jul 8 00:05:26 2015 +0300
tdf#92017 Don't attempt to show commontaskbar in Draw
Regression from 1191ed8584f9fd63c39514dd2e3e71682913d4bc
Change-Id: Ib631c7ac7d0c8688907555d0fb2e4343ce37d660
diff --git a/sd/source/ui/view/ToolBarManager.cxx
b/sd/source/ui/view/ToolBarManager.cxx
index 2d1add3..4fe12fa 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 8b605b0..28fd92c 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.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
