update calc notebookbar styles drop down and context-EditCell fix

Change-Id: Iaa3242120f250fb75946c8c3c448364a54203db8
Reviewed-on: https://gerrit.libreoffice.org/42342
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>

2 files changed, 15 insertions, 2 deletions

diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index f384b9796270..fd1ecdc4aa4a 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -3853,6 +3853,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Default&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|defaultD">Default</property>
       </object>
     </child>
     <child>
@@ -3866,6 +3867,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Accent 1&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Accent1">Accent 1</property>
       </object>
     </child>
     <child>
@@ -3873,6 +3875,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Accent 2&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Accent2">Accent 2</property>
       </object>
     </child>
     <child>
@@ -3880,6 +3883,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Accent 3&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Accent3">Accent 3</property>
       </object>
     </child>
     <child>
@@ -3893,6 +3897,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Header1">Header 1</property>
       </object>
     </child>
     <child>
@@ -3900,6 +3905,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Header2">Header 2</property>
       </object>
     </child>
     <child>
@@ -3913,6 +3919,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Bad&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|bad">Bad</property>
       </object>
     </child>
     <child>
@@ -3920,6 +3927,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Error&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|error">Error</property>
       </object>
     </child>
     <child>
@@ -3927,6 +3935,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Good&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|good">Good</property>
       </object>
     </child>
     <child>
@@ -3934,6 +3943,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Neutral&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|neutral">Neutral</property>
       </object>
     </child>
     <child>
@@ -3941,6 +3951,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Warning&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|warning">Warning</property>
       </object>
     </child>
     <child>
@@ -3954,6 +3965,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Footnote&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|footnote">Footnote</property>
       </object>
     </child>
     <child>
@@ -3961,6 +3973,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Note&amp;amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|note">Note</property>
       </object>
     </child>
     <child>
@@ -6137,7 +6150,7 @@
                       <class name="context-Cell"/>
                       <class name="context-Default"/>
                       <class name="context-Empty"/>
-                      <class name="context-Any"/>
+                      <class name="context-EditCell"/>
                     </style>
                   </object>
                   <packing>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 3b8c02ef5bad..b55efcabde22 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -6704,7 +6704,7 @@
                       <class name="context-Cell"/>
                       <class name="context-Default"/>
                       <class name="context-Empty"/>
-                      <class name="context-Any"/>
+                      <class name="context-EditCell"/>
                     </style>
                   </object>
                   <packing>