[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Nov 4 19:17:21 UTC 2020


 sc/uiconfig/scalc/ui/notebookbar.ui                       |    8 ++---
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui    |    8 ++---
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui       |    4 +-
 sc/uiconfig/scalc/ui/notebookbar_groups.ui                |   20 ++++++------
 sd/uiconfig/sdraw/ui/notebookbar.ui                       |    8 ++---
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui    |    8 ++---
 sd/uiconfig/simpress/ui/notebookbar.ui                    |    8 ++---
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |    8 ++---
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui    |    4 +-
 sd/uiconfig/simpress/ui/notebookbar_groups.ui             |   16 +++++-----
 sw/uiconfig/swriter/ui/notebookbar.ui                     |    8 ++---
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui  |    8 ++---
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui     |    8 ++---
 sw/uiconfig/swriter/ui/notebookbar_groups.ui              |   22 +++++++-------
 14 files changed, 69 insertions(+), 69 deletions(-)

New commits:
commit 62fb1741792b2b914de74f7c57f1b77858e6f0e8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 4 14:08:47 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 4 20:16:37 2020 +0100

    use only NotebookbarToolBox, and not SidebarToolBox, in the notebookbar
    
    Change-Id: I93e2acdcc176a7c179d4068597f00f8e9cd0bf7e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105293
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index e43dda500640..dfa651e8e65a 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -11337,7 +11337,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox3">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -11363,7 +11363,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox4">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -11419,7 +11419,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox5">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -11445,7 +11445,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox6">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index cb0fd8619fde..5b21d6634a6f 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -8202,7 +8202,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox3">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -8228,7 +8228,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox4">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -8282,7 +8282,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox5">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -8308,7 +8308,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox6">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 0b4b83669a61..52b532985df0 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -6285,7 +6285,7 @@
                                 <property name="vexpand">True</property>
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="sfxlo-SidebarToolBox" id="colorbox1">
+                                  <object class="sfxlo-NotebookbarToolBox" id="colorbox1">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="toolbar_style">both-horiz</property>
@@ -6324,7 +6324,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="sfxlo-SidebarToolBox" id="colorbox2">
+                                  <object class="sfxlo-NotebookbarToolBox" id="colorbox2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="toolbar_style">both-horiz</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groups.ui b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
index d91c659eea1b..c28f9a67bdc0 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groups.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
@@ -793,7 +793,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="font">
+                          <object class="sfxlo-NotebookbarToolBox" id="font">
                             <property name="can_focus">False</property>
                             <child>
                               <object class="GtkToolButton" id="fontname">
@@ -904,7 +904,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="fontadjust">
+                          <object class="sfxlo-NotebookbarToolBox" id="fontadjust">
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
@@ -1140,7 +1140,7 @@
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="wrapbox">
+                      <object class="sfxlo-NotebookbarToolBox" id="wrapbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1167,7 +1167,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="backgroundbox">
+                      <object class="sfxlo-NotebookbarToolBox" id="backgroundbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1194,7 +1194,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="colorbox">
+                      <object class="sfxlo-NotebookbarToolBox" id="colorbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1468,7 +1468,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tableborder1">
+                          <object class="sfxlo-NotebookbarToolBox" id="tableborder1">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1495,7 +1495,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tableborder2">
+                          <object class="sfxlo-NotebookbarToolBox" id="tableborder2">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1522,7 +1522,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tableborder3">
+                          <object class="sfxlo-NotebookbarToolBox" id="tableborder3">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1687,7 +1687,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tablebox">
+                          <object class="sfxlo-NotebookbarToolBox" id="tablebox">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1712,7 +1712,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="shapesbox">
+                          <object class="sfxlo-NotebookbarToolBox" id="shapesbox">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 55f4af2517fd..3b3bf4c6ec61 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -11843,7 +11843,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox3">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -11869,7 +11869,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox4">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -11925,7 +11925,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox5">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -11951,7 +11951,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox6">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index f1586732c322..9ce80a8864bc 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -9724,7 +9724,7 @@
                             <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox3">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -9749,7 +9749,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox4">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -9802,7 +9802,7 @@
                             <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox5">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -9827,7 +9827,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox6">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index e499d7e8e356..715beb7fbbb4 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -11588,7 +11588,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox3">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -11614,7 +11614,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox4">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -11670,7 +11670,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox5">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -11696,7 +11696,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox6">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index c647704f4b11..d78f4b6f8d23 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -9778,7 +9778,7 @@
                             <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox3">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -9803,7 +9803,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox4">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -9856,7 +9856,7 @@
                             <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox5">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -9881,7 +9881,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox6">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index 6bcc9b615561..820861ffc0d1 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
@@ -9459,7 +9459,7 @@
                                 <property name="vexpand">True</property>
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="sfxlo-SidebarToolBox" id="colorbox1">
+                                  <object class="sfxlo-NotebookbarToolBox" id="colorbox1">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="toolbar_style">both-horiz</property>
@@ -9498,7 +9498,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="sfxlo-SidebarToolBox" id="colorbox2">
+                                  <object class="sfxlo-NotebookbarToolBox" id="colorbox2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="toolbar_style">both-horiz</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groups.ui b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
index a0f5185c4301..54d10d4018e0 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groups.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
@@ -725,7 +725,7 @@
                         <property name="valign">center</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="font">
+                          <object class="sfxlo-NotebookbarToolBox" id="font">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
@@ -763,7 +763,7 @@
                         <property name="valign">center</property>
                         <property name="spacing">4</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="fontheight">
+                          <object class="sfxlo-NotebookbarToolBox" id="fontheight">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
@@ -788,7 +788,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="fontadjust">
+                          <object class="sfxlo-NotebookbarToolBox" id="fontadjust">
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
@@ -1024,7 +1024,7 @@
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="backgroundbox">
+                      <object class="sfxlo-NotebookbarToolBox" id="backgroundbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1051,7 +1051,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="highlightbox">
+                      <object class="sfxlo-NotebookbarToolBox" id="highlightbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1078,7 +1078,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="colorbox">
+                      <object class="sfxlo-NotebookbarToolBox" id="colorbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1413,7 +1413,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tablebox">
+                          <object class="sfxlo-NotebookbarToolBox" id="tablebox">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1438,7 +1438,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="shapesbox">
+                          <object class="sfxlo-NotebookbarToolBox" id="shapesbox">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 4833ecb1de94..77ec7ba84f0a 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -12202,7 +12202,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox3">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -12229,7 +12229,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox4">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -12286,7 +12286,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox5">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -12312,7 +12312,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox6">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 168eb1e858f3..0d9db3b1fa05 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -9059,7 +9059,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox3">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -9085,7 +9085,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox4">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -9140,7 +9140,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox5">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
@@ -9166,7 +9166,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox6">
+                              <object class="sfxlo-NotebookbarToolBox" id="colorbox6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="toolbar_style">both-horiz</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 0c23590a67ba..a21ae175d552 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -13351,7 +13351,7 @@
                                 <property name="vexpand">True</property>
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="sfxlo-SidebarToolBox" id="colorbox3">
+                                  <object class="sfxlo-NotebookbarToolBox" id="colorbox3">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="toolbar_style">both-horiz</property>
@@ -13377,7 +13377,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="sfxlo-SidebarToolBox" id="colorbox4">
+                                  <object class="sfxlo-NotebookbarToolBox" id="colorbox4">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="toolbar_style">both-horiz</property>
@@ -13458,7 +13458,7 @@
                                 <property name="vexpand">True</property>
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="sfxlo-SidebarToolBox" id="colorbox5">
+                                  <object class="sfxlo-NotebookbarToolBox" id="colorbox5">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="toolbar_style">both-horiz</property>
@@ -13484,7 +13484,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="sfxlo-SidebarToolBox" id="colorbox6">
+                                  <object class="sfxlo-NotebookbarToolBox" id="colorbox6">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="toolbar_style">both-horiz</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index 873618baea68..9cbc43eb8c42 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -981,7 +981,7 @@
                         <property name="valign">center</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="font">
+                          <object class="sfxlo-NotebookbarToolBox" id="font">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
@@ -1019,7 +1019,7 @@
                         <property name="valign">center</property>
                         <property name="spacing">4</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="fontheight">
+                          <object class="sfxlo-NotebookbarToolBox" id="fontheight">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
@@ -1044,7 +1044,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="fontadjust">
+                          <object class="sfxlo-NotebookbarToolBox" id="fontadjust">
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
                             <property name="hexpand">True</property>
@@ -1280,7 +1280,7 @@
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="backgroundbox">
+                      <object class="sfxlo-NotebookbarToolBox" id="backgroundbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1307,7 +1307,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="highlightbox">
+                      <object class="sfxlo-NotebookbarToolBox" id="highlightbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1334,7 +1334,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="colorbox">
+                      <object class="sfxlo-NotebookbarToolBox" id="colorbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1496,7 +1496,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tablebox">
+                          <object class="sfxlo-NotebookbarToolBox" id="tablebox">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1602,7 +1602,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="shapesbox">
+                          <object class="sfxlo-NotebookbarToolBox" id="shapesbox">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1830,7 +1830,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tableborder1">
+                          <object class="sfxlo-NotebookbarToolBox" id="tableborder1">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1857,7 +1857,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tableborder2">
+                          <object class="sfxlo-NotebookbarToolBox" id="tableborder2">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1884,7 +1884,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tableborder3">
+                          <object class="sfxlo-NotebookbarToolBox" id="tableborder3">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>


More information about the Libreoffice-commits mailing list