summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreas kainz <kainz.a@gmail.com>2019-05-29 19:07:31 +0200
committerandreas_kainz <kainz.a@gmail.com>2019-05-29 22:51:01 +0200
commit2574ce0f2dc711e71b4799bbd76d5d8b6ec04300 (patch)
treeda2216ccda87bbe550b9671d439fe0d446a29a69
parent4f0f09f9229635aaa7b51ce45222721f035e990d (diff)
NB tabbed layout update in all apps
Change-Id: I3fe17af05869fe7eb540b85b24742cf0045d7569 Reviewed-on: https://gerrit.libreoffice.org/73185 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar.ui765
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar.ui905
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar.ui1120
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar.ui158
4 files changed, 1971 insertions, 977 deletions
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 9dde161a3c72..9ccc963b09ec 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -8296,6 +8296,19 @@
<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="Review-Section-Language1">
+ <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="GroupB40">
<property name="visible">True</property>
@@ -8306,7 +8319,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA19">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -8330,7 +8343,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB20">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -8358,8 +8371,24 @@
<property name="position">2</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="Review-Section-Annotation">
+ <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="separator99">
+ <object class="GtkSeparator" id="separator109">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -8370,22 +8399,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</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="Review-Section-Annotation">
- <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="SectionBottom69">
<property name="visible">True</property>
@@ -8421,9 +8437,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Review-Section-Annotation1">
+ <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="GroupB32">
<property name="visible">True</property>
@@ -8434,7 +8463,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8460,7 +8489,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8487,29 +8516,45 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-5"/>
+ </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="Review-Section-Annotation2">
+ <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="GroupB41">
+ <object class="GtkBox" id="GroupB43">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="belowspacing7">
+ <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin17">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Review-DeleteNote">
+ <object class="GtkToolButton" id="Review-DeleteAllNotes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DeleteNote</property>
+ <property name="action_name">.uno:DeleteAllNotes</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8524,18 +8569,18 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin7">
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing15">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Review-DeleteAllNotes">
+ <object class="GtkToolButton" id="Review-DeleteNote">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DeleteAllNotes</property>
+ <property name="action_name">.uno:DeleteNote</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8553,21 +8598,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator109">
- <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">3</property>
</packing>
</child>
@@ -8578,7 +8608,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -8588,6 +8618,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator112">
+ <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="SectionBottom72">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8607,6 +8652,35 @@
<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>
+ </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="Review-Section-TrackChanges1">
+ <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="SectionBottom88">
+ <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="Review-AcceptChanges">
<property name="visible">True</property>
@@ -8622,11 +8696,24 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </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="Review-Section-Document">
+ <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="separator112">
+ <object class="GtkSeparator" id="separator5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -8637,25 +8724,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">4</property>
+ <property name="position">0</property>
</packing>
</child>
- <style>
- <class name="priority-3"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox" id="Review-Section-Document">
- <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="SectionBottom82">
<property name="visible">True</property>
@@ -8680,9 +8751,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </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="Review-Section-Document1">
+ <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="GroupB38">
<property name="visible">True</property>
@@ -8693,7 +8777,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA16">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -8717,7 +8801,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB18">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -8742,20 +8826,36 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-3"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Review-Section-Document2">
+ <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="GroupB43">
+ <object class="GtkBox" id="GroupB86">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LineA21">
+ <object class="sfxlo-NotebookbarToolBox" id="LineA23">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -8777,9 +8877,9 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LineB22">
+ <object class="sfxlo-NotebookbarToolBox" id="LineB24">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -8804,21 +8904,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator5">
- <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">3</property>
</packing>
</child>
@@ -8829,7 +8914,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
@@ -8839,6 +8924,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator52">
+ <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="SectionBottom94">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -8872,7 +8972,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">10</property>
</packing>
</child>
</object>
@@ -15052,6 +15152,19 @@
<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="Tools-Section-Macro1">
+ <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="GroupB42">
<property name="visible">True</property>
@@ -15062,7 +15175,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA25">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -15086,7 +15199,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB26">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -15114,8 +15227,24 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-9"/>
+ </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="Tools-Section-Trace">
+ <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="separator63">
+ <object class="GtkSeparator" id="separator66">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -15126,22 +15255,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</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="Tools-Section-Formular">
- <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="SectionBottom57">
<property name="visible">True</property>
@@ -15166,9 +15282,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Trace1">
+ <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="GroupB44">
<property name="visible">True</property>
@@ -15179,7 +15308,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA14">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -15203,7 +15332,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB13">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -15228,9 +15357,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ </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="Tools-Section-Trace2">
+ <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="GroupB58">
<property name="visible">True</property>
@@ -15241,7 +15383,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA15">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -15265,7 +15407,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB16">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -15290,11 +15432,27 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
+ <style>
+ <class name="priority-8"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Formular1">
+ <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="separator66">
+ <object class="GtkSeparator" id="separator69">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -15305,22 +15463,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
- </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="Tools-Section-Formular2">
- <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="SectionBottom60">
<property name="visible">True</property>
@@ -15345,13 +15490,26 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </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="Tools-Section-Formular2">
+ <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="SectionBottom84">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -15372,9 +15530,25 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-7"/>
+ </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="Tools-Section-Formular3">
+ <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="GroupB62">
<property name="visible">True</property>
@@ -15385,7 +15559,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA18">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -15409,7 +15583,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB17">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -15434,32 +15608,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator69">
- <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">3</property>
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -15469,9 +15628,24 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61">
+ <object class="GtkSeparator" id="separator141">
<property name="visible">True</property>
- <property name="can_focus">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="SectionBottom96">
+ <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>
@@ -15492,26 +15666,39 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form1">
+ <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="GroupB63">
+ <object class="GtkBox" id="GroupB41">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin13">
+ <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin7">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-UseWizards">
+ <object class="GtkToolButton" id="Tools-UseWizards1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:UseWizards</property>
@@ -15529,15 +15716,15 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="belowspacing14">
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing7">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-GroupBox">
+ <object class="GtkToolButton" id="Tools-GroupBox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:GroupBox</property>
@@ -15558,51 +15745,51 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <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">3</property>
+ <property name="position">2</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">3</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Tools-Section-Form1">
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form2">
<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="GroupB64">
+ <object class="GtkSeparator" id="separator142">
+ <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="GtkBox" id="GroupB88">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom99">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -15638,8 +15825,21 @@
<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>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61">
+ <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="Tools-RadioButton">
+ <object class="GtkToolButton" id="Tools-RadioButton1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:RadioButton</property>
@@ -15650,7 +15850,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-ListBox">
+ <object class="GtkToolButton" id="Tools-ListBox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ListBox</property>
@@ -15661,7 +15861,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-ComboBox">
+ <object class="GtkToolButton" id="Tools-ComboBox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ComboBox</property>
@@ -15675,20 +15875,65 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</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-4"/>
+ </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="Tools-Section-Form3">
+ <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="separator54">
+ <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="GtkBox" id="GroupB63">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63">
<property name="visible">True</property>
- <property name="can_focus">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="Tools-FormattedField">
+ <object class="GtkToolButton" id="Tools-NumericField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FormattedField</property>
+ <property name="action_name">.uno:NumericField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -15696,10 +15941,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-DateField">
+ <object class="GtkToolButton" id="Tools-CurrencyField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DateField</property>
+ <property name="action_name">.uno:CurrencyField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -15707,21 +15952,34 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-TimeField">
+ <object class="GtkToolButton" id="Tools-PatternField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:TimeField</property>
+ <property name="action_name">.uno:PatternField</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>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom100">
+ <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="Tools-NumericField">
+ <object class="GtkToolButton" id="Tools-FormattedField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:NumericField</property>
+ <property name="action_name">.uno:FormattedField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -15729,10 +15987,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-CurrencyField">
+ <object class="GtkToolButton" id="Tools-DateField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:CurrencyField</property>
+ <property name="action_name">.uno:DateField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -15740,10 +15998,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-PatternField">
+ <object class="GtkToolButton" id="Tools-TimeField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:PatternField</property>
+ <property name="action_name">.uno:TimeField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -15761,21 +16019,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator75">
- <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>
@@ -15786,26 +16029,41 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Tools-Section-Form2">
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form4">
<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="GroupB75">
+ <object class="GtkSeparator" id="separator144">
+ <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="GtkBox" id="GroupB89">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -15849,9 +16107,9 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -15898,21 +16156,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator115">
- <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>
@@ -15923,26 +16166,41 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Tools-Section-Form3">
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form5">
<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="GroupB76">
+ <object class="GtkSeparator" id="separator55">
+ <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="GtkBox" id="GroupB91">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom106">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -15986,13 +16244,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom85">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom107">
<property name="visible">True</property>
- <property name="can_focus">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="Tools-ShowFmExplorer2">
+ <object class="GtkToolButton" id="Tools-ShowFmExplorer1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ShowFmExplorer</property>
@@ -16035,7 +16293,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
@@ -16045,9 +16303,18 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">13</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 132bee98ef74..55abaa92fb1e 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -6498,7 +6498,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom67">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -6533,6 +6533,19 @@
<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="Review-Section-Language1">
+ <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="GroupB40">
<property name="visible">True</property>
@@ -6543,7 +6556,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA19">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -6567,7 +6580,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB20">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -6595,8 +6608,24 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-3"/>
+ </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="Review-Section-Annotation">
+ <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="separator99">
+ <object class="GtkSeparator" id="separator19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -6607,26 +6636,13 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</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="Review-Section-Annotation">
- <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="SectionBottom69">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -6658,9 +6674,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Review-Section-Annotation1">
+ <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="GroupB41">
<property name="visible">True</property>
@@ -6727,6 +6756,22 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-2"/>
+ </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="Review-Section-Annotation2">
+ <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="GroupB42">
<property name="visible">True</property>
@@ -6790,32 +6835,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator39">
- <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">3</property>
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-1"/>
</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>
@@ -6825,7 +6855,22 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom95">
+ <object class="GtkSeparator" id="separator39">
+ <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="SectionBottom75">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -6851,14 +6896,11 @@
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-1"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
@@ -7023,10 +7065,23 @@
<property name="position">0</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="View-Section-View1">
+ <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="SectionBottom82">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -7050,8 +7105,24 @@
<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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Zoom">
+ <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="separator12">
+ <object class="GtkSeparator" id="separator120">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -7062,22 +7133,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</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="View-Section-Zoom">
- <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="SectionBottom78">
<property name="visible">True</property>
@@ -7102,9 +7160,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Zoom1">
+ <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="GroupB51">
<property name="visible">True</property>
@@ -7115,7 +7186,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA28">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -7139,7 +7210,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB29">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -7164,9 +7235,25 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-9"/>
+ </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="View-Section-Zoom2">
+ <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="GroupB20">
<property name="visible">True</property>
@@ -7177,7 +7264,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA8">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -7201,7 +7288,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -7226,32 +7313,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator120">
- <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">4</property>
+ <property name="position">3</property>
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-8"/>
</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>
@@ -7261,6 +7333,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator27">
+ <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="SectionBottom23">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -7284,33 +7371,46 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </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="View-Section-Visible1">
+ <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="GroupB47">
+ <object class="GtkBox" id="GroupB49">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin9">
+ <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin10">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="View-ShowRuler">
+ <object class="GtkToolButton" id="View-Menubar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ShowRuler</property>
+ <property name="action_name">.uno:Menubar</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -7321,18 +7421,18 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="belowspacing9">
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing11">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="View-GridVisible">
+ <object class="GtkToolButton" id="View-LeftPaneDraw">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:GridVisible</property>
+ <property name="action_name">.uno:LeftPaneDraw</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7350,33 +7450,49 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
+ <style>
+ <class name="priority-7"/>
+ </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="View-Section-Visible2">
+ <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="GroupB48">
+ <object class="GtkBox" id="GroupB47">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin10">
+ <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="View-Menubar">
+ <object class="GtkToolButton" id="View-ShowRuler">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Menubar</property>
+ <property name="action_name">.uno:ShowRuler</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -7387,18 +7503,18 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="belowspacing11">
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="View-LeftPaneDraw">
+ <object class="GtkToolButton" id="View-GridVisible">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:LeftPaneDraw</property>
+ <property name="action_name">.uno:GridVisible</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7416,69 +7532,27 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator27">
- <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">4</property>
+ <property name="position">2</property>
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="View-Section-New">
+ <object class="sfxlo-OptionalBox" id="View-Section-Gluepoint">
<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="SectionBottom88">
- <property name="visible">True</property>
- <property name="can_focus">True</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="View-NewWindow">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:NewWindow</property>
- </object>
- <packing>
- <property name="expand">True</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>
- <child>
- <object class="GtkSeparator" id="separator42">
+ <object class="GtkSeparator" id="separator35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -7489,25 +7563,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
- <style>
- <class name="priority-4"/>
- </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="View-Section-Gluepoint">
- <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="SectionBottom92">
<property name="visible">True</property>
@@ -7532,9 +7590,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Gluepoint1">
+ <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="GroupB50">
<property name="visible">True</property>
@@ -7642,36 +7713,21 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator35">
- <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">4</property>
+ <property name="position">2</property>
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <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">9</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="View-Section-Gluepoint1">
+ <object class="sfxlo-OptionalBox" id="View-Section-Gluepoint2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -7787,13 +7843,13 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <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">10</property>
</packing>
</child>
<child>
@@ -7803,6 +7859,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator30">
+ <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="SectionBottom86">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -7826,9 +7897,25 @@
<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"/>
+ </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="View-Section-DisplayQuality1">
+ <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="GroupB80">
<property name="visible">True</property>
@@ -7839,7 +7926,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin12">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -7865,7 +7952,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing13">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -7892,11 +7979,27 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-2"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">12</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-New">
+ <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="separator30">
+ <object class="GtkSeparator" id="separator42">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -7907,7 +8010,34 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom88">
+ <property name="visible">True</property>
+ <property name="can_focus">True</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="View-NewWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:NewWindow</property>
+ </object>
+ <packing>
+ <property name="expand">True</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>
@@ -7917,7 +8047,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">13</property>
</packing>
</child>
</object>
@@ -16495,6 +16625,19 @@
<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="Tools-Section-Macro1">
+ <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="GroupB84">
<property name="visible">True</property>
@@ -16505,7 +16648,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA25">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -16529,7 +16672,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB26">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -16557,8 +16700,24 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-7"/>
+ </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="Tools-Section-Presentation">
+ <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="separator61">
+ <object class="GtkSeparator" id="separator62">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -16569,22 +16728,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</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="Tools-Section-Presentation">
- <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="SectionBottom131">
<property name="visible">True</property>
@@ -16609,13 +16755,26 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Presentation1">
+ <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="SectionBottom132">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -16636,32 +16795,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator62">
- <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">3</property>
+ <property name="position">2</property>
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -16671,9 +16815,24 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom133">
+ <object class="GtkSeparator" id="separator141">
<property name="visible">True</property>
- <property name="can_focus">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="SectionBottom96">
+ <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>
@@ -16694,26 +16853,39 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form1">
+ <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="GroupB85">
+ <object class="GtkBox" id="GroupB48">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin8">
+ <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-UseWizards">
+ <object class="GtkToolButton" id="Tools-UseWizards1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:UseWizards</property>
@@ -16731,15 +16903,15 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="belowspacing8">
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-GroupBox">
+ <object class="GtkToolButton" id="Tools-GroupBox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:GroupBox</property>
@@ -16760,51 +16932,51 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator66">
- <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">3</property>
+ <property name="position">2</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">2</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Tools-Section-Form1">
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form2">
<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="GroupB86">
+ <object class="GtkSeparator" id="separator142">
+ <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="GtkBox" id="GroupB88">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom134">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom99">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -16840,8 +17012,21 @@
<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>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76">
+ <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="Tools-RadioButton">
+ <object class="GtkToolButton" id="Tools-RadioButton1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:RadioButton</property>
@@ -16852,7 +17037,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-ListBox">
+ <object class="GtkToolButton" id="Tools-ListBox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ListBox</property>
@@ -16863,7 +17048,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-ComboBox">
+ <object class="GtkToolButton" id="Tools-ComboBox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ComboBox</property>
@@ -16877,20 +17062,65 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</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-4"/>
+ </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="Tools-Section-Form3">
+ <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="separator12">
+ <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="GtkBox" id="GroupB55">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom135">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77">
<property name="visible">True</property>
- <property name="can_focus">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="Tools-FormattedField">
+ <object class="GtkToolButton" id="Tools-NumericField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FormattedField</property>
+ <property name="action_name">.uno:NumericField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -16898,10 +17128,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-DateField">
+ <object class="GtkToolButton" id="Tools-CurrencyField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DateField</property>
+ <property name="action_name">.uno:CurrencyField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -16909,21 +17139,34 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-TimeField">
+ <object class="GtkToolButton" id="Tools-PatternField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:TimeField</property>
+ <property name="action_name">.uno:PatternField</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>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89">
+ <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="Tools-NumericField">
+ <object class="GtkToolButton" id="Tools-FormattedField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:NumericField</property>
+ <property name="action_name">.uno:FormattedField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -16931,10 +17174,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-CurrencyField">
+ <object class="GtkToolButton" id="Tools-DateField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:CurrencyField</property>
+ <property name="action_name">.uno:DateField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -16942,10 +17185,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-PatternField">
+ <object class="GtkToolButton" id="Tools-TimeField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:PatternField</property>
+ <property name="action_name">.uno:TimeField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -16963,21 +17206,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <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">1</property>
</packing>
</child>
@@ -16988,26 +17216,41 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Tools-Section-Form2">
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form4">
<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="GroupB88">
+ <object class="GtkSeparator" id="separator144">
+ <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="GtkBox" id="GroupB89">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom136">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom95">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -17051,9 +17294,9 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom137">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom104">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -17100,21 +17343,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator115">
- <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>
@@ -17125,26 +17353,41 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Tools-Section-Form3">
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form5">
<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="GroupB89">
+ <object class="GtkSeparator" id="separator50">
+ <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="GtkBox" id="GroupB91">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom138">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom118">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -17188,13 +17431,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom139">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom121">
<property name="visible">True</property>
- <property name="can_focus">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="Tools-ShowFmExplorer2">
+ <object class="GtkToolButton" id="Tools-ShowFmExplorer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ShowFmExplorer</property>
@@ -17237,7 +17480,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
@@ -17247,7 +17490,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">9</property>
</packing>
</child>
</object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 4adc427b7210..7a3d6cd4c521 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1449,12 +1449,6 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="MenuReview-separator2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="MenuReview-Hyphenation">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1482,26 +1476,6 @@
<property name="action_name">.uno:MoreDictionaries</property>
</object>
</child>
- <child>
- <object class="GtkSeparatorMenuItem" id="MenuReview-separator3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuReview-InsertAnnotation">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertAnnotation</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuReview-ShowAnnotations">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ShowAnnotations</property>
- </object>
- </child>
</object>
<object class="GtkMenu" id="MenuSlide">
<property name="visible">True</property>
@@ -3423,7 +3397,9 @@
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom10">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="halign">end</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
@@ -3444,7 +3420,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property>
+ <property name="action_name">.uno:Presentation</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6059,6 +6035,17 @@
<property name="homogeneous">True</property>
</packing>
</child>
+ <child>
+ <object class="GtkToolButton" id="Slide-HeaderAndFooter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:HeaderAndFooter</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -6914,10 +6901,23 @@
<property name="position">0</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="Slideshow-Section-Slideshow1">
+ <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="SectionBottom16">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom81">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -6941,6 +6941,19 @@
<property name="position">1</property>
</packing>
</child>
+ </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="Slideshow-Section-Slideshow2">
+ <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="GroupB34">
<property name="visible">True</property>
@@ -6951,7 +6964,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA16">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -6975,7 +6988,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB17">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -7003,8 +7016,24 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-3"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Slideshow-Section-Page">
+ <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="separator14">
+ <object class="GtkSeparator" id="separator16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -7015,22 +7044,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</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="Slideshow-Section-Page">
- <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="SectionBottom11">
<property name="visible">True</property>
@@ -7056,9 +7072,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </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="Slideshow-Section-Page1">
+ <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="GroupB21">
<property name="visible">True</property>
@@ -7069,7 +7098,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -7095,7 +7124,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -7122,22 +7151,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator16">
- <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">3</property>
+ <property name="position">2</property>
</packing>
</child>
<style>
@@ -7147,7 +7161,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -7157,6 +7171,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator14">
+ <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="SectionBottom19">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -7180,9 +7209,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </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="Slideshow-Section-Minimize1">
+ <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="GroupB36">
<property name="visible">True</property>
@@ -7193,7 +7235,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -7219,7 +7261,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -7256,7 +7298,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">6</property>
</packing>
</child>
</object>
@@ -7428,6 +7470,19 @@
<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="Review-Section-Language1">
+ <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="GroupB40">
<property name="visible">True</property>
@@ -7438,7 +7493,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA19">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -7462,7 +7517,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB20">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -7490,8 +7545,24 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-3"/>
+ </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="Review-Section-Annotation">
+ <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="separator99">
+ <object class="GtkSeparator" id="separator20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -7502,22 +7573,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</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="Review-Section-Annotation">
- <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="SectionBottom69">
<property name="visible">True</property>
@@ -7553,9 +7611,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Review-Section-Annotation1">
+ <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="GroupB41">
<property name="visible">True</property>
@@ -7622,6 +7693,22 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-2"/>
+ </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="Review-Section-Annotation2">
+ <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="GroupB42">
<property name="visible">True</property>
@@ -7685,32 +7772,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator20">
- <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">3</property>
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-1"/>
</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>
@@ -7720,6 +7792,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator11">
+ <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="SectionBottom92">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -7746,14 +7833,11 @@
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-1"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
@@ -7916,10 +8000,23 @@
<property name="position">0</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="View-Section-View1">
+ <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="SectionBottom90">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -7943,6 +8040,22 @@
<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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-View2">
+ <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="GroupB26">
<property name="visible">True</property>
@@ -7953,7 +8066,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -7979,7 +8092,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8009,63 +8122,24 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator12">
- <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">3</property>
- </packing>
- </child>
+ <style>
+ <class name="priority-9"/>
+ </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="View-Section-Header">
+ <object class="sfxlo-OptionalBox" id="View-Section-Master">
<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">
- <property name="visible">True</property>
- <property name="can_focus">True</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="View-HeaderAndFooter">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:HeaderAndFooter</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>
- <child>
- <object class="GtkSeparator" id="separator53">
+ <object class="GtkSeparator" id="separator26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -8076,22 +8150,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
- </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="View-Section-Master">
- <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="SectionBottom22">
<property name="visible">True</property>
@@ -8116,9 +8177,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </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="View-Section-Master1">
+ <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="GroupB46">
<property name="visible">True</property>
@@ -8129,7 +8203,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8155,7 +8229,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8182,11 +8256,27 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-8"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Zoom">
+ <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="separator26">
+ <object class="GtkSeparator" id="separator19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -8197,36 +8287,23 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox" id="View-Section-Zoom">
- <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="SectionBottom78">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16">
<property name="visible">True</property>
- <property name="can_focus">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="View-ZoomOptimal">
+ <object class="GtkToolButton" id="View-ZoomMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ZoomOptimal</property>
+ <property name="action_name">.uno:ZoomMode</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8237,27 +8314,40 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </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="View-Section-Zoom1">
+ <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="GroupB51">
+ <object class="GtkBox" id="GroupB63">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LineA28">
+ <object class="sfxlo-NotebookbarToolBox" id="LineA17">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="View-ZoomPageWidth">
+ <object class="GtkToolButton" id="View-ZoomPrevious">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ZoomPageWidth</property>
+ <property name="action_name">.uno:ZoomPrevious</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8272,13 +8362,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LineB29">
+ <object class="sfxlo-NotebookbarToolBox" id="LineB18">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="View-ZoomPage">
+ <object class="GtkToolButton" id="View-ZoomPage1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ZoomPage</property>
@@ -8299,32 +8389,95 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-7"/>
+ </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="View-Section-Zoom2">
+ <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="separator120">
+ <object class="GtkBox" id="GroupB76">
<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="valign">center</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="LineA22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="View-ZoomNext">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ZoomNext</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>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="LineB19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="View-ZoomPageWidth1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ZoomPageWidth</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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -8334,6 +8487,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator27">
+ <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="SectionBottom23">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8357,9 +8525,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Visible1">
+ <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="GroupB47">
<property name="visible">True</property>
@@ -8370,7 +8551,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8396,7 +8577,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8423,9 +8604,25 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
+ <style>
+ <class name="priority-5"/>
+ </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="View-Section-Visible2">
+ <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="GroupB48">
<property name="visible">True</property>
@@ -8436,7 +8633,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin10">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8462,7 +8659,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing11">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8492,29 +8689,14 @@
<property name="position">3</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator27">
- <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">4</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">4</property>
+ <property name="position">10</property>
</packing>
</child>
<child>
@@ -8524,6 +8706,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator30">
+ <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="SectionBottom86">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8547,9 +8744,25 @@
<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"/>
+ </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="View-Section-DisplayQuality1">
+ <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="GroupB80">
<property name="visible">True</property>
@@ -8560,7 +8773,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin12">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8586,7 +8799,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing13">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -8613,22 +8826,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator30">
- <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">3</property>
+ <property name="position">2</property>
</packing>
</child>
<style>
@@ -8638,7 +8836,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -8648,6 +8846,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator12">
+ <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="SectionBottom88">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8671,7 +8884,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
@@ -8681,9 +8894,12 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">13</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -14518,6 +14734,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom68">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -14541,9 +14772,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</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="Tools-Section-Macro1">
+ <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="GroupB49">
<property name="visible">True</property>
@@ -14554,7 +14798,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA25">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -14578,7 +14822,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB26">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -14606,8 +14850,24 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-7"/>
+ </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="Tools-Section-Presentation">
+ <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="separator70">
+ <object class="GtkSeparator" id="separator84">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -14618,22 +14878,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</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="Tools-Section-Presentation">
- <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>
@@ -14658,9 +14905,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Presentation1">
+ <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="GroupB50">
<property name="visible">True</property>
@@ -14671,7 +14931,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin7">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -14697,7 +14957,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing7">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -14724,32 +14984,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator84">
- <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">3</property>
+ <property name="position">2</property>
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -14759,9 +15004,24 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72">
+ <object class="GtkSeparator" id="separator141">
<property name="visible">True</property>
- <property name="can_focus">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="SectionBottom41">
+ <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>
@@ -14782,11 +15042,24 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form1">
+ <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="GroupB60">
+ <object class="GtkBox" id="GroupB51">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -14795,13 +15068,13 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin8">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-UseWizards">
+ <object class="GtkToolButton" id="Tools-UseWizards1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:UseWizards</property>
@@ -14821,13 +15094,13 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing8">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-GroupBox">
+ <object class="GtkToolButton" id="Tools-GroupBox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:GroupBox</property>
@@ -14848,51 +15121,51 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator86">
- <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">3</property>
+ <property name="position">2</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">2</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Tools-Section-Form1">
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form2">
<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="GroupB61">
+ <object class="GtkSeparator" id="separator142">
+ <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="GtkBox" id="GroupB88">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -14928,8 +15201,21 @@
<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>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73">
+ <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="Tools-RadioButton">
+ <object class="GtkToolButton" id="Tools-RadioButton1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:RadioButton</property>
@@ -14940,7 +15226,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-ListBox">
+ <object class="GtkToolButton" id="Tools-ListBox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ListBox</property>
@@ -14951,7 +15237,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-ComboBox">
+ <object class="GtkToolButton" id="Tools-ComboBox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ComboBox</property>
@@ -14965,20 +15251,65 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</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-4"/>
+ </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="Tools-Section-Form3">
+ <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="separator65">
+ <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="GtkBox" id="GroupB77">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom74">
<property name="visible">True</property>
- <property name="can_focus">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="Tools-FormattedField">
+ <object class="GtkToolButton" id="Tools-NumericField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:FormattedField</property>
+ <property name="action_name">.uno:NumericField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -14986,10 +15317,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-DateField">
+ <object class="GtkToolButton" id="Tools-CurrencyField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DateField</property>
+ <property name="action_name">.uno:CurrencyField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -14997,21 +15328,34 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-TimeField">
+ <object class="GtkToolButton" id="Tools-PatternField1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:TimeField</property>
+ <property name="action_name">.uno:PatternField</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>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom100">
+ <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="Tools-NumericField">
+ <object class="GtkToolButton" id="Tools-FormattedField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:NumericField</property>
+ <property name="action_name">.uno:FormattedField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -15019,10 +15363,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-CurrencyField">
+ <object class="GtkToolButton" id="Tools-DateField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:CurrencyField</property>
+ <property name="action_name">.uno:DateField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -15030,10 +15374,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Tools-PatternField">
+ <object class="GtkToolButton" id="Tools-TimeField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:PatternField</property>
+ <property name="action_name">.uno:TimeField</property>
</object>
<packing>
<property name="expand">False</property>
@@ -15051,21 +15395,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator89">
- <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>
@@ -15076,17 +15405,32 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Tools-Section-Form2">
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form4">
<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="GroupB65">
+ <object class="GtkSeparator" id="separator144">
+ <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="GtkBox" id="GroupB89">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -15095,7 +15439,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom75">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -15139,9 +15483,9 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom104">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -15188,21 +15532,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator115">
- <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>
@@ -15213,26 +15542,41 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Tools-Section-Form3">
+ <object class="sfxlo-OptionalBox" id="Tools-Section-Form5">
<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="GroupB69">
+ <object class="GtkSeparator" id="separator35">
+ <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="GtkBox" id="GroupB91">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom93">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom106">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -15276,13 +15620,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom95">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom107">
<property name="visible">True</property>
- <property name="can_focus">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="Tools-ShowFmExplorer2">
+ <object class="GtkToolButton" id="Tools-ShowFmExplorer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ShowFmExplorer</property>
@@ -15325,7 +15669,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
@@ -15335,7 +15679,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">9</property>
</packing>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index ef090fee942d..dd43487b7b59 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -8972,9 +8972,6 @@
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="priority-7"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -9015,6 +9012,9 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-9"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -9091,7 +9091,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-8"/>
</style>
</object>
<packing>
@@ -9224,7 +9224,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -9302,7 +9302,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -9439,7 +9439,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -9521,7 +9521,7 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
@@ -9531,6 +9531,146 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox" id="View-Section-SelectObject">
+ <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="separator74">
+ <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="SectionBottom40">
+ <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="View-SelectObject">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SelectObject</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-3"/>
+ </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="View-Section-Grid1">
+ <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="GroupB60">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin7">
+ <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-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="View-HelplinesMove">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:HelplinesMove</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing7">
+ <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-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="View-GridUse1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GridUse</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-2"/>
+ </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="View-Section-New">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -9585,7 +9725,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">12</property>
</packing>
</child>
</object>