icon-themes/colibre_svg/sfx2/res/chevron.svg | 6
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 892 ++++++++++-----
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 2
sw/uiconfig/swriter/ui/notebookbar_single.ui | 228 +++
4 files changed, 804 insertions(+), 324 deletions(-)
New commits:
commit b2ea5031386d773f797b3f8cf8035ba5680db813
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Fri May 10 01:27:49 2019 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Fri May 10 07:17:31 2019 +0200
NB writer: update the different UI files for better sync
Change-Id: Ie4a5401e9f20e4fd5fe8a30ba21faffc2aa69010
Reviewed-on: https://gerrit.libreoffice.org/72085
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/icon-themes/colibre_svg/sfx2/res/chevron.svg
b/icon-themes/colibre_svg/sfx2/res/chevron.svg
new file mode 100644
index 000000000000..5aeb08b4550c
--- /dev/null
+++ b/icon-themes/colibre_svg/sfx2/res/chevron.svg
@@ -0,0 +1,6 @@
+<svg viewBox="0 0 14 16" xmlns="http://www.w3.org/2000/svg";>
+ <path
+ style="fill:#5f5f5f"
+ d="M 1.3 3 L 1. 3.3 L 1. 4 L 5 8 L 1. 12 L 1 12.71 L 1.3 13 L 2. 13 L
6.855 8.336 C 7.05 8.14 7.05 7.8 6.85 7.63 L 2. 3 L 1.3 3 z M 7.3 3 L 7. 3.3 L
7. 4 L 11.001953 8 L 7. 12 L 7 12.71 L 7.3 13 L 8. 13 L 12.856 8.336 C 13.05
8.14 13.05 7.8 12.85 7.63 L 8. 3 L 7.3 3 z "
+ />
+</svg>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index aa04d899a528..d8c8d2fa2dc9 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -3218,7 +3218,7 @@
</packing>
</child>
<style>
- <class name="priority-14"/>
+ <class name="priority-18"/>
</style>
</object>
<packing>
@@ -3278,7 +3278,7 @@
</packing>
</child>
<style>
- <class name="priority-13"/>
+ <class name="priority-17"/>
</style>
</object>
<packing>
@@ -3433,7 +3433,7 @@
</packing>
</child>
<style>
- <class name="priority-12"/>
+ <class name="priority-16"/>
</style>
</object>
<packing>
@@ -3457,10 +3457,10 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkMenuToolButton"
id="Home-BackColor">
+ <object class="GtkMenuToolButton"
id="Home-fontcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:Color</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3468,10 +3468,10 @@
</packing>
</child>
<child>
- <object class="GtkMenuToolButton"
id="Home-fontcolor">
+ <object class="GtkMenuToolButton"
id="Home-BackColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:Color</property>
+ <property
name="action_name">.uno:BackColor</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3485,21 +3485,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator10">
- <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">1</property>
- </packing>
- </child>
<style>
<class name="priority-15"/>
</style>
@@ -3511,63 +3496,22 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="JustifySection">
+ <object class="sfxlo-OptionalBox"
id="Section-FontDialog">
<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="SectionBottom13">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
+ <property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Home-LeftPara">
- <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:LeftPara</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Home-CenterPara">
- <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:CenterPara</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Home-RightPara">
- <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:RightPara</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Home-JustifyPara">
+ <object class="GtkToolButton"
id="Default-FontDialog">
<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:JustifyPara</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:FontDialog</property>
+ <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3582,7 +3526,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator148">
+ <object class="GtkSeparator" id="separator10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -3597,7 +3541,7 @@
</packing>
</child>
<style>
- <class name="priority-11"/>
+ <class name="priority-14"/>
</style>
</object>
<packing>
@@ -3659,7 +3603,7 @@
</packing>
</child>
<style>
- <class name="priority-16"/>
+ <class name="priority-13"/>
</style>
</object>
<packing>
@@ -3729,7 +3673,7 @@
</packing>
</child>
<style>
- <class name="priority-10"/>
+ <class name="priority-12"/>
</style>
</object>
<packing>
@@ -3739,22 +3683,63 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="SpacingSection">
+ <object class="sfxlo-OptionalBox" id="JustifySection">
<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="SectionBottom70">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom13">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Home-BackgroundColor">
+ <object class="GtkToolButton" id="Home-LeftPara">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property
name="action_name">.uno:LeftPara</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Home-CenterPara">
+ <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:CenterPara</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Home-RightPara">
+ <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:RightPara</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Home-JustifyPara">
+ <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:JustifyPara</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3768,8 +3753,23 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkSeparator" id="separator148">
+ <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">1</property>
+ </packing>
+ </child>
<style>
- <class name="priority-9"/>
+ <class name="priority-11"/>
</style>
</object>
<packing>
@@ -3791,6 +3791,57 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<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">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Home-ParaspaceDecrease">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ParaspaceDecrease</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-10"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="SpacingSection2">
+ <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="SectionBottom70">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
<object class="GtkMenuToolButton"
id="Home-LineSpacing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3803,25 +3854,54 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Home-ParaspaceIncrease">
+ <object class="GtkToolButton"
id="Home-BackgroundColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ParaspaceIncrease</property>
+ <property
name="action_name">.uno:BackgroundColor</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-9"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">11</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="Default-Section-ParagraphDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Home-ParaspaceDecrease">
+ <object class="GtkToolButton"
id="Default-ParagraphDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ParaspaceDecrease</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:ParagraphDialog</property>
+ <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -3853,7 +3933,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -3892,7 +3972,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -3962,7 +4042,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -4018,7 +4098,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">15</property>
</packing>
</child>
<child>
@@ -4073,7 +4153,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">16</property>
</packing>
</child>
<child>
@@ -4143,7 +4223,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">17</property>
</packing>
</child>
<child>
@@ -4211,7 +4291,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">18</property>
</packing>
</child>
<child>
@@ -4263,7 +4343,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">17</property>
+ <property name="position">19</property>
</packing>
</child>
<child>
@@ -4331,9 +4411,12 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">18</property>
+ <property name="position">20</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -7801,8 +7884,21 @@
<property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="MergeSection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator175">
+ <object class="GtkSeparator" id="separator51">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -7813,33 +7909,97 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom41">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Table-MergeCells">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:MergeCells</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Table-SplitCell">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:SplitCell</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Table-SplitTable">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:SplitTable</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-14"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="ColorSectionT">
+ <object class="sfxlo-OptionalBox" id="ColumnSection">
<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="SectionBottom39">
+ <object class="GtkSeparator" id="separator53">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom38">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkMenuToolButton"
id="Table-SetBorderStyle">
+ <object class="GtkToolButton"
id="Table-InsertColumnsBefore">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:SetBorderStyle</property>
+ <property
name="action_name">.uno:InsertColumnsBefore</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7847,10 +8007,10 @@
</packing>
</child>
<child>
- <object class="GtkMenuToolButton"
id="Table-FrameLineColor">
+ <object class="GtkToolButton"
id="Table-InsertColumnsAfter">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:FrameLineColor</property>
+ <property
name="action_name">.uno:InsertColumnsAfter</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7858,10 +8018,10 @@
</packing>
</child>
<child>
- <object class="GtkMenuToolButton"
id="Table-BackgroundColor">
+ <object class="GtkToolButton"
id="Table-DeleteColumns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
+ <property
name="action_name">.uno:DeleteColumns</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7872,11 +8032,27 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-13"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="RowSection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator45">
+ <object class="GtkSeparator" id="separator56">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -7887,36 +8063,137 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom40">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Table-InsertRowsBefore">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:InsertRowsBefore</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Table-InsertRowsAfter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:InsertRowsAfter</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Table-DeleteRows">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:DeleteRows</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-12"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="MergeSection">
+ <object class="sfxlo-OptionalBox" id="SelectSection">
<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="SectionBottom41">
+ <object class="GtkSeparator" id="separator175">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom42">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Table-MergeCells">
+ <object class="GtkToolButton"
id="Table-EntireCell">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:MergeCells</property>
+ <property
name="action_name">.uno:EntireCell</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-11"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="SelectSection1">
+ <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="SectionBottom35">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Table-EntireColumn">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:EntireColumn</property>
</object>
<packing>
<property name="expand">True</property>
@@ -7924,24 +8201,24 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Table-SplitCell">
+ <object class="GtkToolButton"
id="Table-EntireRow">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:SplitCell</property>
+ <property
name="action_name">.uno:EntireRow</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Table-SplitTable">
+ <object class="GtkToolButton"
id="Table-SelectTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:SplitTable</property>
+ <property
name="action_name">.uno:SelectTable</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -7949,11 +8226,26 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-10"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="Table-Section-Area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
<child>
- <object class="GtkSeparator" id="separator51">
+ <object class="GtkSeparator" id="separator25">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -7964,58 +8256,98 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom79">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">text</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Table-FormatArea2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FormatArea</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="ColumnSection">
+ <object class="sfxlo-OptionalBox"
id="Table-Section-Area2">
<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="SectionBottom38">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom140">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
+ <property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Table-InsertColumnsBefore">
+ <object class="GtkToolButton"
id="Table-BackgroundColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertColumnsBefore</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Table-InsertColumnsAfter">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertColumnsAfter</property>
+ <property
name="action_name">.uno:BackgroundColor</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-8"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="Table-Section-AreaDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="Object1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Table-DeleteColumns">
+ <object class="GtkToolButton"
id="Table-FormatArea">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:DeleteColumns</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:FormatArea</property>
+ <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8029,59 +8361,70 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator53">
- <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>
- </packing>
- </child>
<style>
- <class name="priority-5"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="RowSection">
+ <object class="sfxlo-OptionalBox"
id="Table-Section-Border1">
<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="SectionBottom40">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">text</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Table-InsertRowsBefore">
+ <object class="GtkToolButton"
id="Table-BorderDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertRowsBefore</property>
+ <property
name="action_name">.uno:BorderDialog</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-6"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="Table-Section-Border2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Table-InsertRowsAfter">
+ <object class="GtkToolButton"
id="Table-FrameLineColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertRowsAfter</property>
+ <property
name="action_name">.uno:FrameLineColor</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8089,10 +8432,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Table-DeleteRows">
+ <object class="GtkToolButton"
id="Table-LineStyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:DeleteRows</property>
+ <property
name="action_name">.uno:LineStyle</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8103,51 +8446,34 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator56">
- <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">1</property>
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">10</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="SelectSection">
+ <object class="sfxlo-OptionalBox"
id="Table-Section-Border3">
<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="SectionBottom42">
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtBottom9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="toolbar_style">both-horiz</property>
+ <property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Table-EntireCell">
+ <object class="GtkMenuToolButton"
id="Table-SetBorderStyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:EntireCell</property>
+ <property
name="action_name">.uno:SetBorderStyle</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8158,61 +8484,39 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="SelectSection1">
+ <object class="sfxlo-OptionalBox"
id="Table-Section-BorderDialog">
<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="SectionBottom35">
+ <object class="sfxlo-NotebookbarToolBox"
id="Object2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
+ <property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Table-EntireColumn">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:EntireColumn</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Table-EntireRow">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:EntireRow</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Table-SelectTable">
+ <object class="GtkToolButton"
id="TableBorderDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:SelectTable</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:BorderDialog</property>
+ <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -8223,21 +8527,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator57">
- <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>
- </packing>
- </child>
<style>
<class name="priority-3"/>
</style>
@@ -8245,7 +8534,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -8255,6 +8544,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator59">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom43">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8297,22 +8601,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator59">
- <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">1</property>
</packing>
</child>
<style>
@@ -8322,7 +8611,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -8332,6 +8621,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator171">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom44">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8385,22 +8689,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator171">
- <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">1</property>
</packing>
</child>
<style>
@@ -8410,7 +8699,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">15</property>
</packing>
</child>
</object>
@@ -10578,6 +10867,43 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox"
id="Draw-Section-TransformDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="Draw3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-TransformDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:TransformDialog</property>
+ <property
name="icon_name">sfx2/res/symphony/open_more.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">21</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-OptionalBox" id="Draw-Section-3d">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -10671,7 +10997,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">21</property>
+ <property name="position">22</property>
</packing>
</child>
<child>
@@ -10768,7 +11094,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">22</property>
+ <property name="position">23</property>
</packing>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 9c014eba2c99..d61e090766ec 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -5680,7 +5680,7 @@
<object class="GtkToolButton"
id="Table-BorderDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:Line</property>
+ <property
name="action_name">.uno:BorderDialog</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui
b/sw/uiconfig/swriter/ui/notebookbar_single.ui
index 59784b4a8518..6f76438bd858 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_single.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui
@@ -205,7 +205,7 @@
</packing>
</child>
<style>
- <class name="priority-15"/>
+ <class name="priority-16"/>
</style>
</object>
<packing>
@@ -244,7 +244,7 @@
</packing>
</child>
<style>
- <class name="priority-14"/>
+ <class name="priority-15"/>
</style>
</object>
<packing>
@@ -262,6 +262,7 @@
<object class="sfxlo-NotebookbarToolBox"
id="ExtTop3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_right">5</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Default-Grow">
@@ -292,7 +293,7 @@
</packing>
</child>
<style>
- <class name="priority-13"/>
+ <class name="priority-14"/>
</style>
</object>
<packing>
@@ -363,7 +364,7 @@
</packing>
</child>
<style>
- <class name="priority-12"/>
+ <class name="priority-13"/>
</style>
</object>
<packing>
@@ -373,6 +374,55 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox"
id="Default-Section-SubSuperScript">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">5</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Default-SubScript">
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:SubScript</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Default-SuperScript">
+ <property name="can_focus">False</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:SuperScript</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-12"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-OptionalBox"
id="Default-Section-FontColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -419,7 +469,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -459,7 +509,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -533,7 +583,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
@@ -582,7 +632,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">9</property>
+ <property name="position">10</property>
</packing>
</child>
<child>
@@ -668,7 +718,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
@@ -718,7 +768,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -758,7 +808,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -844,7 +894,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -930,7 +980,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">15</property>
</packing>
</child>
<child>
@@ -1004,7 +1054,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">16</property>
</packing>
</child>
<child>
@@ -1079,7 +1129,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">17</property>
</packing>
</child>
<style>
@@ -1226,7 +1276,7 @@
</packing>
</child>
<style>
- <class name="priority-21"/>
+ <class name="priority-22"/>
</style>
</object>
<packing>
@@ -1265,7 +1315,7 @@
</packing>
</child>
<style>
- <class name="priority-20"/>
+ <class name="priority-21"/>
</style>
</object>
<packing>
@@ -1283,6 +1333,7 @@
<object class="sfxlo-NotebookbarToolBox"
id="ExtTop6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_right">5</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Table-Grow1">
@@ -1313,7 +1364,7 @@
</packing>
</child>
<style>
- <class name="priority-19"/>
+ <class name="priority-20"/>
</style>
</object>
<packing>
@@ -1384,7 +1435,7 @@
</packing>
</child>
<style>
- <class name="priority-18"/>
+ <class name="priority-19"/>
</style>
</object>
<packing>
@@ -1394,6 +1445,55 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox"
id="Table-Section-SubSuperScript">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="ExtTop11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">5</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Table-SubScript">
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:SubScript</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Table-SuperScript">
+ <property name="can_focus">False</property>
+ <property
name="visible_horizontal">False</property>
+ <property
name="action_name">.uno:SuperScript</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-18"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-OptionalBox"
id="Table-Section-FontColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1440,7 +1540,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -1480,7 +1580,7 @@
<packing>
<property name="expand">False</property>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
