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>

12 files changed, 41 insertions, 41 deletions

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 1f1f469dfc82..20d5cc11bd4f 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -62,9 +62,9 @@ FactoryFunction SvxShowCharSet::GetUITestFactory() const
     return SvxShowCharSetUIObject::create;
 }
 
-SvxShowCharSet::SvxShowCharSet(weld::ScrolledWindow* pScrolledWindow, const VclPtr<VirtualDevice>& rVirDev)
+SvxShowCharSet::SvxShowCharSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow, const VclPtr<VirtualDevice>& rVirDev)
     : mxVirDev(rVirDev)
-    , mxScrollArea(pScrolledWindow)
+    , mxScrollArea(std::move(pScrolledWindow))
     , mxContext(comphelper::getProcessComponentContext())
     , nX(0)
     , nY(0)
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 3ba0bfb9ffd7..1fe8e3e9bab1 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -71,23 +71,23 @@ CompressGraphicsDialog::~CompressGraphicsDialog()
 
 void CompressGraphicsDialog::Initialize()
 {
-    m_xLabelGraphicType.reset(m_xBuilder->weld_label("label-graphic-type"));
-    m_xFixedText2.reset(m_xBuilder->weld_label("label-original-size"));
-    m_xFixedText3.reset(m_xBuilder->weld_label("label-view-size"));
-    m_xFixedText5.reset(m_xBuilder->weld_label("label-image-capacity"));
-    m_xFixedText6.reset(m_xBuilder->weld_label("label-new-capacity"));
-    m_xJpegCompRB.reset(m_xBuilder->weld_radio_button("radio-jpeg"));
-    m_xCompressionMF.reset(m_xBuilder->weld_spin_button("spin-compression"));
-    m_xCompressionSlider.reset(m_xBuilder->weld_scale("scale-compression"));
-    m_xLosslessRB.reset(m_xBuilder->weld_radio_button("radio-lossless"));
-    m_xQualityMF.reset(m_xBuilder->weld_spin_button("spin-quality"));
-    m_xQualitySlider.reset(m_xBuilder->weld_scale("scale-quality"));
-    m_xReduceResolutionCB.reset(m_xBuilder->weld_check_button("checkbox-reduce-resolution"));
-    m_xMFNewWidth.reset(m_xBuilder->weld_spin_button("spin-new-width"));
-    m_xMFNewHeight.reset(m_xBuilder->weld_spin_button("spin-new-height"));
-    m_xResolutionLB.reset(m_xBuilder->weld_combo_box_text("combo-resolution"));
-    m_xBtnCalculate.reset(m_xBuilder->weld_button("calculate"));
-    m_xInterpolationCombo.reset(m_xBuilder->weld_combo_box_text("interpolation-method-combo"));
+    m_xLabelGraphicType = m_xBuilder->weld_label("label-graphic-type");
+    m_xFixedText2 = m_xBuilder->weld_label("label-original-size");
+    m_xFixedText3 = m_xBuilder->weld_label("label-view-size");
+    m_xFixedText5 = m_xBuilder->weld_label("label-image-capacity");
+    m_xFixedText6 = m_xBuilder->weld_label("label-new-capacity");
+    m_xJpegCompRB = m_xBuilder->weld_radio_button("radio-jpeg");
+    m_xCompressionMF = m_xBuilder->weld_spin_button("spin-compression");
+    m_xCompressionSlider = m_xBuilder->weld_scale("scale-compression");
+    m_xLosslessRB = m_xBuilder->weld_radio_button("radio-lossless");
+    m_xQualityMF = m_xBuilder->weld_spin_button("spin-quality");
+    m_xQualitySlider = m_xBuilder->weld_scale("scale-quality");
+    m_xReduceResolutionCB = m_xBuilder->weld_check_button("checkbox-reduce-resolution");
+    m_xMFNewWidth = m_xBuilder->weld_spin_button("spin-new-width");
+    m_xMFNewHeight = m_xBuilder->weld_spin_button("spin-new-height");
+    m_xResolutionLB = m_xBuilder->weld_combo_box_text("combo-resolution");
+    m_xBtnCalculate = m_xBuilder->weld_button("calculate");
+    m_xInterpolationCombo = m_xBuilder->weld_combo_box_text("interpolation-method-combo");
 
     m_xInterpolationCombo->set_active_text("Lanczos");
 
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 955586a23bbb..7ca86e2e132c 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -154,8 +154,8 @@ SvxHFPage::SvxHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 n
     //swap header <-> footer in UI
     if (nId == SID_ATTR_PAGE_FOOTERSET)
     {
-        m_xPageLbl.reset(m_xBuilder->weld_label("labelFooterFormat"));
-        m_xTurnOnBox.reset(m_xBuilder->weld_check_button("checkFooterOn"));
+        m_xPageLbl = m_xBuilder->weld_label("labelFooterFormat");
+        m_xTurnOnBox = m_xBuilder->weld_check_button("checkFooterOn");
 
         /* Set custom HIDs for the Footer help page (shared/01/05040400.xhp)
         otherwise it would display the same extended help
@@ -172,8 +172,8 @@ SvxHFPage::SvxHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 n
     }
     else //Header
     {
-        m_xPageLbl.reset(m_xBuilder->weld_label("labelHeaderFormat"));
-        m_xTurnOnBox.reset(m_xBuilder->weld_check_button("checkHeaderOn"));
+        m_xPageLbl = m_xBuilder->weld_label("labelHeaderFormat");
+        m_xTurnOnBox = m_xBuilder->weld_check_button("checkHeaderOn");
     }
     m_xTurnOnBox->show();
     m_xPageLbl->show();
diff --git a/svx/source/dialog/hexcolorcontrol.cxx b/svx/source/dialog/hexcolorcontrol.cxx
index afb910712b9b..71e69a5fe618 100644
--- a/svx/source/dialog/hexcolorcontrol.cxx
+++ b/svx/source/dialog/hexcolorcontrol.cxx
@@ -21,8 +21,8 @@
 
 namespace weld {
 
-HexColorControl::HexColorControl(weld::Entry* pEntry)
-    : m_xEntry(pEntry)
+HexColorControl::HexColorControl(std::unique_ptr<weld::Entry> pEntry)
+    : m_xEntry(std::move(pEntry))
 {
     m_xEntry->set_max_length(6);
     m_xEntry->set_width_chars(6);
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 7c9511cff437..28960c0a6731 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -754,8 +754,8 @@ IMPL_LINK(LanguageBox, ChangeHdl, weld::ComboBoxText&, rControl, void)
     }
 }
 
-LanguageBox::LanguageBox(weld::ComboBoxText* pControl)
-    : m_xControl(pControl)
+LanguageBox::LanguageBox(std::unique_ptr<weld::ComboBoxText> pControl)
+    : m_xControl(std::move(pControl))
     , m_aAllString(SvxResId(RID_SVXSTR_LANGUAGE_ALL))
     , m_bHasLangNone(false)
     , m_bLangNoneIsLangAll(false)
diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx
index f42b9c1ca84b..1c8b71fee63e 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -74,8 +74,8 @@ Size PageNumberListBox::GetOptimalSize() const
     return Size(150, ListBox::GetOptimalSize().Height());
 }
 
-SvxPageNumberListBox::SvxPageNumberListBox(weld::ComboBoxText* pControl)
-    : m_xControl(pControl)
+SvxPageNumberListBox::SvxPageNumberListBox(std::unique_ptr<weld::ComboBoxText> pControl)
+    : m_xControl(std::move(pControl))
 {
     m_xControl->set_size_request(150, -1);
 
diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx
index 8f9807f663c5..5e52dc2a07d0 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -84,8 +84,8 @@ Size PaperSizeListBox::GetOptimalSize() const
     return Size(150, ListBox::GetOptimalSize().Height());
 }
 
-SvxPaperSizeListBox::SvxPaperSizeListBox(weld::ComboBoxText* pControl)
-    : m_xControl(pControl)
+SvxPaperSizeListBox::SvxPaperSizeListBox(std::unique_ptr<weld::ComboBoxText> pControl)
+    : m_xControl(std::move(pControl))
 {
     m_xControl->set_size_request(150, -1);
 }
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index b0ffcb61cefd..53648d712ae3 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -40,8 +40,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxRelativeField(VclPtr<vcl::Window> &
                                             eUnit);
 }
 
-RelativeField::RelativeField(weld::MetricSpinButton* pControl)
-    : m_xSpinButton(pControl)
+RelativeField::RelativeField(std::unique_ptr<weld::MetricSpinButton> pControl)
+    : m_xSpinButton(std::move(pControl))
     , nRelMin(0)
     , nRelMax(0)
     , bRelativeMode(false)
diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx
index 74a90959dfc3..b7361e8dce38 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -44,8 +44,8 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
 
-SvxSearchCharSet::SvxSearchCharSet(weld::ScrolledWindow* pScrolledWindow, const VclPtr<VirtualDevice>& rVirDev)
-    : SvxShowCharSet(pScrolledWindow, rVirDev)
+SvxSearchCharSet::SvxSearchCharSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow, const VclPtr<VirtualDevice>& rVirDev)
+    : SvxShowCharSet(std::move(pScrolledWindow), rVirDev)
     , nCount(0)
 {
 }
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 857dfe74e4c1..6e8a7d974119 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -224,8 +224,8 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc )
         SelectEntryPos( nAt );
 }
 
-TextEncodingBox::TextEncodingBox(weld::ComboBoxText* pControl)
-    : m_xControl(pControl)
+TextEncodingBox::TextEncodingBox(std::unique_ptr<weld::ComboBoxText> pControl)
+    : m_xControl(std::move(pControl))
 {
     m_xControl->make_sorted();
 }
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx
index d7622100677a..ef7a6c5393b6 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -29,8 +29,8 @@ SvxColorValueSet::SvxColorValueSet(vcl::Window* _pParent, WinBits nWinStyle)
     SetEdgeBlending(true);
 }
 
-ColorValueSet::ColorValueSet(weld::ScrolledWindow* pWindow)
-    : SvtValueSet(pWindow)
+ColorValueSet::ColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow)
+    : SvtValueSet(std::move(pWindow))
 {
     SetEdgeBlending(true);
 }
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 34533351ac3e..68282f45acd6 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3734,8 +3734,8 @@ void SvxColorListBox::SelectEntry(const Color& rColor)
     ShowPreview(m_aSelectedColor);
 }
 
-ColorListBox::ColorListBox(weld::MenuButton* pControl, weld::Window* pTopLevel, bool bInterimBuilder)
-    : m_xButton(pControl)
+ColorListBox::ColorListBox(std::unique_ptr<weld::MenuButton> pControl, weld::Window* pTopLevel, bool bInterimBuilder)
+    : m_xButton(std::move(pControl))
     , m_pTopLevel(pTopLevel)
     , m_aColorWrapper(this)
     , m_aAutoDisplayColor(Application::GetSettings().GetStyleSettings().GetDialogColor())