diff options
Diffstat (limited to 'sd/source/ui/view/ToolBarManager.cxx')
-rw-r--r-- | sd/source/ui/view/ToolBarManager.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 403230c7f1f6..9e59223ecaf3 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; } |