summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx2
-rw-r--r--sw/source/ui/fldui/flddb.cxx2
-rw-r--r--sw/source/ui/fldui/flddb.hxx2
-rw-r--r--sw/source/uibase/inc/dbinsdlg.hxx2
-rw-r--r--sw/source/uibase/inc/numfmtlb.hxx4
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx12
6 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index dc595d295667..a78e7acd2601 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -200,7 +200,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
, m_xFormatFrame(m_xBuilder->weld_frame("formatframe"))
, m_xRbDbFormatFromDb(m_xBuilder->weld_radio_button("fromdatabase"))
, m_xRbDbFormatFromUsr(m_xBuilder->weld_radio_button("userdefined"))
- , m_xLbDbFormatFromUsr(new SwNumFormatListBox(m_xBuilder->weld_combo_box("numformat")))
+ , m_xLbDbFormatFromUsr(new NumFormatListBox(m_xBuilder->weld_combo_box("numformat")))
, m_xIbDbcolToEdit(m_xBuilder->weld_button("toedit"))
, m_xEdDbText(m_xBuilder->weld_text_view("textview"))
, m_xFtDbParaColl(m_xBuilder->weld_label("parastylelabel"))
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 1dc625e19298..fc4dbde5f978 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -46,7 +46,7 @@ SwFieldDBPage::SwFieldDBPage(weld::Container* pPage, weld::DialogController* pCo
, m_xValueED(m_xBuilder->weld_entry("recnumber"))
, m_xDBFormatRB(m_xBuilder->weld_radio_button("fromdatabasecb"))
, m_xNewFormatRB(m_xBuilder->weld_radio_button("userdefinedcb"))
- , m_xNumFormatLB(new SwNumFormatListBox(m_xBuilder->weld_combo_box("numformat")))
+ , m_xNumFormatLB(new NumFormatListBox(m_xBuilder->weld_combo_box("numformat")))
, m_xFormatLB(m_xBuilder->weld_combo_box("format"))
, m_xFormat(m_xBuilder->weld_widget("formatframe"))
{
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index ad16a62863bf..ed499cbe9755 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -42,7 +42,7 @@ class SwFieldDBPage : public SwFieldPage
std::unique_ptr<weld::Entry> m_xValueED;
std::unique_ptr<weld::RadioButton> m_xDBFormatRB;
std::unique_ptr<weld::RadioButton> m_xNewFormatRB;
- std::unique_ptr<SwNumFormatListBox> m_xNumFormatLB;
+ std::unique_ptr<NumFormatListBox> m_xNumFormatLB;
std::unique_ptr<weld::ComboBox> m_xFormatLB;
std::unique_ptr<weld::Widget> m_xFormat;
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index 37053e036596..df31a2135ec7 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -102,7 +102,7 @@ class SwInsertDBColAutoPilot : public SfxDialogController, public utl::ConfigIte
std::unique_ptr<weld::Frame> m_xFormatFrame;
std::unique_ptr<weld::RadioButton> m_xRbDbFormatFromDb;
std::unique_ptr<weld::RadioButton> m_xRbDbFormatFromUsr;
- std::unique_ptr<SwNumFormatListBox> m_xLbDbFormatFromUsr;
+ std::unique_ptr<NumFormatListBox> m_xLbDbFormatFromUsr;
// Page Text/Field
std::unique_ptr<weld::Button> m_xIbDbcolToEdit;
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index cdcba993256c..13d9c0cc2c46 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -71,7 +71,7 @@ public:
virtual ~SwNumFormatBase() {}
};
-class SW_DLLPUBLIC SwNumFormatListBox : public SwNumFormatBase
+class SW_DLLPUBLIC NumFormatListBox : public SwNumFormatBase
{
std::unique_ptr<weld::ComboBox> mxControl;
@@ -80,7 +80,7 @@ class SW_DLLPUBLIC SwNumFormatListBox : public SwNumFormatBase
virtual void Init() override;
public:
- SwNumFormatListBox(std::unique_ptr<weld::ComboBox> xControl);
+ NumFormatListBox(std::unique_ptr<weld::ComboBox> xControl);
virtual sal_uInt32 GetFormat() const override;
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index bd70d7b8ae97..3fe4c0ef8fa2 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -129,7 +129,7 @@ SwNumFormatBase::SwNumFormatBase()
{
}
-SwNumFormatListBox::SwNumFormatListBox(std::unique_ptr<weld::ComboBox> xControl)
+NumFormatListBox::NumFormatListBox(std::unique_ptr<weld::ComboBox> xControl)
: mxControl(std::move(xControl))
{
Init();
@@ -154,11 +154,11 @@ void SwNumFormatBase::Init()
SetDefFormat(nDefFormat);
}
-void SwNumFormatListBox::Init()
+void NumFormatListBox::Init()
{
SwNumFormatBase::Init();
- mxControl->connect_changed(LINK(this, SwNumFormatListBox, SelectHdl));
+ mxControl->connect_changed(LINK(this, NumFormatListBox, SelectHdl));
}
void SwNumFormatTreeView::Init()
@@ -361,7 +361,7 @@ void SwNumFormatBase::SetDefFormat(const sal_uInt32 nDefaultFormat)
nDefFormat = GetFormat();
}
-sal_uInt32 SwNumFormatListBox::GetFormat() const
+sal_uInt32 NumFormatListBox::GetFormat() const
{
return mxControl->get_active_id().toUInt32();
}
@@ -447,7 +447,7 @@ void SwNumFormatBase::CallSelectHdl()
}
-IMPL_LINK_NOARG(SwNumFormatListBox, SelectHdl, weld::ComboBox&, void)
+IMPL_LINK_NOARG(NumFormatListBox, SelectHdl, weld::ComboBox&, void)
{
CallSelectHdl();
}
@@ -463,7 +463,7 @@ void SwNumFormatBase::clear()
nCurrFormatType = SvNumFormatType::ALL;
}
-void SwNumFormatListBox::clear()
+void NumFormatListBox::clear()
{
mxControl->clear();
SwNumFormatBase::clear();