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>

7 files changed, 27 insertions, 27 deletions

diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index c25a1ff7eb08..9807e760e455 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -39,18 +39,18 @@ SwEnvPrtPage::SwEnvPrtPage(TabPageParent pParent, const SfxItemSet& rSet)
     , m_xDownField(m_xBuilder->weld_metric_spin_button("down", FUNIT_CM))
     , m_xPrinterInfo(m_xBuilder->weld_label("printername"))
     , m_xPrtSetup(m_xBuilder->weld_button("setup"))
-    , m_aIdsL { std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("horileftl")),
-                std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("horicenterl")),
-                std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("horirightl")),
-                std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("vertleftl")),
-                std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("vertcenterl")),
-                std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("vertrightl")) }
-    , m_aIdsU { std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("horileftu")),
-                std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("horicenteru")),
-                std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("horirightu")),
-                std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("vertleftu")),
-                std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("vertcenteru")),
-                std::unique_ptr<weld::RadioButton>(m_xBuilder->weld_radio_button("vertrightu")) }
+    , m_aIdsL { m_xBuilder->weld_radio_button("horileftl"),
+                m_xBuilder->weld_radio_button("horicenterl"),
+                m_xBuilder->weld_radio_button("horirightl"),
+                m_xBuilder->weld_radio_button("vertleftl"),
+                m_xBuilder->weld_radio_button("vertcenterl"),
+                m_xBuilder->weld_radio_button("vertrightl") }
+    , m_aIdsU { m_xBuilder->weld_radio_button("horileftu"),
+                m_xBuilder->weld_radio_button("horicenteru"),
+                m_xBuilder->weld_radio_button("horirightu"),
+                m_xBuilder->weld_radio_button("vertleftu"),
+                m_xBuilder->weld_radio_button("vertcenteru"),
+                m_xBuilder->weld_radio_button("vertrightu") }
 {
     SetExchangeSupport();
 
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 81a76489fb10..dd1d887723e4 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1517,7 +1517,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
         m_aFixedTexts.back()->show();
         if( AUTH_FIELD_AUTHORITY_TYPE == aCurInfo.nToxField )
         {
-            m_xTypeListBox.reset(m_aBuilders.back()->weld_combo_box_text("listbox"));
+            m_xTypeListBox = m_aBuilders.back()->weld_combo_box_text("listbox");
             if (bLeft)
                 m_aOrigContainers.back()->move(m_xTypeListBox.get(), m_xLeft.get());
             else
@@ -1539,7 +1539,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
         }
         else if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField && !m_bNewEntryMode)
         {
-            m_xIdentifierBox.reset(m_aBuilders.back()->weld_combo_box_text("combobox"));
+            m_xIdentifierBox = m_aBuilders.back()->weld_combo_box_text("combobox");
             if (bLeft)
                 m_aOrigContainers.back()->move(m_xIdentifierBox.get(), m_xLeft.get());
             else
@@ -1567,7 +1567,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
         }
         else
         {
-            pEdits[nIndex].reset(m_aBuilders.back()->weld_entry("entry"));
+            pEdits[nIndex] = m_aBuilders.back()->weld_entry("entry");
             if (bLeft)
                 m_aOrigContainers.back()->move(pEdits[nIndex].get(), m_xLeft.get());
             else
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 1690504aff99..ba617f7f8177 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -713,12 +713,12 @@ SwTableColumnPage::SwTableColumnPage(TabPageParent pParent, const SfxItemSet& rS
                     m_xBuilder->weld_metric_spin_button("width4", FUNIT_CM),
                     m_xBuilder->weld_metric_spin_button("width5", FUNIT_CM),
                     m_xBuilder->weld_metric_spin_button("width6", FUNIT_CM) }
-    , m_aTextArr { std::unique_ptr<weld::Label>(m_xBuilder->weld_label("1")),
-                   std::unique_ptr<weld::Label>(m_xBuilder->weld_label("2")),
-                   std::unique_ptr<weld::Label>(m_xBuilder->weld_label("3")),
-                   std::unique_ptr<weld::Label>(m_xBuilder->weld_label("4")),
-                   std::unique_ptr<weld::Label>(m_xBuilder->weld_label("5")),
-                   std::unique_ptr<weld::Label>(m_xBuilder->weld_label("6")) }
+    , m_aTextArr { m_xBuilder->weld_label("1"),
+                   m_xBuilder->weld_label("2"),
+                   m_xBuilder->weld_label("3"),
+                   m_xBuilder->weld_label("4"),
+                   m_xBuilder->weld_label("5"),
+                   m_xBuilder->weld_label("6") }
     , m_xModifyTableCB(m_xBuilder->weld_check_button("adaptwidth"))
     , m_xProportionalCB(m_xBuilder->weld_check_button("adaptcolumns"))
     , m_xSpaceFT(m_xBuilder->weld_label("spaceft"))
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)