summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop/source/lib/init.cxx11
-rw-r--r--include/sfx2/sidebar/SidebarController.hxx1
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu46
-rw-r--r--sfx2/source/sidebar/Context.cxx9
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx4
5 files changed, 19 insertions, 52 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9a4ec4881805..462e2e5d25af 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -873,22 +873,13 @@ void setupSidebar(std::u16string_view sidebarDeckId = u"")
if (!pDockingWin)
return;
- OUString currentDeckId = pDockingWin->GetSidebarController()->GetCurrentDeckId();
-
- // check if it is the chart deck id, if it is, don't switch to default deck
- bool switchToDefault = true;
-
- if (currentDeckId == "ChartDeck")
- switchToDefault = false;
-
if (!sidebarDeckId.empty())
{
pDockingWin->GetSidebarController()->SwitchToDeck(sidebarDeckId);
}
else
{
- if (switchToDefault)
- pDockingWin->GetSidebarController()->SwitchToDefaultDeck();
+ pDockingWin->GetSidebarController()->SwitchToDefaultDeck();
}
pDockingWin->SyncUpdate();
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index baedec092484..8d8dcf215527 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -133,7 +133,6 @@ public:
FocusManager& GetFocusManager() { return maFocusManager;}
ResourceManager* GetResourceManager() { return mpResourceManager.get();}
- auto& GetCurrentDeckId() const { return msCurrentDeckId; }
// std::unique_ptr<ResourceManager> GetResourceManager() { return mpResourceManager;}
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index c64da92d8789..9290ef9dcc70 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -114,7 +114,9 @@
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
- any, any, visible ;
+ Calc, any, visible;
+ DrawImpress, any, visible;
+ WriterVariants, any, visible;
</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
@@ -194,7 +196,9 @@
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
- any, any, visible ;
+ Calc, any, visible;
+ DrawImpress, any, visible;
+ WriterVariants, any, visible;
</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
@@ -214,7 +218,9 @@
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
- any, any, visible ;
+ Calc, any, visible;
+ DrawImpress, any, visible;
+ WriterVariants, any, visible;
</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
@@ -289,26 +295,6 @@
</prop>
</node>
- <node oor:name="ChartDeck" oor:op="replace">
- <prop oor:name="Title" oor:type="xs:string">
- <value xml:lang="en-US">Properties</value>
- </prop>
- <prop oor:name="Id" oor:type="xs:string">
- <value>ChartDeck</value>
- </prop>
- <prop oor:name="IconURL" oor:type="xs:string">
- <value>private:graphicrepository/sfx2/res/symphony/sidebar-property-large.png</value>
- </prop>
- <prop oor:name="ContextList">
- <value oor:separator=";">
- Chart, any, visible ;
- </value>
- </prop>
- <prop oor:name="OrderIndex" oor:type="xs:int">
- <value>10</value>
- </prop>
- </node>
-
</node>
<node oor:name="PanelList">
@@ -1646,7 +1632,7 @@
<value>ChartElementsPanel</value>
</prop>
<prop oor:name="DeckId" oor:type="xs:string">
- <value>ChartDeck</value>
+ <value>PropertyDeck</value>
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
@@ -1672,7 +1658,7 @@
<value>ChartSeriesPanel</value>
</prop>
<prop oor:name="DeckId" oor:type="xs:string">
- <value>ChartDeck</value>
+ <value>PropertyDeck</value>
</prop>
<prop oor:name="DefaultMenuCommand">
<value>.uno:ChartProperties</value>
@@ -1701,7 +1687,7 @@
<value>ChartErrorBarPanel</value>
</prop>
<prop oor:name="DeckId" oor:type="xs:string">
- <value>ChartDeck</value>
+ <value>PropertyDeck</value>
</prop>
<prop oor:name="DefaultMenuCommand">
<value>.uno:ChartProperties</value>
@@ -1730,7 +1716,7 @@
<value>ChartAxisPanel</value>
</prop>
<prop oor:name="DeckId" oor:type="xs:string">
- <value>ChartDeck</value>
+ <value>PropertyDeck</value>
</prop>
<prop oor:name="DefaultMenuCommand">
<value>.uno:ChartProperties</value>
@@ -1759,7 +1745,7 @@
<value>ChartAreaPanel</value>
</prop>
<prop oor:name="DeckId" oor:type="xs:string">
- <value>ChartDeck</value>
+ <value>PropertyDeck</value>
</prop>
<prop oor:name="DefaultMenuCommand">
<value>.uno:ChartProperties</value>
@@ -1789,7 +1775,7 @@
<value>ChartLinePanel</value>
</prop>
<prop oor:name="DeckId" oor:type="xs:string">
- <value>ChartDeck</value>
+ <value>PropertyDeck</value>
</prop>
<prop oor:name="DefaultMenuCommand">
<value>.uno:ChartProperties</value>
@@ -1855,7 +1841,7 @@
<value>ChartTypePanel</value>
</prop>
<prop oor:name="DeckId" oor:type="xs:string">
- <value>ChartDeck</value>
+ <value>PropertyDeck</value>
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx
index 8a254ebbe2f7..2065fbd0473b 100644
--- a/sfx2/source/sidebar/Context.cxx
+++ b/sfx2/source/sidebar/Context.cxx
@@ -46,14 +46,7 @@ Context::Context (
sal_Int32 Context::EvaluateMatch (
const Context& rOther) const
{
- bool bApplicationNameIsAny (rOther.msApplication == AnyApplicationName);
-
- // special case for charts which use a whole own set of decks
- if (msApplication == "com.sun.star.chart2.ChartDocument")
- {
- bApplicationNameIsAny = false;
- }
-
+ const bool bApplicationNameIsAny (rOther.msApplication == AnyApplicationName);
if (rOther.msApplication == msApplication || bApplicationNameIsAny)
{
// Application name matches.
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 898898a09d4a..a1c6c211d794 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -466,9 +466,7 @@ void SidebarController::NotifyResize()
// it's the PropertyDeck that really has many panes
// that can collapse or expand. For others, limit
// the height to something sensible.
- // tdf#130348: Add special case for ChartDeck, too.
- const sal_Int32 nExtHeight = (msCurrentDeckId == "PropertyDeck" ? 2000 :
- (msCurrentDeckId == "ChartDeck" ? 1200 : 600));
+ const sal_Int32 nExtHeight = (msCurrentDeckId == "PropertyDeck" ? 2000 : 600);
// No TabBar in LOK (use nWidth in full).
mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, nExtHeight);
}
generated by cgit (git 2.34.1) at 2025-02-21 11:40:43 +0000