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

[Caolán McNamara (via logerrit)]

 extras/source/glade/libreoffice-catalog.xml.in |    4 -
 include/svx/papersizelistbox.hxx               |   13 -----
 solenv/bin/native-code.py                      |    1 
 svx/source/dialog/papersizelistbox.cxx         |   62 -------------------------
 4 files changed, 80 deletions(-)

New commits:
commit c7043c0f2aab380648c8e35b8724107a881978b3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 1 21:05:17 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 2 18:54:46 2020 +0100

    PaperSizeListBox is now unused
    
    Change-Id: I0ce2fbb7f0346f55984a419f741319690a209434
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86121
    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 c9bcb3b9b73a..ad20ad5fac51 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -122,10 +122,6 @@
                         generic-name="Fill Attr ListBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>
 
-    <glade-widget-class title="Page Size ListBox" name="svxcorelo-PaperSizeListBox"
-                        generic-name="Page Size ListBox" parent="GtkComboBox"
-                        icon-name="widget-gtk-combobox"/>
-
     <glade-widget-class title="Sidebar ToolBox" name="sfxlo-SidebarToolBox"
                         generic-name="Sidebar ToolBox" parent="GtkToolbar"
                         icon-name="widget-gtk-toolbar">
diff --git a/include/svx/papersizelistbox.hxx b/include/svx/papersizelistbox.hxx
index 4dea2e176dde..5ede4fc81bc6 100644
--- a/include/svx/papersizelistbox.hxx
+++ b/include/svx/papersizelistbox.hxx
@@ -22,7 +22,6 @@
 
 #include <i18nutil/paper.hxx>
 #include <svx/svxdllapi.h>
-#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 
 enum class PaperSizeApp
@@ -31,18 +30,6 @@ enum class PaperSizeApp
     Draw
 };
 
-class SVX_DLLPUBLIC PaperSizeListBox final : public ListBox
-{
-public:
-    PaperSizeListBox( vcl::Window* pParent );
-
-    void FillPaperSizeEntries( PaperSizeApp eApp );
-    void SetSelection(  Paper eSize  );
-    Paper GetSelection() const;
-
-    Size GetOptimalSize() const override;
-};
-
 class SVX_DLLPUBLIC SvxPaperSizeListBox
 {
 private:
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d99370c3c18f..91c7df2d1403 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -502,7 +502,6 @@ custom_widgets = [
     'IndexBox',
     'ManagedMenuButton',
     'OptionalBox',
-    'PaperSizeListBox',
     'PriorityHBox',
     'PriorityMergedHBox',
     'PropertyControl',
diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx
index f1ac6d4c0e40..c9c7a3001339 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -20,70 +20,8 @@
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/papersizelistbox.hxx>
-#include <vcl/builderfactory.hxx>
 #include "page.hrc"
 
-PaperSizeListBox::PaperSizeListBox(vcl::Window* pParent)
-    : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
-{
-    SetDropDownLineCount(6);
-}
-
-VCL_BUILDER_FACTORY(PaperSizeListBox);
-
-void PaperSizeListBox::FillPaperSizeEntries( PaperSizeApp eApp )
-{
-    const std::pair<const char*, int>* pPaperAry = eApp == PaperSizeApp::Std ?
-        RID_SVXSTRARY_PAPERSIZE_STD : RID_SVXSTRARY_PAPERSIZE_DRAW;
-    sal_uInt32 nCnt = eApp == PaperSizeApp::Std ?
-        SAL_N_ELEMENTS(RID_SVXSTRARY_PAPERSIZE_STD) : SAL_N_ELEMENTS(RID_SVXSTRARY_PAPERSIZE_DRAW);
-
-    for ( sal_uInt32 i = 0; i < nCnt; ++i )
-    {
-        OUString aStr = SvxResId(pPaperAry[i].first);
-        Paper eSize = static_cast<Paper>(pPaperAry[i].second);
-        sal_Int32 nPos = InsertEntry( aStr );
-        SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_uLong>(eSize)) );
-    }
-}
-
-void PaperSizeListBox::SetSelection( Paper ePreselectPaper )
-{
-    sal_Int32 nEntryCount = GetEntryCount();
-    sal_Int32 nSelPos = LISTBOX_ENTRY_NOTFOUND;
-    sal_Int32 nUserPos = LISTBOX_ENTRY_NOTFOUND;
-
-    for (sal_Int32 i = 0; i < nEntryCount; ++i )
-    {
-        Paper eTmp = static_cast<Paper>(reinterpret_cast<sal_uLong>(GetEntryData(i)));
-
-        if ( eTmp == ePreselectPaper )
-        {
-            nSelPos = i;
-            break;
-        }
-
-        if ( eTmp == PAPER_USER )
-           nUserPos = i;
-    }
-
-    // preselect current paper format - #115915#: ePaper might not be in aPaperSizeBox so use PAPER_USER instead
-    SelectEntryPos( ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) ? nSelPos : nUserPos );
-}
-
-Paper PaperSizeListBox::GetSelection() const
-{
-    const sal_Int32 nPos = GetSelectedEntryPos();
-    Paper ePaper = static_cast<Paper>(reinterpret_cast<sal_uLong>(GetEntryData( nPos )));
-
-    return ePaper;
-}
-
-Size PaperSizeListBox::GetOptimalSize() const
-{
-    return Size(150, ListBox::GetOptimalSize().Height());
-}
-
 SvxPaperSizeListBox::SvxPaperSizeListBox(std::unique_ptr<weld::ComboBox> pControl)
     : m_xControl(std::move(pControl))
 {