rename PresetListBox back to SvxPresetListBox

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

7 files changed, 40 insertions, 42 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 31932eba7c55..b16a7063e9b1 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -380,7 +380,7 @@ private:
     std::unique_ptr<weld::MetricSpinButton> m_xMtrColorFrom;
     std::unique_ptr<ColorListBox> m_xLbColorTo;
     std::unique_ptr<weld::MetricSpinButton> m_xMtrColorTo;
-    std::unique_ptr<PresetListBox> m_xGradientLB;
+    std::unique_ptr<SvxPresetListBox> m_xGradientLB;
     std::unique_ptr<weld::SpinButton> m_xMtrIncrement;
     std::unique_ptr<weld::CheckButton> m_xCbIncrement;
     std::unique_ptr<weld::Scale> m_xSliderIncrement;
@@ -393,8 +393,8 @@ private:
     DECL_LINK( ClickModifyHdl_Impl, weld::Button&, void );
     DECL_LINK( ChangeGradientHdl, SvtValueSet*, void );
     void ChangeGradientHdl_Impl();
-    DECL_LINK( ClickRenameHdl_Impl, PresetListBox*, void );
-    DECL_LINK( ClickDeleteHdl_Impl, PresetListBox*, void );
+    DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void );
+    DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void );
     DECL_LINK( ModifiedEditHdl_Impl, weld::SpinButton&, void );
     DECL_LINK( ModifiedMetricHdl_Impl, weld::MetricSpinButton&, void );
     DECL_LINK( ModifiedColorListBoxHdl_Impl, ColorListBox&, void );
@@ -456,7 +456,7 @@ private:
     std::unique_ptr<ColorListBox> m_xLbLineColor;
     std::unique_ptr<weld::CheckButton> m_xCbBackgroundColor;
     std::unique_ptr<ColorListBox> m_xLbBackgroundColor;
-    std::unique_ptr<PresetListBox> m_xHatchLB;
+    std::unique_ptr<SvxPresetListBox> m_xHatchLB;
     std::unique_ptr<weld::Button> m_xBtnAdd;
     std::unique_ptr<weld::Button> m_xBtnModify;
     std::unique_ptr<weld::CustomWeld> m_xHatchLBWin;
@@ -473,8 +473,8 @@ private:
     void ModifiedHdl_Impl(void const *);
     DECL_LINK( ClickAddHdl_Impl, weld::Button&, void );
     DECL_LINK( ClickModifyHdl_Impl, weld::Button&, void );
-    DECL_LINK( ClickRenameHdl_Impl, PresetListBox*, void );
-    DECL_LINK( ClickDeleteHdl_Impl, PresetListBox*, void );
+    DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void );
+    DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void );
 
     sal_Int32 SearchHatchList(const OUString& rHatchName);
 
@@ -530,7 +530,7 @@ private:
     Size                       rZoomedSize;
 
     SvxXRectPreview m_aCtlBitmapPreview;
-    std::unique_ptr<PresetListBox>   m_xBitmapLB;
+    std::unique_ptr<SvxPresetListBox>   m_xBitmapLB;
     std::unique_ptr<weld::ComboBox> m_xBitmapStyleLB;
     std::unique_ptr<weld::Container> m_xSizeBox;
     std::unique_ptr<weld::CheckButton> m_xTsbScale;
@@ -555,8 +555,8 @@ private:
     DECL_LINK( ModifyBitmapPositionHdl, weld::ComboBox&, void );
     DECL_LINK( ModifyPositionOffsetHdl, weld::MetricSpinButton&, void );
     DECL_LINK( ModifyTileOffsetHdl, weld::MetricSpinButton&, void );
-    DECL_LINK( ClickRenameHdl, PresetListBox*, void );
-    DECL_LINK( ClickDeleteHdl, PresetListBox*, void );
+    DECL_LINK( ClickRenameHdl, SvxPresetListBox*, void );
+    DECL_LINK( ClickDeleteHdl, SvxPresetListBox*, void );
     DECL_LINK( ClickImportHdl, weld::Button&, void );
     void ClickBitmapHdl_Impl();
     void CalculateBitmapPresetSize();
@@ -603,7 +603,7 @@ private:
     std::unique_ptr<SvxPixelCtl> m_xCtlPixel;
     std::unique_ptr<ColorListBox> m_xLbColor;
     std::unique_ptr<ColorListBox> m_xLbBackgroundColor;
