summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu14
-rw-r--r--sc/UIConfig_scalc.mk1
-rw-r--r--sc/uiconfig/scalc/menubar/menubar.xml18
-rw-r--r--sc/uiconfig/scalc/popupmenu/statisticsmenu.xml24
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar.ui13
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_compact.ui13
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui88
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui88
8 files changed, 70 insertions, 189 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 2720e33ccec6..2158cbcab053 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -551,6 +551,20 @@
<value>sparklinemenu</value>
</prop>
</node>
+ <node oor:name="c45" oor:op="replace">
+ <prop oor:name="Command">
+ <value>.uno:StatisticsMenu</value>
+ </prop>
+ <prop oor:name="Module">
+ <value/>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.comp.framework.ResourceMenuController</value>
+ </prop>
+ <prop oor:name="Value">
+ <value>statisticsmenu</value>
+ </prop>
+ </node>
<node oor:name="WindowListMenu" oor:op="replace">
<prop oor:name="Command">
<value>.uno:WindowList</value>
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index d6ea2fe8947b..0b9f514d0fd5 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
sc/uiconfig/scalc/popupmenu/sheettab \
sc/uiconfig/scalc/popupmenu/sparkline \
sc/uiconfig/scalc/popupmenu/sparklinemenu \
+ sc/uiconfig/scalc/popupmenu/statisticsmenu \
))
$(eval $(call gb_UIConfig_add_statusbarfiles,modules/scalc,\
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index bfcac17c9602..ab2c7f81f672 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -647,23 +647,7 @@
<menu:menuitem menu:id=".uno:ShowDetail"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:StatisticsMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SamplingDialog"/>
- <menu:menuitem menu:id=".uno:DescriptiveStatisticsDialog"/>
- <menu:menuitem menu:id=".uno:AnalysisOfVarianceDialog"/>
- <menu:menuitem menu:id=".uno:CorrelationDialog"/>
- <menu:menuitem menu:id=".uno:CovarianceDialog"/>
- <menu:menuitem menu:id=".uno:ExponentialSmoothingDialog"/>
- <menu:menuitem menu:id=".uno:MovingAverageDialog"/>
- <menu:menuitem menu:id=".uno:RegressionDialog"/>
- <menu:menuitem menu:id=".uno:TTestDialog"/>
- <menu:menuitem menu:id=".uno:FTestDialog"/>
- <menu:menuitem menu:id=".uno:ZTestDialog"/>
- <menu:menuitem menu:id=".uno:ChiSquareTestDialog"/>
- <menu:menuitem menu:id=".uno:FourierAnalysisDialog"/>
- </menu:menupopup>
- </menu:menu>
+ <menu:menu menu:id=".uno:StatisticsMenu"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ToolsMenu">
diff --git a/sc/uiconfig/scalc/popupmenu/statisticsmenu.xml b/sc/uiconfig/scalc/popupmenu/statisticsmenu.xml
new file mode 100644
index 000000000000..9bc4f2135f78
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/statisticsmenu.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+ <menu:menuitem menu:id=".uno:SamplingDialog"/>
+ <menu:menuitem menu:id=".uno:DescriptiveStatisticsDialog"/>
+ <menu:menuitem menu:id=".uno:AnalysisOfVarianceDialog"/>
+ <menu:menuitem menu:id=".uno:CorrelationDialog"/>
+ <menu:menuitem menu:id=".uno:CovarianceDialog"/>
+ <menu:menuitem menu:id=".uno:ExponentialSmoothingDialog"/>
+ <menu:menuitem menu:id=".uno:MovingAverageDialog"/>
+ <menu:menuitem menu:id=".uno:RegressionDialog"/>
+ <menu:menuitem menu:id=".uno:TTestDialog"/>
+ <menu:menuitem menu:id=".uno:FTestDialog"/>
+ <menu:menuitem menu:id=".uno:ZTestDialog"/>
+ <menu:menuitem menu:id=".uno:ChiSquareTestDialog"/>
+ <menu:menuitem menu:id=".uno:FourierAnalysisDialog"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 5094f94198b4..f6d60d0b1e92 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -281,6 +281,19 @@
<property name="action_name">.uno:ShowDetail</property>
</object>
</child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuData-separator8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuData-Statistics">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:StatisticsMenu</property>
+ </object>
+ </child>
</object>
<object class="GtkMenu" id="Menu Draw">
<property name="visible">True</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 1328f59d7463..4f6c192a87d6 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -281,6 +281,19 @@
<property name="action_name">.uno:ShowDetail</property>
</object>
</child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuData-separator8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuData-Statistics">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:StatisticsMenu</property>
+ </object>
+ </child>
</object>
<object class="GtkMenu" id="Menu Draw">
<property name="visible">True</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 0587bab1025c..2533c66719f0 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -2971,94 +2971,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuData-SamplingDialog">
+ <object class="GtkMenuItem" id="MenuData-Statistics">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SamplingDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-DescriptiveStatisticsDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DescriptiveStatisticsDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-AnalysisOfVarianceDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:AnalysisOfVarianceDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-CorrelationDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:CorrelationDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-CovarianceDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:CovarianceDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-ExponentialSmoothingDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ExponentialSmoothingDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-MovingAverageDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:MovingAverageDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-RegressionDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:RegressionDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-TTestDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:TTestDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-FTestDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:FTestDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-ZTestDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ZTestDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-ChiSquareTestDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ChiSquareTestDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-FourierAnalysisDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:FourierAnalysisDialog</property>
+ <property name="action_name">.uno:StatisticsMenu</property>
</object>
</child>
</object>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index df313f917d57..b036557cea0f 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -657,94 +657,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuData-SamplingDialog">
+ <object class="GtkMenuItem" id="MenuData-Statistics">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SamplingDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-DescriptiveStatisticsDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DescriptiveStatisticsDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-AnalysisOfVarianceDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:AnalysisOfVarianceDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-CorrelationDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:CorrelationDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-CovarianceDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:CovarianceDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-ExponentialSmoothingDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ExponentialSmoothingDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-MovingAverageDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:MovingAverageDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-RegressionDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:RegressionDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-TTestDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:TTestDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-FTestDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:FTestDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-ZTestDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ZTestDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-ChiSquareTestDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ChiSquareTestDialog</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuData-FourierAnalysisDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:FourierAnalysisDialog</property>
+ <property name="action_name">.uno:StatisticsMenu</property>
</object>
</child>
</object>