rename NumValueSet back to SvxNumValueSet

Change-Id: I05cd8e336f818e80de40abb40cf739a7cbb540d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86665
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 23 insertions, 23 deletions

diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 2e3584581a30..11e8e1846219 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -32,7 +32,7 @@
 #define MN_GALLERY_ENTRY 100
 
 class ColorListBox;
-class NumValueSet;
+class SvxNumValueSet;
 class SvxNumRule;
 class SvxBmpNumValueSet;
 class SvxBrushItem;
@@ -66,7 +66,7 @@ class SvxSingleNumPickTabPage final : public SfxTabPage
 
     sal_uInt16              nNumItemId;
 
-    std::unique_ptr<NumValueSet> m_xExamplesVS;
+    std::unique_ptr<SvxNumValueSet> m_xExamplesVS;
     std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin;
 
     DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void);
@@ -96,7 +96,7 @@ class SvxBulletPickTabPage final : public SfxTabPage
 
     OUString            sBulletCharFormatName;
 
-    std::unique_ptr<NumValueSet> m_xExamplesVS;
+    std::unique_ptr<SvxNumValueSet> m_xExamplesVS;
     std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin;
 
     DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void);
@@ -133,7 +133,7 @@ class SvxNumPickTabPage final : public SfxTabPage
     bool                bModified   : 1;
     bool                bPreset     : 1;
 