-    std::unique_ptr<PresetListBox> m_xPatternLB;
+    std::unique_ptr<SvxPresetListBox> m_xPatternLB;
     std::unique_ptr<weld::Button> m_xBtnAdd;
     std::unique_ptr<weld::Button> m_xBtnModify;
     std::unique_ptr<weld::CustomWeld> m_xCtlPixelWin;
@@ -615,8 +615,8 @@ private:
     DECL_LINK( ClickModifyHdl_Impl, weld::Button&, void );
     DECL_LINK( ChangePatternHdl_Impl, SvtValueSet*, void );
     DECL_LINK( ChangeColorHdl_Impl, ColorListBox&, void );
-    DECL_LINK( ClickRenameHdl_Impl, PresetListBox*, void );
-    DECL_LINK( ClickDeleteHdl_Impl, PresetListBox*, void );
+    DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void );
+    DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void );
 
     sal_Int32 SearchPatternList(const OUString& rPatternName);
 
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index a721a70171de..5f51cc11a92a 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -77,7 +77,7 @@ SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInA
     , m_aXFillAttr(rInAttrs.GetPool())
     , m_rXFSet(m_aXFillAttr.GetItemSet())
     , mpView(nullptr)
-    , m_xBitmapLB(new PresetListBox(m_xBuilder->weld_scrolled_window("bitmapwin")))
+    , m_xBitmapLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("bitmapwin")))
     , m_xBitmapStyleLB(m_xBuilder->weld_combo_box("bitmapstyle"))
     , m_xSizeBox(m_xBuilder->weld_container("sizebox"))
     , m_xTsbScale(m_xBuilder->weld_check_button("scaletsb"))
@@ -511,7 +511,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapHdl, SvtValueSet*, void)
 
 }
 
-IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, PresetListBox*, void)
+IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void)
 {
     sal_uInt16 nId = m_xBitmapLB->GetSelectedItemId();
     size_t nPos = m_xBitmapLB->GetSelectItemPos();
@@ -551,7 +551,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, PresetListBox*, void)
     }
 }
 
-IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, PresetListBox*, void)
+IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void)
 {
     sal_uInt16 nId = m_xBitmapLB->GetSelectedItemId();
     size_t nPos = m_xBitmapLB->GetSelectItemPos();
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 791625ee09bf..6227cfd4e086 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -68,7 +68,7 @@ SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet&
     , m_xMtrColorFrom(m_xBuilder->weld_metric_spin_button("colorfrommtr", FUNIT_PERCENT))
     , m_xLbColorTo(new ColorListBox(m_xBuilder->weld_menu_button("colortolb"), pParent.GetFrameWeld()))
     , m_xMtrColorTo(m_xBuilder->weld_metric_spin_button("colortomtr", FUNIT_PERCENT))
-    , m_xGradientLB(new PresetListBox(m_xBuilder->weld_scrolled_window("gradientpresetlistwin")))
+    , m_xGradientLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("gradientpresetlistwin")))
     , m_xMtrIncrement(m_xBuilder->weld_spin_button("incrementmtr"))
     , m_xCbIncrement(m_xBuilder->weld_check_button("autoincrement"))
     , m_xSliderIncrement(m_xBuilder->weld_scale("incrementslider"))
@@ -436,7 +436,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, weld::Button&, void)
     }
 }
 
-IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl, PresetListBox*, void)
+IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void)
 {
     sal_uInt16 nId = m_xGradientLB->GetSelectedItemId();
     size_t nPos = m_xGradientLB->GetSelectItemPos();
@@ -465,7 +465,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl, PresetListBox*, void)
         m_xBtnModify->set_sensitive(false);
 }
 
-IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, PresetListBox*, void)
+IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void)
 {
     sal_uInt16 nId = m_xGradientLB->GetSelectedItemId();
     size_t nPos = m_xGradientLB->GetSelectItemPos();
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index ff31f3320579..bf89f766ed51 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -63,7 +63,7 @@ SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAtt
     , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pParent.GetFrameWeld()))
     , m_xCbBackgroundColor(m_xBuilder->weld_check_button("backgroundcolor"))
     , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("backgroundcolorlb"), pParent.GetFrameWeld()))
