helpcontent2 | 2
+-
officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu | 2
+-
sd/source/ui/view/ToolBarManager.cxx | 3
+++
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit dee3e2d7c8d412951099e4425e6ece24431cd98d
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Apr 25 13:53:18 2024 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Apr 25 18:23:40 2024 +0200
Related tdf#87676 Enable text formatting toolbar when in a text box
Use the second row (hiding the shapes toolbar) to show the text formatting
toolbar when the user is inside a text box.
This helps users to do basic text formatting at the place where they
expect the controls from Writer, Calc, etc.
Otherwise, when the Sidebar is switched to another Deck, finding the text
formatting
functions can be hard in the classic toolbar layout.
Change-Id: I8d6f54e6f3f44917b0c89ae699c2798e4f6b86a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166621
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
Tested-by: Jenkins
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;
commit bdc90ee923fc68f57fc7234192be2ba512797775
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Thu Apr 25 13:23:35 2024 -0300
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Thu Apr 25 18:23:35 2024 +0200
Update git submodules
* Update helpcontent2 from branch 'master'
to db688bf5d40a94939f8e6ab35744c267d35b39ab
- tdf#132253 Hyperlink tab in Characters is gone.
Change-Id: Ic146695c24e488fc5c0d0cebce2e43769ac37a7a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166640
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/helpcontent2 b/helpcontent2
index 686da2a7ece1..db688bf5d40a 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 686da2a7ece1ce03db28cfba2747870c88a9ca2e
+Subproject commit db688bf5d40a94939f8e6ab35744c267d35b39ab