-    std::unique_ptr<NumValueSet> m_xExamplesVS;
+    std::unique_ptr<SvxNumValueSet> m_xExamplesVS;
     std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin;
 
     DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 9c10291bd1d3..222349d0c583 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -164,7 +164,7 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(weld::Container* pPage, weld::D
     , bModified(false)
     , bPreset(false)
     , nNumItemId(SID_ATTR_NUMBERING_RULE)
-    , m_xExamplesVS(new NumValueSet(nullptr))
+    , m_xExamplesVS(new SvxNumValueSet(nullptr))
     , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset", *m_xExamplesVS))
 {
     SetExchangeSupport();
@@ -343,7 +343,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(weld::Container* pPage, weld::DialogC
     , bModified(false)
     , bPreset(false)
     , nNumItemId(SID_ATTR_NUMBERING_RULE)
-    , m_xExamplesVS(new NumValueSet(nullptr))
+    , m_xExamplesVS(new SvxNumValueSet(nullptr))
     , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset", *m_xExamplesVS))
 {
     SetExchangeSupport();
@@ -492,7 +492,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(weld::Container* pPage, weld::DialogControl
     , nNumItemId(SID_ATTR_NUMBERING_RULE)
     , bModified(false)
     , bPreset(false)
-    , m_xExamplesVS(new NumValueSet(nullptr))
+    , m_xExamplesVS(new SvxNumValueSet(nullptr))
     , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset", *m_xExamplesVS))
 {
     SetExchangeSupport();
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 1eaa4390cb39..4b41a74c90c5 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -46,7 +46,7 @@ enum class NumberingPageType
     BITMAP
 };
 
-class SVX_DLLPUBLIC NumValueSet : public SvtValueSet
+class SVX_DLLPUBLIC SvxNumValueSet : public SvtValueSet
 {
     NumberingPageType ePageType;
     tools::Rectangle       aOrgRect;
@@ -64,9 +64,9 @@ class SVX_DLLPUBLIC NumValueSet : public SvtValueSet
             css::container::XIndexAccess> > aOutlineSettings;
 
 public:
-    NumValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow);
+    SvxNumValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow);
     void init(NumberingPageType eType);
-    virtual ~NumValueSet() override;
+    virtual ~SvxNumValueSet() override;
 
     virtual void    UserDraw( const UserDrawEvent& rUDEvt ) override;
 
@@ -84,7 +84,7 @@ public:
 };
 
 
-class SVX_DLLPUBLIC SvxBmpNumValueSet final : public NumValueSet
+class SVX_DLLPUBLIC SvxBmpNumValueSet final : public SvxNumValueSet
 {
     Idle        aFormatIdle;
     bool        bGrfNotFound;
diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx
index b2c5ce1fa54b..87cd14ad8370 100644
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@@ -32,7 +32,7 @@
 #define MN_GALLERY_ENTRY 100
 
 class ColorListBox;
-class NumValueSet;
+class SvxNumValueSet;
 class SvxNumRule;
 class SvxBmpNumValueSet;
 class SvxBrushItem;
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 703dfceb1aa9..4d09a1a78348 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -147,7 +147,7 @@ static const char* RID_SVXSTR_OUTLINENUM_DESCRIPTIONS[] =
     RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
 };
 
-void NumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
+void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 {
     static const sal_uInt16 aLinesArr[] =
     {
@@ -411,14 +411,14 @@ void NumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     pDev->SetLineColor(aOldColor);
 }
 
-NumValueSet::NumValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow)
+SvxNumValueSet::SvxNumValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow)
     : SvtValueSet(std::move(pScrolledWindow))
     , ePageType(NumberingPageType::BULLET)
     , pVDev(nullptr)
 {
 }
 
-void NumValueSet::init(NumberingPageType eType)
+void SvxNumValueSet::init(NumberingPageType eType)
 {
     ePageType = eType;
     pVDev = nullptr;
@@ -436,11 +436,11 @@ void NumValueSet::init(NumberingPageType eType)
     }
 }
 
-NumValueSet::~NumValueSet()
+SvxNumValueSet::~SvxNumValueSet()
 {
 }
 
-void NumValueSet::SetNumberingSettings(
+void SvxNumValueSet::SetNumberingSettings(
     const Sequence<Sequence<PropertyValue> >& aNum,
     Reference<XNumberingFormatter> const & xFormat,
     const Locale& rLocale   )
@@ -458,7 +458,7 @@ void NumValueSet::SetNumberingSettings(
     }
 }
 
-void NumValueSet::SetOutlineNumberingSettings(
+void SvxNumValueSet::SetOutlineNumberingSettings(
             Sequence<Reference<XIndexAccess> > const & rOutline,
             Reference<XNumberingFormatter> const & xFormat,
             const Locale& rLocale)
@@ -477,7 +477,7 @@ void NumValueSet::SetOutlineNumberingSettings(
 }
 
 SvxBmpNumValueSet::SvxBmpNumValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow)
-    : NumValueSet(std::move(pScrolledWindow))
+    : SvxNumValueSet(std::move(pScrolledWindow))
     , aFormatIdle("SvxBmpNumValueSet FormatIdle")
     , bGrfNotFound(false)
 {
@@ -485,7 +485,7 @@ SvxBmpNumValueSet::SvxBmpNumValueSet(std::unique_ptr<weld::ScrolledWindow> pScro
 
 void SvxBmpNumValueSet::init()
 {
-    NumValueSet::init(NumberingPageType::BITMAP);
+    SvxNumValueSet::init(NumberingPageType::BITMAP);
     bGrfNotFound = false;
     GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
     SetStyle( GetStyle() | WB_VSCROLL );
@@ -503,7 +503,7 @@ SvxBmpNumValueSet::~SvxBmpNumValueSet()
 
 void SvxBmpNumValueSet::UserDraw(const UserDrawEvent& rUDEvt)
 {
-    NumValueSet::UserDraw(rUDEvt);
+    SvxNumValueSet::UserDraw(rUDEvt);
 
     tools::Rectangle aRect = rUDEvt.GetRect();
     vcl::RenderContext* pDev = rUDEvt.GetRenderContext();
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index a05cc7f98f80..10e93efc69e2 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -32,7 +32,7 @@ class NumberingPopup : public WeldToolbarPopup
 {
     NumberingPageType const mePageType;
     NumberingToolBoxControl& mrController;
-    std::unique_ptr<NumValueSet> mxValueSet;
+    std::unique_ptr<SvxNumValueSet> mxValueSet;
     std::unique_ptr<weld::CustomWeld> mxValueSetWin;
     std::unique_ptr<weld::Button> mxMoreButton;
     DECL_LINK(VSSelectValueSetHdl, SvtValueSet*, void);
@@ -72,7 +72,7 @@ NumberingPopup::NumberingPopup(NumberingToolBoxControl& rController,
     : WeldToolbarPopup(rController.getFrameInterface(), pParent, "svx/ui/numberingwindow.ui", "NumberingWindow")
     , mePageType(ePageType)
     , mrController(rController)
-    , mxValueSet(new NumValueSet(nullptr))
+    , mxValueSet(new SvxNumValueSet(nullptr))
     , mxValueSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxValueSet))
     , mxMoreButton(m_xBuilder->weld_button("more"))
 {