[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/uiconfig

andreas kainz Tue, 10 Jul 2018 01:05:53 -0700

 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui |   34 ++++++++---------
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui    |   26 ++++++-------
 2 files changed, 30 insertions(+), 30 deletions(-)


New commits:
commit e55d4bb35a6bf0d9a7bfce362bf83628b5d55655
Author: andreas kainz <kain...@gmail.com>
Date:   Mon Jul 9 22:35:06 2018 +0200

    tdf#118645 NB grouped calc: styles drop down menu will work now
    
    Change-Id: Ie5838d4b36dc95ff234724ec924b78740a15b664
    Reviewed-on: https://gerrit.libreoffice.org/57212
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 63298f0ef976..a306eed99d21 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -2973,7 +2973,7 @@
       <object class="GtkMenuItem" id="defaultD">
         <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="action_name">.uno:StyleApply?Style:string=Default&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|defaultD">Default</property>
       </object>
     </child>
@@ -2987,7 +2987,7 @@
       <object class="GtkMenuItem" id="Accent1">
         <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="action_name">.uno:StyleApply?Style:string=Accent 
1&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|Accent1">Accent 1</property>
       </object>
     </child>
@@ -2995,7 +2995,7 @@
       <object class="GtkMenuItem" id="Accent2">
         <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="action_name">.uno:StyleApply?Style:string=Accent 
2&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|Accent2">Accent 2</property>
       </object>
     </child>
@@ -3003,7 +3003,7 @@
       <object class="GtkMenuItem" id="Accent3">
         <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="action_name">.uno:StyleApply?Style:string=Accent 
3&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|Accent3">Accent 3</property>
       </object>
     </child>
@@ -3017,7 +3017,7 @@
       <object class="GtkMenuItem" id="Header1">
         <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="action_name">.uno:StyleApply?Style:string=Heading 
1&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|Header1">Header 1</property>
       </object>
     </child>
@@ -3025,7 +3025,7 @@
       <object class="GtkMenuItem" id="Header2">
         <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="action_name">.uno:StyleApply?Style:string=Heading 
2&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|Header2">Header 2</property>
       </object>
     </child>
@@ -3036,26 +3036,26 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="bad">
+      <object class="GtkMenuItem" id="good">
         <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_compact|bad">Bad</property>
+        <property 
name="action_name">.uno:StyleApply?Style:string=Good&amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|good">Good</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="good">
+      <object class="GtkMenuItem" id="bad">
         <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_compact|good">Good</property>
+        <property 
name="action_name">.uno:StyleApply?Style:string=Bad&amp;FamilyName:string=CellStyles</property>
+        <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|bad">Bad</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="neutral">
         <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="action_name">.uno:StyleApply?Style:string=Neutral&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|neutral">Neutral</property>
       </object>
     </child>
@@ -3063,7 +3063,7 @@
       <object class="GtkMenuItem" id="error">
         <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="action_name">.uno:StyleApply?Style:string=Error&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|error">Error</property>
       </object>
     </child>
@@ -3071,7 +3071,7 @@
       <object class="GtkMenuItem" id="warning">
         <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="action_name">.uno:StyleApply?Style:string=Warning&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|warning">Warning</property>
       </object>
     </child>
@@ -3085,7 +3085,7 @@
       <object class="GtkMenuItem" id="footnote">
         <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="action_name">.uno:StyleApply?Style:string=Footnote&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|footnote">Footnote</property>
       </object>
     </child>
@@ -3093,7 +3093,7 @@
       <object class="GtkMenuItem" id="note">
         <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="action_name">.uno:StyleApply?Style:string=Note&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_compact|note">Note</property>
       </object>
     </child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index dee6edd53cf7..8499083016d0 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -2973,7 +2973,7 @@
       <object class="GtkMenuItem" id="defaultD">
         <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="action_name">.uno:StyleApply?Style:string=Default&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|defaultD">Default</property>
       </object>
     </child>
@@ -2987,7 +2987,7 @@
       <object class="GtkMenuItem" id="Accent1">
         <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="action_name">.uno:StyleApply?Style:string=Accent 
1&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|Accent1">Accent 1</property>
       </object>
     </child>
@@ -2995,7 +2995,7 @@
       <object class="GtkMenuItem" id="Accent2">
         <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="action_name">.uno:StyleApply?Style:string=Accent 
2&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|Accent2">Accent 2</property>
       </object>
     </child>
@@ -3003,7 +3003,7 @@
       <object class="GtkMenuItem" id="Accent3">
         <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="action_name">.uno:StyleApply?Style:string=Accent 
3&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|Accent3">Accent 3</property>
       </object>
     </child>
@@ -3017,7 +3017,7 @@
       <object class="GtkMenuItem" id="Header1">
         <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="action_name">.uno:StyleApply?Style:string=Heading 
1&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|Header1">Header 1</property>
       </object>
     </child>
@@ -3025,7 +3025,7 @@
       <object class="GtkMenuItem" id="Header2">
         <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="action_name">.uno:StyleApply?Style:string=Heading 
2&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|Header2">Header 2</property>
       </object>
     </child>
@@ -3039,7 +3039,7 @@
       <object class="GtkMenuItem" id="bad">
         <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="action_name">.uno:StyleApply?Style:string=Bad&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|bad">Bad</property>
       </object>
     </child>
@@ -3047,7 +3047,7 @@
       <object class="GtkMenuItem" id="good">
         <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="action_name">.uno:StyleApply?Style:string=Good&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|good">Good</property>
       </object>
     </child>
@@ -3055,7 +3055,7 @@
       <object class="GtkMenuItem" id="neutral">
         <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="action_name">.uno:StyleApply?Style:string=Neutral&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|neutral">Neutral</property>
       </object>
     </child>
@@ -3063,7 +3063,7 @@
       <object class="GtkMenuItem" id="error">
         <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="action_name">.uno:StyleApply?Style:string=Error&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|error">Error</property>
       </object>
     </child>
@@ -3071,7 +3071,7 @@
       <object class="GtkMenuItem" id="warning">
         <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="action_name">.uno:StyleApply?Style:string=Warning&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|warning">Warning</property>
       </object>
     </child>
@@ -3085,7 +3085,7 @@
       <object class="GtkMenuItem" id="footnote">
         <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="action_name">.uno:StyleApply?Style:string=Footnote&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|footnote">Footnote</property>
       </object>
     </child>
@@ -3093,7 +3093,7 @@
       <object class="GtkMenuItem" id="note">
         <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="action_name">.uno:StyleApply?Style:string=Note&amp;FamilyName:string=CellStyles</property>
         <property name="label" translatable="yes" 
context="notebookbar_groupedbar_full|note">Note</property>
       </object>
     </child>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/uiconfig

Reply via email to