[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/uiconfig sd/uiconfig sw/uiconfig
andreas kainz
kainz.a at gmail.com
Thu Jul 12 15:08:04 UTC 2018
sc/uiconfig/scalc/ui/notebookbar.ui | 4 ++--
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 4 ++--
sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 2 +-
sd/uiconfig/simpress/ui/notebookbar.ui | 4 ++--
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 4 ++--
sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 8 ++++----
sw/uiconfig/swriter/ui/notebookbar.ui | 6 +++---
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 2 +-
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 8 ++++----
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 4 ++--
10 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 2cfe74f35fbe7119cbff309d569da45899f962df
Author: andreas kainz <kainz.a at gmail.com>
Date: Wed Jul 11 18:18:29 2018 +0200
NB Implementation: fix Underline command and add CharmapControl
The new CharmapControl action will be used instead of InsertSymbol
Change-Id: I9a2e519fb7b8b773763b4c58f8aaa40e6af810b6
Reviewed-on: https://gerrit.libreoffice.org/57283
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit 3ffd06f141f86a695deb8672a34b95f31f4d1b16)
Reviewed-on: https://gerrit.libreoffice.org/57289
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index b6c40b6e3ea8..7f4df60cbd3e 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -3101,7 +3101,7 @@
<object class="GtkToolButton" id="Home-Underline">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5367,7 +5367,7 @@
<object class="GtkToolButton" id="Insert-InsertSymbol">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertSymbol</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index a306eed99d21..81ad615d5860 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -4291,7 +4291,7 @@
<object class="GtkToolButton" id="Underline">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8519,7 +8519,7 @@
<object class="GtkToolButton" id="Underline1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 8499083016d0..a7221299bf7f 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -10492,7 +10492,7 @@
<object class="GtkToolButton" id="InsertSymbole1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertSymbol</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index cee0e4868eb0..a1e2f1a0f781 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -3757,7 +3757,7 @@
<object class="GtkToolButton" id="Home-Underline">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5691,7 +5691,7 @@
<object class="GtkToolButton" id="Insert-InsertSymbol">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertSymbol</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 266946ef4ab6..786da0641c0e 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -4315,7 +4315,7 @@
<object class="GtkToolButton" id="Underline1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5341,7 +5341,7 @@
<object class="GtkToolButton" id="Underline2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index c4b2216db9d5..bbda636be14f 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
@@ -5140,7 +5140,7 @@
<object class="GtkToolButton" id="Underline2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5728,7 +5728,7 @@
<object class="GtkToolButton" id="InsertSymbole1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertSymbol</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">True</property>
@@ -6422,7 +6422,7 @@
<object class="GtkToolButton" id="Underline1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11804,7 +11804,7 @@
<object class="GtkToolButton" id="InsertSymbole3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertSymbol</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index a2a609ef8bf5..e9dcbdc1cd6d 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -3255,7 +3255,7 @@
<object class="GtkToolButton" id="Home-UnderlineSimple">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4177,7 +4177,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="action_name">.uno:InsertSymbol</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5324,7 +5324,7 @@
<object class="GtkToolButton" id="InsertGraphic">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertSymbol</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 3c2bb16b9efb..c8cfdbed2e98 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -3263,7 +3263,7 @@
<object class="GtkToolButton" id="Home-Underline">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index edecf7e0e297..4835169624e6 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -4024,7 +4024,7 @@
<object class="GtkToolButton" id="Underline">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4366,7 +4366,7 @@
<object class="GtkToolButton" id="InsertSymbo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertSymbol</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8737,7 +8737,7 @@
<object class="GtkToolButton" id="Underline2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
@@ -9445,7 +9445,7 @@
<object class="GtkToolButton" id="Underline1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:UnderlineSimple</property>
+ <property name="action_name">.uno:Underline</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index ae83daf8e5d2..28180fc77101 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -4801,7 +4801,7 @@
<object class="GtkToolButton" id="InsertSymbole">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertSymbol</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">False</property>
@@ -12174,7 +12174,7 @@
<object class="GtkToolButton" id="InsertSymbole1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertSymbol</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">True</property>
More information about the Libreoffice-commits
mailing list