[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 11 10:39:17 UTC 2018
sw/uiconfig/swriter/ui/notebookbar.ui | 57 ++++++---------
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 4 -
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 4 -
3 files changed, 27 insertions(+), 38 deletions(-)
New commits:
commit 9cb7512cb7745e03c402dfaeba470465af931135
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Tue Dec 11 00:37:18 2018 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Tue Dec 11 11:39:04 2018 +0100
tdf#119737 Wrong item Formula in drop-down menu Insert groupedbar
Change-Id: Icd21e9fe0782d7b48e1167c6facaa1a1aa02cbc9
Reviewed-on: https://gerrit.libreoffice.org/64909
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit 11e6b7832465e37b3dc6f14f175e870b25ee4d19)
Reviewed-on: https://gerrit.libreoffice.org/64921
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index c65f0ac482c4..6b5382adf408 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -1505,10 +1505,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuInsert-InsertFormula">
+ <object class="GtkMenuItem" id="MenuInsert-InsertObjectStarMath">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertFormula</property>
+ <property name="action_name">.uno:InsertObjectStarMath</property>
</object>
</child>
<child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 7b33cf1ae963..2183de523a9a 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -1598,10 +1598,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuInsert-InsertFormula">
+ <object class="GtkMenuItem" id="MenuInsert-InsertObjectStarMath">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertFormula</property>
+ <property name="action_name">.uno:InsertObjectStarMath</property>
</object>
</child>
<child>
commit d5af02f64ea6582f5062d41b898b488c9264d493
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Tue Dec 11 00:28:43 2018 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Tue Dec 11 11:38:54 2018 +0100
tdf#121898 add toggle numbered list command in home tab of writer
Change-Id: Ia01c7adcd5e484982cc1131d513f9b1bab9ea0c9
Reviewed-on: https://gerrit.libreoffice.org/64907
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit d11dcb1b5810585b90cd6a678e081652b31e3bac)
Reviewed-on: https://gerrit.libreoffice.org/64920
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 847a01b4fa65..fb64b7fbe871 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -3362,23 +3362,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Home-SetOutline">
+ <object class="GtkToolButton" id="Home-DefaultNumbering">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SetOutline</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Home-IncrementIndent">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="action_name">.uno:IncrementIndent</property>
+ <property name="action_name">.uno:DefaultNumbering</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3386,12 +3373,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Home-DecrementIndent">
+ <object class="GtkToolButton" id="Home-SetOutline">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="action_name">.uno:DecrementIndent</property>
+ <property name="action_name">.uno:SetOutline</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3427,12 +3412,25 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Home-BackgroundColor">
+ <object class="GtkToolButton" id="Home-IncrementIndent">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
- <property name="action_name">.uno:BackgroundColor</property>
+ <property name="action_name">.uno:IncrementIndent</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Home-DecrementIndent">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="action_name">.uno:DecrementIndent</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3592,21 +3590,12 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Home-ParaspaceIncrease">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ParaspaceIncrease</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Home-ParaspaceDecrease">
+ <object class="GtkToolButton" id="Home-BackgroundColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ParaspaceDecrease</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="action_name">.uno:BackgroundColor</property>
</object>
<packing>
<property name="expand">False</property>
More information about the Libreoffice-commits
mailing list