SwNumberingTypeListBox fully replaced now

Change-Id: I7610cf8f602c6939dc994dd4c418d9e07aaf6b20
Reviewed-on: https://gerrit.libreoffice.org/55217Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/source/ui/dialog/uiregionsw.cxx

@@ -1836,7 +1836,7 @@ SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(TabPageParent pParent,
     , m_xFootnoteNtNumFormatCB(m_xBuilder->weld_check_button("ftnntnumfmt"))
     , m_xFootnotePrefixFT(m_xBuilder->weld_label("ftnprefix_label"))
     , m_xFootnotePrefixED(m_xBuilder->weld_entry("ftnprefix"))
-    , m_xFootnoteNumViewBox(new NumberingTypeListBox(m_xBuilder->weld_combo_box_text("ftnnumviewbox")))
+    , m_xFootnoteNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("ftnnumviewbox")))
     , m_xFootnoteSuffixFT(m_xBuilder->weld_label("ftnsuffix_label"))
     , m_xFootnoteSuffixED(m_xBuilder->weld_entry("ftnsuffix"))
     , m_xEndNtAtTextEndCB(m_xBuilder->weld_check_button("endntattextend"))
@@ -1846,7 +1846,7 @@ SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(TabPageParent pParent,
     , m_xEndNtNumFormatCB(m_xBuilder->weld_check_button("endntnumfmt"))
     , m_xEndPrefixFT(m_xBuilder->weld_label("endprefix_label"))
     , m_xEndPrefixED(m_xBuilder->weld_entry("endprefix"))
-    , m_xEndNumViewBox(new NumberingTypeListBox(m_xBuilder->weld_combo_box_text("endnumviewbox")))
+    , m_xEndNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("endnumviewbox")))
     , m_xEndSuffixFT(m_xBuilder->weld_label("endsuffix_label"))
     , m_xEndSuffixED(m_xBuilder->weld_entry("endsuffix"))
 {
@@ -1924,7 +1924,7 @@ void SwSectionFootnoteEndTabPage::ResetState( bool bFootnote,
     weld::CheckButton *pNtAtTextEndCB, *pNtNumCB, *pNtNumFormatCB;
     weld::Label *pPrefixFT, *pSuffixFT;
     weld::Entry *pPrefixED, *pSuffixED;
-    NumberingTypeListBox *pNumViewBox;
+    SwNumberingTypeListBox *pNumViewBox;
     weld::Label *pOffsetText;
     weld::SpinButton *pOffsetField;
 
@@ -2016,7 +2016,7 @@ IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, weld::ToggleButton&, rBox, v
                     m_xFootnoteNtNumFormatCB.get() == &rBox ;
 
     weld::CheckButton *pNumBox, *pNumFormatBox, *pEndBox;
-    NumberingTypeListBox* pNumViewBox;
+    SwNumberingTypeListBox* pNumViewBox;
     weld::Label *pOffsetText;
     weld::SpinButton *pOffsetField;
     weld::Label *pPrefixFT, *pSuffixFT;

sw/source/ui/misc/docfnote.cxx

@@ -72,7 +72,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(TabPageParent pParent, bool bEN,
     , pSh(nullptr)
     , bPosDoc(false)
     , bEndNote(bEN)
-    , m_xNumViewBox(new NumberingTypeListBox(m_xBuilder->weld_combo_box_text("numberinglb")))
+    , m_xNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("numberinglb")))
     , m_xOffsetLbl(m_xBuilder->weld_label("offset"))
     , m_xOffsetField(m_xBuilder->weld_spin_button("offsetnf"))
     , m_xNumCountBox(m_xBuilder->weld_combo_box_text("countinglb"))

sw/source/ui/misc/impfnote.hxx

@@ -35,7 +35,7 @@ class SwEndNoteOptionPage : public SfxTabPage
     bool    bPosDoc;
     bool    bEndNote;
 
-    std::unique_ptr<NumberingTypeListBox> m_xNumViewBox;
+    std::unique_ptr<SwNumberingTypeListBox> m_xNumViewBox;
     std::unique_ptr<weld::Label> m_xOffsetLbl;
     std::unique_ptr<weld::SpinButton> m_xOffsetField;
     std::unique_ptr<weld::ComboBoxText> m_xNumCountBox;

sw/source/ui/misc/linenum.cxx

@@ -72,7 +72,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw)
     , m_xDivRowsFT(m_xBuilder->weld_widget("lines"))
     , m_xNumIntervalNF(m_xBuilder->weld_spin_button("intervalspin"))
     , m_xCharStyleLB(m_xBuilder->weld_combo_box_text("styledropdown"))
-    , m_xFormatLB(new NumberingTypeListBox(m_xBuilder->weld_combo_box_text("formatdropdown")))
+    , m_xFormatLB(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("formatdropdown")))
     , m_xPosLB(m_xBuilder->weld_combo_box_text("positiondropdown"))
     , m_xOffsetMF(m_xBuilder->weld_metric_spin_button("spacingspin", FUNIT_CM))
     , m_xDivisorED(m_xBuilder->weld_entry("textentry"))

sw/source/ui/misc/outline.cxx

@@ -393,7 +393,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(TabPageParent pPage,
     , nActLevel(1)
     , m_xLevelLB(m_xBuilder->weld_tree_view("level"))
     , m_xCollBox(m_xBuilder->weld_combo_box_text("style"))
-    , m_xNumberBox(new NumberingTypeListBox(m_xBuilder->weld_combo_box_text("numbering")))
+    , m_xNumberBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("numbering")))
     , m_xCharFormatLB(m_xBuilder->weld_combo_box_text("charstyle"))
     , m_xAllLevelFT(m_xBuilder->weld_label("sublevelsft"))
     , m_xAllLevelNF(m_xBuilder->weld_spin_button("sublevelsnf"))