-    , m_xHatchLB(new PresetListBox(m_xBuilder->weld_scrolled_window("hatchpresetlistwin")))
+    , m_xHatchLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("hatchpresetlistwin")))
     , m_xBtnAdd(m_xBuilder->weld_button("add"))
     , m_xBtnModify(m_xBuilder->weld_button("modify"))
     , m_xHatchLBWin(new weld::CustomWeld(*m_xBuilder, "hatchpresetlist", *m_xHatchLB))
@@ -501,7 +501,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, weld::Button&, void)
     }
 }
 
-IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, PresetListBox*, void)
+IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void)
 {
     sal_uInt16 nId = m_xHatchLB->GetSelectedItemId();
     size_t nPos = m_xHatchLB->GetSelectItemPos();
@@ -527,7 +527,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, PresetListBox*, void)
     }
 }
 
-IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, PresetListBox*, void )
+IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void )
 {
     sal_uInt16 nId = m_xHatchLB->GetSelectedItemId();
     size_t nPos = m_xHatchLB->GetSelectItemPos();
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 31babbecd6fe..724637f15b4c 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -93,7 +93,7 @@ SvxPatternTabPage::SvxPatternTabPage(TabPageParent pParent, const SfxItemSet& rI
     , m_xCtlPixel(new SvxPixelCtl(this))
     , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pParent.GetFrameWeld()))
     , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_BACKGROUND_COLOR"), pParent.GetFrameWeld()))
-    , m_xPatternLB(new PresetListBox(m_xBuilder->weld_scrolled_window("patternpresetlistwin")))
+    , m_xPatternLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("patternpresetlistwin")))
     , m_xBtnAdd(m_xBuilder->weld_button("BTN_ADD"))
     , m_xBtnModify(m_xBuilder->weld_button("BTN_MODIFY"))
     , m_xCtlPixelWin(new weld::CustomWeld(*m_xBuilder, "CTL_PIXEL", *m_xCtlPixel))
@@ -437,7 +437,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl, weld::Button&, void)
 }
 
 
-IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, PresetListBox*, void)
+IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void)
 {
     size_t nPos = m_xPatternLB->GetSelectItemPos();
     sal_Int32 nId = m_xPatternLB->GetSelectedItemId();
@@ -479,7 +479,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, PresetListBox*, void)
     }
 }
 
-IMPL_LINK_NOARG(SvxPatternTabPage, ClickDeleteHdl_Impl, PresetListBox*, void)
+IMPL_LINK_NOARG(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void)
 {
     sal_uInt16 nId = m_xPatternLB->GetSelectedItemId();
     size_t nPos = m_xPatternLB->GetSelectItemPos();
diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx
index 888f93b86109..9a8a1fa4d118 100644
--- a/include/svx/SvxPresetListBox.hxx
+++ b/include/svx/SvxPresetListBox.hxx
@@ -27,13 +27,13 @@
 #include <svx/xtable.hxx>
 #include <tools/gen.hxx>
 
-class SVX_DLLPUBLIC PresetListBox : public SvtValueSet
+class SVX_DLLPUBLIC SvxPresetListBox : public SvtValueSet
 {
 private:
     sal_uInt32 nColCount;
     Size       aIconSize;
-    Link<PresetListBox*,void> maRenameHdl;
-    Link<PresetListBox*,void> maDeleteHdl;
+    Link<SvxPresetListBox*,void> maRenameHdl;
+    Link<SvxPresetListBox*,void> maDeleteHdl;
 
     void OnMenuItemSelected(const OString& rIdent);
 
@@ -41,18 +41,18 @@ private:
     void FillPresetListBoxImpl(ListType& pList, sal_uInt32 nStartIndex);
 
 public:
-    PresetListBox(std::unique_ptr<weld::ScrolledWindow> pWindow);
+    SvxPresetListBox(std::unique_ptr<weld::ScrolledWindow> pWindow);
 
     virtual void Resize() override;
     virtual bool ContextMenu(const Point& rPos) override;
     sal_uInt32 getColumnCount() const { return nColCount; }
     Size const & GetIconSize() const { return aIconSize; }
 
-    void SetRenameHdl( const Link<PresetListBox*,void>& rLink )
+    void SetRenameHdl( const Link<SvxPresetListBox*,void>& rLink )
     {
         maRenameHdl = rLink;
     }
-    void SetDeleteHdl( const Link<PresetListBox*,void>& rLink )
+    void SetDeleteHdl( const Link<SvxPresetListBox*,void>& rLink )
     {
         maDeleteHdl = rLink;
     }
@@ -62,10 +62,8 @@ public:
     void FillPresetListBox(XBitmapList& pList, sal_uInt32 nStartIndex = 1);
     void FillPresetListBox(XPatternList& pList, sal_uInt32 nStartIndex = 1);
     void DrawLayout();
-
 };
 
-
 #endif // INCLUDED_SVX_SVXPRESETLISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index 71f8e6514458..8230ccb17d88 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -26,7 +26,7 @@
 #include <vcl/menu.hxx>
 #include <vcl/popupmenuwindow.hxx>
 
-PresetListBox::PresetListBox(std::unique_ptr<weld::ScrolledWindow> pWindow)
+SvxPresetListBox::SvxPresetListBox(std::unique_ptr<weld::ScrolledWindow> pWindow)
     : SvtValueSet(std::move(pWindow))
     , nColCount(3)
     , aIconSize(60, 64)
@@ -35,7 +35,7 @@ PresetListBox::PresetListBox(std::unique_ptr<weld::ScrolledWindow> pWindow)
     SetExtraSpacing(4);
 }
 
