officecfg/registry/data/org/openoffice/Office/Views.xcu | 7 ++++++-
sfx2/source/sidebar/ResourceManager.cxx | 5 +++++
sfx2/source/sidebar/SidebarController.cxx | 2 --
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit ca8760a836c906c4ea7f85404ee7a187ebf57b24
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 17 23:35:13 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Aug 18 08:03:45 2022 +0200
Make ElementsDeck the default deck for Math first start
Change-Id: I471e268b6bb55d0cac9faed1b6631724b08b34a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138457
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sfx2/source/sidebar/ResourceManager.cxx
b/sfx2/source/sidebar/ResourceManager.cxx
index 00b59df5e221..31477461203b 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -481,6 +481,11 @@ void ResourceManager::ReadLastActive()
if (eApplication != vcl::EnumContext::Application::NONE)
maLastActiveDecks.insert( std::make_pair(sApplicationName,
sLastUsed ) );
}
+
+ // Set up a default for Math - will do nothing if already set
+ maLastActiveDecks.emplace(
+
vcl::EnumContext::GetApplicationName(vcl::EnumContext::Application::Formula),
+ "ElementsDeck");
}
void ResourceManager::ReadContextList (
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index ff645ce23384..ab5e05736420 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -549,8 +549,6 @@ void SidebarController::UpdateConfigurations()
(maCurrentContext.msApplication !=
maRequestedContext.msApplication))
{
OUString sLastActiveDeck = mpResourceManager->GetLastActiveDeck(
maRequestedContext );
- if (comphelper::LibreOfficeKit::isActive() && sLastActiveDeck ==
"PropertyDeck" && maRequestedContext.msApplication ==
"com.sun.star.formula.FormulaProperties")
- sLastActiveDeck = "ElementsDeck"; // Manual override for lok
if (!sLastActiveDeck.isEmpty())
msCurrentDeckId = sLastActiveDeck;
}
commit 29f230a63370ee92ede2716edee97798fc0aab71
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 17 23:01:48 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Aug 18 08:03:34 2022 +0200
Show Math sidebar by default
Change-Id: Id807d0c39f78a3a4be2e5eb31c75b31b1790f71e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138456
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu
b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index c1aa90b7764a..d6c0fbfade10 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -19,7 +19,7 @@
<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:install="http://openoffice.org/2004/installation"; oor:name="Views"
oor:package="org.openoffice.Office">
<node oor:name="Windows">
- <!-- Show sidebar only in Impress and Writer by default -->
+ <!-- Do not show sidebar by default - unless explicitly configured for a
module -->
<node oor:name="10336" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
@@ -40,6 +40,11 @@
<value>true</value>
</prop>
</node>
+ <node oor:name="smath/10336" oor:op="replace">
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
<node oor:name="swriter/10336" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
