[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 17 19:00:18 UTC 2018
sc/uiconfig/scalc/ui/notebookbar.ui | 50 ++++++------
sd/uiconfig/simpress/ui/notebookbar.ui | 137 ++++++++++++++++++---------------
sw/uiconfig/swriter/ui/notebookbar.ui | 34 ++++----
3 files changed, 118 insertions(+), 103 deletions(-)
New commits:
commit a9b36a9cb9e3d5d28f322070afdae2eb12e5ba23
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Mon Sep 17 00:56:30 2018 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Mon Sep 17 20:59:47 2018 +0200
NB sync draw shapes between apps
Change-Id: Ibb1e11eb438607d26ebd06e7fb160cf850915d5b
Reviewed-on: https://gerrit.libreoffice.org/60555
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 7f4df60cbd3e..5f331d60e864 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -4973,7 +4973,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -5022,7 +5022,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
@@ -5032,7 +5032,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="DrawSection">
+ <object class="sfxlo-OptionalBox" id="DrawTextSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -5047,10 +5047,10 @@
<property name="show_arrow">False</property>
<property name="icon_size">3</property>
<child>
- <object class="GtkToolButton" id="Insert-DrawText">
+ <object class="GtkToolButton" id="Insert-Text">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DrawText</property>
+ <property name="action_name">.uno:Text</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5145,10 +5145,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-BasicShapes.round-rectangle">
+ <object class="GtkToolButton" id="Insert-BasicShapes.ellipse">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.round-rectangle</property>
+ <property name="action_name">.uno:BasicShapes.ellipse</property>
</object>
<packing>
<property name="expand">True</property>
@@ -5156,10 +5156,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-BasicShapes.ellipse">
+ <object class="GtkToolButton" id="Insert-DrawCaption">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.ellipse</property>
+ <property name="action_name">.uno:DrawCaption</property>
</object>
<packing>
<property name="expand">True</property>
@@ -5203,11 +5203,11 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
@@ -5217,19 +5217,19 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="DrawSection1">
+ <object class="sfxlo-OptionalBox" id="DrawSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB82">
+ <object class="GtkBox" id="GroupB71">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="shapes13">
+ <object class="sfxlo-NotebookbarToolBox" id="shapes6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -5244,7 +5244,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-SymbolShapes">
+ <object class="GtkToolButton" id="Inser-SymbolShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SymbolShapes</property>
@@ -5255,7 +5255,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-ArrowShapes">
+ <object class="GtkToolButton" id="Inser-ArrowShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ArrowShapes</property>
@@ -5273,11 +5273,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="shapes14">
+ <object class="sfxlo-NotebookbarToolBox" id="shapes8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="Insert-StarShapes">
+ <object class="GtkToolButton" id="Inser-StarShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:StarShapes</property>
@@ -5288,7 +5288,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-CalloutShapes">
+ <object class="GtkToolButton" id="Inser-CalloutShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:CalloutShapes</property>
@@ -5320,7 +5320,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -5339,7 +5339,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-2"/>
</style>
</object>
<packing>
@@ -10289,10 +10289,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-BasicShapes.round-rectangle">
+ <object class="GtkToolButton" id="Draw-BasicShapes.ellipse">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.round-rectangle</property>
+ <property name="action_name">.uno:BasicShapes.ellipse</property>
</object>
<packing>
<property name="expand">True</property>
@@ -10300,10 +10300,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-BasicShapes.ellipse">
+ <object class="GtkToolButton" id="Draw-DrawCaption">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.ellipse</property>
+ <property name="action_name">.uno:DrawCaption</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 8d82412724c1..5ee200c9c856 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -5334,7 +5334,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="DrawSection">
+ <object class="sfxlo-OptionalBox" id="DrawTextSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -5447,10 +5447,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-BasicShapes.round-rectangle">
+ <object class="GtkToolButton" id="Insert-BasicShapes.ellipse">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.round-rectangle</property>
+ <property name="action_name">.uno:BasicShapes.ellipse</property>
</object>
<packing>
<property name="expand">True</property>
@@ -5458,10 +5458,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-BasicShapes.ellipse">
+ <object class="GtkToolButton" id="Insert-DrawCaption">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.ellipse</property>
+ <property name="action_name">.uno:DrawCaption</property>
</object>
<packing>
<property name="expand">True</property>
@@ -5505,7 +5505,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<style>
@@ -5519,19 +5519,19 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="DrawSection1">
+ <object class="sfxlo-OptionalBox" id="DrawSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB82">
+ <object class="GtkBox" id="GroupB64">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="shapes13">
+ <object class="sfxlo-NotebookbarToolBox" id="shapes6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -5546,7 +5546,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-SymbolShapes">
+ <object class="GtkToolButton" id="Inser-SymbolShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SymbolShapes</property>
@@ -5557,7 +5557,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-ArrowShapes">
+ <object class="GtkToolButton" id="Inser-ArrowShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ArrowShapes</property>
@@ -5568,10 +5568,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-FillShadow">
+ <object class="GtkToolButton" id="Insert-ConnectorToolbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FillShadow</property>
+ <property name="action_name">.uno:ConnectorToolbox</property>
</object>
<packing>
<property name="expand">True</property>
@@ -5586,11 +5586,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="shapes14">
+ <object class="sfxlo-NotebookbarToolBox" id="shapes8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="Insert-StarShapes">
+ <object class="GtkToolButton" id="Inser-StarShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:StarShapes</property>
@@ -5601,7 +5601,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-CalloutShapes">
+ <object class="GtkToolButton" id="Inser-CalloutShapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:CalloutShapes</property>
@@ -5623,7 +5623,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-Objects3DToolbox">
+ <object class="GtkToolButton" id="Inser-Objects3DToolbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Objects3DToolbox</property>
@@ -5644,11 +5644,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator95">
+ <object class="GtkSeparator" id="separator83">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -10611,26 +10611,28 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="EditGroup1">
+ <object class="sfxlo-OptionalBox" id="DrawTextSection1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="shapes9">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<property name="toolbar_style">both</property>
<property name="show_arrow">False</property>
<property name="icon_size">3</property>
<child>
- <object class="GtkToolButton" id="Draw-DrawText">
+ <object class="GtkToolButton" id="Insert-Text1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DrawText</property>
+ <property name="action_name">.uno:Text</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -10642,9 +10644,10 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box72">
+ <object class="GtkBox" id="GroupB65">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="shapes2">
@@ -10653,7 +10656,7 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Draw-Line">
+ <object class="GtkToolButton" id="Insert-Line1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Line</property>
@@ -10664,7 +10667,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-Polygon_Unfilled">
+ <object class="GtkToolButton" id="Insert-Polygon_Unfilled1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Polygon_Unfilled</property>
@@ -10675,7 +10678,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-Bezier_Unfilled">
+ <object class="GtkToolButton" id="Insert-Bezier_Unfilled1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Bezier_Unfilled</property>
@@ -10686,7 +10689,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-ArrowsToolbox">
+ <object class="GtkToolButton" id="Insert-ArrowsToolbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ArrowsToolbox</property>
@@ -10710,7 +10713,7 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Draw-BasicShapes.rectangle">
+ <object class="GtkToolButton" id="Insert-BasicShapes.rectangle1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:BasicShapes.rectangle</property>
@@ -10721,10 +10724,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-BasicShapes.round-rectangle">
+ <object class="GtkToolButton" id="Insert-BasicShapes.ellipse1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.round-rectangle</property>
+ <property name="action_name">.uno:BasicShapes.ellipse</property>
</object>
<packing>
<property name="expand">True</property>
@@ -10732,10 +10735,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-BasicShapes.ellipse">
+ <object class="GtkToolButton" id="Insert-DrawCaption1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.ellipse</property>
+ <property name="action_name">.uno:DrawCaption</property>
</object>
<packing>
<property name="expand">True</property>
@@ -10743,7 +10746,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-LineToolbox">
+ <object class="GtkToolButton" id="Insert-LineToolbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:LineToolbox</property>
@@ -10768,31 +10771,48 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator130">
+ <object class="GtkSeparator" id="separator70">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
+ <style>
+ <class name="priority-6"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="DrawSection1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="box73">
+ <object class="GtkBox" id="GroupB71">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="shapes5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Draw-BasicShapes">
+ <object class="GtkToolButton" id="Insert-BasicShapes1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:BasicShapes</property>
@@ -10803,7 +10823,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-SymbolShapes">
+ <object class="GtkToolButton" id="Inser-SymbolShapes1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SymbolShapes</property>
@@ -10814,7 +10834,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-ArrowShapes">
+ <object class="GtkToolButton" id="Inser-ArrowShapes1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ArrowShapes</property>
@@ -10825,10 +10845,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-FillShadow">
+ <object class="GtkToolButton" id="Insert-ConnectorToolbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FillShadow</property>
+ <property name="action_name">.uno:ConnectorToolbox</property>
</object>
<packing>
<property name="expand">True</property>
@@ -10846,10 +10866,8 @@
<object class="sfxlo-NotebookbarToolBox" id="shapes7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Draw-StarShapes">
+ <object class="GtkToolButton" id="Inser-StarShapes1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:StarShapes</property>
@@ -10860,7 +10878,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-CalloutShapes">
+ <object class="GtkToolButton" id="Inser-CalloutShapes1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:CalloutShapes</property>
@@ -10871,7 +10889,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-FlowChartShapes">
+ <object class="GtkToolButton" id="Insert-FlowChartShapes1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:FlowChartShapes</property>
@@ -10882,7 +10900,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-Objects3DToolbox">
+ <object class="GtkToolButton" id="Inser-Objects3DToolbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Objects3DToolbox</property>
@@ -10903,11 +10921,11 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator70">
+ <object class="GtkSeparator" id="separator84">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -10928,7 +10946,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -11117,7 +11135,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -11378,7 +11396,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -11501,7 +11519,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
@@ -11626,12 +11644,9 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index e9dcbdc1cd6d..b1f3684a3fe8 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -4931,7 +4931,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="DrawSection">
+ <object class="sfxlo-OptionalBox" id="DrawTextSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -4946,10 +4946,10 @@
<property name="show_arrow">False</property>
<property name="icon_size">3</property>
<child>
- <object class="GtkToolButton" id="Insert-DrawText">
+ <object class="GtkToolButton" id="Insert-Text">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DrawText</property>
+ <property name="action_name">.uno:Text</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5044,10 +5044,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-BasicShapes.round-rectangle">
+ <object class="GtkToolButton" id="Insert-BasicShapes.ellipse">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.round-rectangle</property>
+ <property name="action_name">.uno:BasicShapes.ellipse</property>
</object>
<packing>
<property name="expand">True</property>
@@ -5055,10 +5055,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Insert-BasicShapes.ellipse">
+ <object class="GtkToolButton" id="Insert-DrawCaption">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.ellipse</property>
+ <property name="action_name">.uno:DrawCaption</property>
</object>
<packing>
<property name="expand">True</property>
@@ -5102,7 +5102,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<style>
@@ -5116,19 +5116,19 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="DrawSection1">
+ <object class="sfxlo-OptionalBox" id="DrawSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB82">
+ <object class="GtkBox" id="GroupB75">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="shapes13">
+ <object class="sfxlo-NotebookbarToolBox" id="shapes6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -5172,7 +5172,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="shapes14">
+ <object class="sfxlo-NotebookbarToolBox" id="shapes8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -5219,7 +5219,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -11174,10 +11174,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-BasicShapes.round-rectangle">
+ <object class="GtkToolButton" id="Draw-BasicShapes.ellipse">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.round-rectangle</property>
+ <property name="action_name">.uno:BasicShapes.ellipse</property>
</object>
<packing>
<property name="expand">True</property>
@@ -11185,10 +11185,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Draw-BasicShapes.ellipse">
+ <object class="GtkToolButton" id="Draw-DrawCaption">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicShapes.ellipse</property>
+ <property name="action_name">.uno:DrawCaption</property>
</object>
<packing>
<property name="expand">True</property>
More information about the Libreoffice-commits
mailing list