-void PresetListBox::Resize()
+void SvxPresetListBox::Resize()
 {
     DrawLayout();
     WinBits aWinBits(GetStyle());
@@ -44,7 +44,7 @@ void PresetListBox::Resize()
     SvtValueSet::Resize();
 }
 
-bool PresetListBox::ContextMenu(const Point& rPos)
+bool SvxPresetListBox::ContextMenu(const Point& rPos)
 {
     const sal_uInt16 nIndex = GetSelectedItemId();
     if(nIndex > 0)
@@ -57,14 +57,14 @@ bool PresetListBox::ContextMenu(const Point& rPos)
     return false;
 }
 
-void PresetListBox::DrawLayout()
+void SvxPresetListBox::DrawLayout()
 {
     SetColCount(getColumnCount());
     SetLineCount(5);
 }
 
 template< typename ListType, typename EntryType >
-void PresetListBox::FillPresetListBoxImpl(ListType & pList, sal_uInt32 nStartIndex)
+void SvxPresetListBox::FillPresetListBoxImpl(ListType & pList, sal_uInt32 nStartIndex)
 {
     const Size aSize( GetIconSize() );
     BitmapEx aBitmap;
@@ -76,27 +76,27 @@ void PresetListBox::FillPresetListBoxImpl(ListType & pList, sal_uInt32 nStartInd
     }
 }
 
-void PresetListBox::FillPresetListBox(XGradientList& pList, sal_uInt32 nStartIndex)
+void SvxPresetListBox::FillPresetListBox(XGradientList& pList, sal_uInt32 nStartIndex)
 {
     FillPresetListBoxImpl< XGradientList, XGradientEntry>( pList, nStartIndex );
 }
 
-void PresetListBox::FillPresetListBox(XHatchList& pList, sal_uInt32 nStartIndex)
+void SvxPresetListBox::FillPresetListBox(XHatchList& pList, sal_uInt32 nStartIndex)
 {
     FillPresetListBoxImpl< XHatchList, XHatchEntry>( pList, nStartIndex );
 }
 
-void PresetListBox::FillPresetListBox(XBitmapList& pList, sal_uInt32 nStartIndex)
+void SvxPresetListBox::FillPresetListBox(XBitmapList& pList, sal_uInt32 nStartIndex)
 {
     FillPresetListBoxImpl< XBitmapList, XBitmapEntry >( pList, nStartIndex );
 }
 
-void PresetListBox::FillPresetListBox(XPatternList& pList, sal_uInt32 nStartIndex)
+void SvxPresetListBox::FillPresetListBox(XPatternList& pList, sal_uInt32 nStartIndex)
 {
     FillPresetListBoxImpl< XPatternList, XBitmapEntry >( pList, nStartIndex );
 }
 
-void PresetListBox::OnMenuItemSelected(const OString& rIdent)
+void SvxPresetListBox::OnMenuItemSelected(const OString& rIdent)
 {
     if (rIdent == "rename")
         maRenameHdl.Call(this);