sw/source/uibase/inc/linenum.hxx

@@ -35,7 +35,7 @@ private:
     std::unique_ptr<weld::Widget> m_xDivRowsFT;
     std::unique_ptr<weld::SpinButton> m_xNumIntervalNF;
     std::unique_ptr<weld::ComboBoxText> m_xCharStyleLB;
-    std::unique_ptr<NumberingTypeListBox> m_xFormatLB;
+    std::unique_ptr<SwNumberingTypeListBox> m_xFormatLB;
     std::unique_ptr<weld::ComboBoxText> m_xPosLB;
     std::unique_ptr<weld::MetricSpinButton> m_xOffsetMF;
     std::unique_ptr<weld::Entry> m_xDivisorED;

sw/source/uibase/inc/numberingtypelistbox.hxx

@@ -41,14 +41,14 @@ namespace o3tl {
 
 struct SwNumberingTypeListBox_Impl;
 
-class SW_DLLPUBLIC NumberingTypeListBox
+class SW_DLLPUBLIC SwNumberingTypeListBox
 {
     std::unique_ptr<weld::ComboBoxText> m_xWidget;
     std::unique_ptr<SwNumberingTypeListBox_Impl> m_xImpl;
 
 public:
-    NumberingTypeListBox(weld::ComboBoxText* pWidget);
-    ~NumberingTypeListBox();
+    SwNumberingTypeListBox(weld::ComboBoxText* pWidget);
+    ~SwNumberingTypeListBox();
 
     void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_xWidget->connect_changed(rLink); }
 

sw/source/uibase/inc/outline.hxx

@@ -88,7 +88,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
 
     std::unique_ptr<weld::TreeView> m_xLevelLB;
     std::unique_ptr<weld::ComboBoxText> m_xCollBox;
-    std::unique_ptr<NumberingTypeListBox> m_xNumberBox;
+    std::unique_ptr<SwNumberingTypeListBox> m_xNumberBox;
     std::unique_ptr<weld::ComboBoxText> m_xCharFormatLB;
     std::unique_ptr<weld::Label> m_xAllLevelFT;
     std::unique_ptr<weld::SpinButton>  m_xAllLevelNF;

sw/source/uibase/inc/regionsw.hxx

@@ -198,7 +198,7 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage
     std::unique_ptr<weld::CheckButton> m_xFootnoteNtNumFormatCB;
     std::unique_ptr<weld::Label> m_xFootnotePrefixFT;
     std::unique_ptr<weld::Entry> m_xFootnotePrefixED;
-    std::unique_ptr<NumberingTypeListBox> m_xFootnoteNumViewBox;
+    std::unique_ptr<SwNumberingTypeListBox> m_xFootnoteNumViewBox;
     std::unique_ptr<weld::Label> m_xFootnoteSuffixFT;
     std::unique_ptr<weld::Entry> m_xFootnoteSuffixED;
     std::unique_ptr<weld::CheckButton> m_xEndNtAtTextEndCB;
@@ -208,7 +208,7 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage
     std::unique_ptr<weld::CheckButton> m_xEndNtNumFormatCB;
     std::unique_ptr<weld::Label> m_xEndPrefixFT;
     std::unique_ptr<weld::Entry> m_xEndPrefixED;
-    std::unique_ptr<NumberingTypeListBox> m_xEndNumViewBox;
+    std::unique_ptr<SwNumberingTypeListBox> m_xEndNumViewBox;
     std::unique_ptr<weld::Label> m_xEndSuffixFT;
     std::unique_ptr<weld::Entry> m_xEndSuffixED;
 

sw/source/uibase/misc/numberingtypelistbox.cxx

@@ -38,7 +38,7 @@ struct SwNumberingTypeListBox_Impl
     uno::Reference<text::XNumberingTypeInfo> xInfo;
 };
 
-NumberingTypeListBox::NumberingTypeListBox(weld::ComboBoxText* pWidget)
+SwNumberingTypeListBox::SwNumberingTypeListBox(weld::ComboBoxText* pWidget)
     : m_xWidget(pWidget)
     , m_xImpl(new SwNumberingTypeListBox_Impl)
 {
@@ -47,11 +47,11 @@ NumberingTypeListBox::NumberingTypeListBox(weld::ComboBoxText* pWidget)
     m_xImpl->xInfo.set(xDefNum, uno::UNO_QUERY);
 }
 
-NumberingTypeListBox::~NumberingTypeListBox()
+SwNumberingTypeListBox::~SwNumberingTypeListBox()
 {
 }
 
-void NumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags)
+void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags)
 {
     m_xWidget->clear();
     uno::Sequence<sal_Int16> aTypes;
@@ -136,7 +136,7 @@ void NumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags)
     }
 }
 
-SvxNumType NumberingTypeListBox::GetSelectedNumberingType()
+SvxNumType SwNumberingTypeListBox::GetSelectedNumberingType()
 {
     SvxNumType nRet = SVX_NUM_CHARS_UPPER_LETTER;
     int nSelPos = m_xWidget->get_active();
@@ -149,7 +149,7 @@ SvxNumType NumberingTypeListBox::GetSelectedNumberingType()
     return nRet;
 }
 
-bool NumberingTypeListBox::SelectNumberingType(SvxNumType nType)
+bool SwNumberingTypeListBox::SelectNumberingType(SvxNumType nType)
 {
     int nPos = m_xWidget->find_id(OUString::number(nType));
     m_xWidget->set_active(nPos);