[Libreoffice-commits] core.git: extras/source sfx2/source solenv/bin vcl/source

[Caolán McNamara (via logerrit)]

 extras/source/glade/libreoffice-catalog.xml.in |    7 ++-----
 sfx2/source/sidebar/SidebarToolBox.cxx         |    9 ---------
 solenv/bin/native-code.py                      |    2 +-
 vcl/source/window/builder.cxx                  |    5 +++--
 4 files changed, 6 insertions(+), 17 deletions(-)

New commits:
commit c3fbaa3089b0d0beafa6c4334c2e497652de4cf1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 4 14:24:49 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 4 20:16:54 2020 +0100

    sfxlo-SidebarToolBox not used in any current .ui files
    
    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 at redhat.com>

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"/>
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index d96f1419f6b7..91b06bc90091 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -328,15 +328,6 @@ public:
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSidebarToolBox(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
-{
-    static_assert(std::is_same_v<std::remove_pointer_t<VclBuilder::customMakeWidget>,
-                                 decltype(makeSidebarToolBox)>);
-    VclPtrInstance<SidebarToolBox> pBox(pParent);
-    pBox->InitToolBox(rMap);
-    rRet = pBox;
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT void makeNotebookbarToolBox(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
 {
     static_assert(std::is_same_v<std::remove_pointer_t<VclBuilder::customMakeWidget>,
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d0cdeed4bcc8..5d20d738ef58 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -717,9 +717,9 @@ custom_widgets = [
     'ContextVBox',
     'DropdownBox',
     'ManagedMenuButton',
+    'NotebookbarToolBox',
     'PriorityHBox',
     'PriorityMergedHBox',
-    'SidebarToolBox',
     ]
 
 def get_constructor_guard(constructor):
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 73a6532c0949..930dbfaab600 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1614,9 +1614,10 @@ extern "C" VclBuilder::customMakeWidget lo_get_custom_widget_func(const char* na
 
 namespace
 {
-// Takes a string like "sfxlo-SidebarToolBox"
-VclBuilder::customMakeWidget GetCustomMakeWidget(const OString& name)
+// Takes a string like "sfxlo-NotebookbarToolBox"
+VclBuilder::customMakeWidget GetCustomMakeWidget(const OString& rName)
 {
+    const OString name = rName == "sfxlo-SidebarToolBox" ? "sfxlo-NotebookbarToolBox" : rName;
     VclBuilder::customMakeWidget pFunction = nullptr;
     if (sal_Int32 nDelim = name.indexOf('-'); nDelim != -1)
     {