summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu2
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx3
2 files changed, 4 insertions, 1 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 234502d43185..8475ac8c9847 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -755,7 +755,7 @@
<value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Formatting</value>
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 7dd95c962499..5296b7bd94ef 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -1079,6 +1079,8 @@ void ToolBarRules::SelectionHasChanged (
case ::sd::ViewShell::ST_HANDOUT:
mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Function,
ToolBarManager::msDrawingObjectToolBar);
+ mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Permanent,
+ ToolBarManager::msToolBar);
break;
default:
break;
@@ -1122,6 +1124,7 @@ void ToolBarRules::SubShellAdded (
break;
case ToolbarId::Draw_Text_Toolbox_Sd:
+ mpToolBarManager->RemoveToolBar(ToolBarManager::ToolBarGroup::Permanent, ToolBarManager::msToolBar);
mpToolBarManager->AddToolBar(eGroup, ToolBarManager::msTextObjectBar);
break;