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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Oct 4 19:16:29 UTC 2019


 extras/source/glade/libreoffice-catalog.xml.in |    3 ---
 solenv/bin/native-code.py                      |    1 -
 svtools/source/contnr/fileview.cxx             |   14 --------------
 3 files changed, 18 deletions(-)

New commits:
commit ba32c6646812eaecd89d67e777f1bf2378d9faae
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 4 13:19:02 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Oct 4 21:15:20 2019 +0200

    SvtFileView not referenced in any .uis anymore
    
    through the fpicker constructs one directly
    
    Change-Id: Ic365231e78ca9425b97006a156273479d104eae9
    Reviewed-on: https://gerrit.libreoffice.org/80211
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-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 be9027649209..d798115d681f 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -125,9 +125,6 @@
     <glade-widget-class title="Table Container" name="svtlo-SvSimpleTableContainer"
                         generic-name="Simple Table Container" parent="GtkTreeView"
                         icon-name="widget-gtk-treeview"/>
-    <glade-widget-class title="File View" name="svtlo-SvtFileView"
-                        generic-name="File View" parent="GtkTreeView"
-                        icon-name="widget-gtk-treeview"/>
     <glade-widget-class title="Table Preview" name="swuilo-AutoFmtPreview"
                         generic-name="Table Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 493a23beab74..a9b553c7d7dd 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -496,7 +496,6 @@ custom_widgets = [
     'SidebarToolBox',
     'SpacingListBox',
     'SvSimpleTableContainer',
-    'SvtFileView',
     'SvtURLBox',
     'Svx3DPreviewControl',
     'SvxCharViewControl',
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 40df91d555ff..51b28daa7954 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -863,20 +863,6 @@ void SvtFileView::dispose()
     Control::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSvtFileView(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(makeSvtFileView)>);
-    WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
-
-    bool bDropdown = BuilderUtils::extractDropdown(rMap);
-
-    if (bDropdown)
-        nBits |= WB_DROPDOWN;
-
-    rRet = VclPtr<SvtFileView>::Create(pParent, nBits, true, true);
-}
-
 Size SvtFileView::GetOptimalSize() const
 {
     return LogicToPixel(Size(208, 50), MapMode(MapUnit::MapAppFont));


More information about the Libreoffice-commits mailing list