diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-18 15:05:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-20 08:19:48 +0200 |
| commit | 0f34e96a5ce68a3039f65cd0f896b33f2d20af5f (patch) | |
| tree | 2ea420b96865e6fe69bbbbc1915d3b1ac4c1e808 /sw/source/uibase | |
| parent | f05b0a6aaf8af5d78f9cad8bb953228cb0ce09f1 (diff) | |
return weld widgets by std::unique_ptr from builder
Change-Id: I20c007b13dae2d1155034711ad1ad48bfdfd0ba8
Reviewed-on: https://gerrit.libreoffice.org/59288
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/inc/numberingtypelistbox.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/prcntfld.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/misc/numberingtypelistbox.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/prcntfld.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx index 030196ccbb24..ed704e54341d 100644 --- a/sw/source/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/uibase/inc/numberingtypelistbox.hxx @@ -47,7 +47,7 @@ class SW_DLLPUBLIC SwNumberingTypeListBox std::unique_ptr<SwNumberingTypeListBox_Impl> m_xImpl; public: - SwNumberingTypeListBox(weld::ComboBoxText* pWidget); + SwNumberingTypeListBox(std::unique_ptr<weld::ComboBoxText> pWidget); ~SwNumberingTypeListBox(); void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_xWidget->connect_changed(rLink); } diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx index 5ee2a6f2d088..20aa83ae21af 100644 --- a/sw/source/uibase/inc/prcntfld.hxx +++ b/sw/source/uibase/inc/prcntfld.hxx @@ -109,7 +109,7 @@ class SW_DLLPUBLIC SwPercentField public: - SwPercentField(weld::MetricSpinButton* pControl); + SwPercentField(std::unique_ptr<weld::MetricSpinButton> pControl); const weld::MetricSpinButton* get() const { return m_pField.get(); } weld::MetricSpinButton* get() { return m_pField.get(); } void connect_value_changed(const Link<weld::MetricSpinButton&, void>& rLink) { m_pField->connect_value_changed(rLink); } diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 1f314adfeac0..5f824d95a044 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -38,8 +38,8 @@ struct SwNumberingTypeListBox_Impl uno::Reference<text::XNumberingTypeInfo> xInfo; }; -SwNumberingTypeListBox::SwNumberingTypeListBox(weld::ComboBoxText* pWidget) - : m_xWidget(pWidget) +SwNumberingTypeListBox::SwNumberingTypeListBox(std::unique_ptr<weld::ComboBoxText> pWidget) + : m_xWidget(std::move(pWidget)) , m_xImpl(new SwNumberingTypeListBox_Impl) { uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); diff --git a/sw/source/uibase/utlui/prcntfld.cxx b/sw/source/uibase/utlui/prcntfld.cxx index 76715f8c0d28..2375d60c4d16 100644 --- a/sw/source/uibase/utlui/prcntfld.cxx +++ b/sw/source/uibase/utlui/prcntfld.cxx @@ -279,8 +279,8 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e return MetricField::ConvertValue(nValue, 0, nOldDigits, eInUnit, eOutUnit); } -SwPercentField::SwPercentField(weld::MetricSpinButton* pControl) - : m_pField(pControl) +SwPercentField::SwPercentField(std::unique_ptr<weld::MetricSpinButton> pControl) + : m_pField(std::move(pControl)) , nOldMax(0) , nOldMin(0) , nLastPercent(-1) |