From c3fbaa3089b0d0beafa6c4334c2e497652de4cf1 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 4 Nov 2020 14:24:49 +0000
Subject: sfxlo-SidebarToolBox not used in any current .ui files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

map sfxlo-SidebarToolBox to sfxlo-NotebookbarToolBox
in case it appears in any stale customized profiles

Change-Id: I6035b9042450630b23b48a895e4e9d0ff8d730a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105294
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 extras/source/glade/libreoffice-catalog.xml.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'extras')

diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 2f685a47ae8e..e7453f248630 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -16,8 +16,8 @@
 <glade-catalog name="LibreOffice" domain="glade-3" depends="gtk+" version="1.0">
   <glade-widget-classes>
 
-    <glade-widget-class title="Sidebar ToolBox" name="sfxlo-SidebarToolBox"
-                        generic-name="Sidebar ToolBox" parent="GtkToolbar"
+    <glade-widget-class title="Notebookbar ToolBox" name="sfxlo-NotebookbarToolBox"
+                        generic-name="Notebookbar ToolBox" parent="GtkToolbar"
                         icon-name="widget-gtk-toolbar">
         <properties>
             <!-- Must override the default value of "icon-size", so "Large Toolbar" will be saved into .ui -->
@@ -40,9 +40,6 @@
     <glade-widget-class title="Box which can hide own content" name="VclOptionalBox"
                         generic-name="VclOptionalBox" parent="GtkBox"
                         icon-name="widget-gtk-box"/>
-    <glade-widget-class title="Notebookbar ToolBox" name="sfxlo-NotebookbarToolBox"
-                        generic-name="Notebookbar ToolBox" parent="sfxlo-SidebarToolBox"
-                        icon-name="widget-gtk-toolbar"/>
     <glade-widget-class title="Vertical box hiding children depending on context" name="sfxlo-ContextVBox"
                         generic-name="ContextVBox" parent="GtkBox"
                         icon-name="widget-gtk-box"/>
-- 
cgit