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>

3 files changed, 22 insertions, 22 deletions

diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 54fb29dabf54..cf31b01d5d60 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -357,20 +357,20 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog(weld::Window *pParent
 
 void SfxInsertFloatingFrameDialog::Init()
 {
-    m_xEDName.reset(m_xBuilder->weld_entry("edname"));
-    m_xEDURL.reset(m_xBuilder->weld_entry("edurl"));
-    m_xBTOpen.reset(m_xBuilder->weld_button("buttonbrowse"));
-    m_xRBScrollingOn.reset(m_xBuilder->weld_radio_button("scrollbaron"));
-    m_xRBScrollingOff.reset(m_xBuilder->weld_radio_button("scrollbaroff"));
-    m_xRBScrollingAuto.reset(m_xBuilder->weld_radio_button("scrollbarauto"));
-    m_xRBFrameBorderOn.reset(m_xBuilder->weld_radio_button("borderon"));
-    m_xRBFrameBorderOff.reset(m_xBuilder->weld_radio_button("borderoff"));
-    m_xFTMarginWidth.reset(m_xBuilder->weld_label("widthlabel"));
-    m_xNMMarginWidth.reset(m_xBuilder->weld_spin_button("width"));
-    m_xCBMarginWidthDefault.reset(m_xBuilder->weld_check_button("defaultwidth"));
-    m_xFTMarginHeight.reset(m_xBuilder->weld_label("heightlabel"));
-    m_xNMMarginHeight.reset(m_xBuilder->weld_spin_button("height"));
-    m_xCBMarginHeightDefault.reset(m_xBuilder->weld_check_button("defaultheight"));
+    m_xEDName = m_xBuilder->weld_entry("edname");
+    m_xEDURL = m_xBuilder->weld_entry("edurl");
+    m_xBTOpen = m_xBuilder->weld_button("buttonbrowse");
+    m_xRBScrollingOn = m_xBuilder->weld_radio_button("scrollbaron");
+    m_xRBScrollingOff = m_xBuilder->weld_radio_button("scrollbaroff");
+    m_xRBScrollingAuto = m_xBuilder->weld_radio_button("scrollbarauto");
+    m_xRBFrameBorderOn = m_xBuilder->weld_radio_button("borderon");
+    m_xRBFrameBorderOff = m_xBuilder->weld_radio_button("borderoff");
+    m_xFTMarginWidth = m_xBuilder->weld_label("widthlabel");
+    m_xNMMarginWidth = m_xBuilder->weld_spin_button("width");
+    m_xCBMarginWidthDefault = m_xBuilder->weld_check_button("defaultwidth");
+    m_xFTMarginHeight = m_xBuilder->weld_label("heightlabel");
+    m_xNMMarginHeight = m_xBuilder->weld_spin_button("height");
+    m_xCBMarginHeightDefault = m_xBuilder->weld_check_button("defaultheight");
 
     Link<weld::Button&, void> aLink(LINK(this, SfxInsertFloatingFrameDialog, CheckHdl));
     m_xCBMarginWidthDefault->connect_clicked(aLink);
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index a746afe5117f..c427c10cd9dd 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -312,17 +312,17 @@ public:
         if (nRID == EID_NUM_PRE_BREAK)
         {
             m_xBeforeFrame->show();
-            m_xBreakNF.reset(m_xBuilder->weld_spin_button("beforebreak"));
+            m_xBreakNF = m_xBuilder->weld_spin_button("beforebreak");
         }
         else if(nRID == EID_NUM_POST_BREAK)
         {
             m_xAfterFrame->show();
-            m_xBreakNF.reset(m_xBuilder->weld_spin_button("afterbreak"));
+            m_xBreakNF = m_xBuilder->weld_spin_button("afterbreak");
         }
         else if(nRID == EID_NUM_MIN_WORDLEN)
         {
             m_xMinimalFrame->show();
-            m_xBreakNF.reset(m_xBuilder->weld_spin_button("wordlength"));
+            m_xBreakNF = m_xBuilder->weld_spin_button("wordlength");
         }
     }
 
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index d3c9479ab748..a9a368f1a560 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -414,11 +414,11 @@ SvxSlantTabPage::SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAtt
 {
     for (int i = 0; i < 2; ++i)
     {
-        m_aControlGroups[i].reset(m_xBuilder->weld_widget("controlgroups" + OString::number(i+1)));
-        m_aControlGroupX[i].reset(m_xBuilder->weld_widget("controlgroupx" + OString::number(i+1)));
-        m_aControlX[i].reset(m_xBuilder->weld_metric_spin_button("controlx" + OString::number(i+1), FUNIT_CM));
-        m_aControlGroupY[i].reset(m_xBuilder->weld_widget("controlgroupy" + OString::number(i+1)));
-        m_aControlY[i].reset(m_xBuilder->weld_metric_spin_button("controly" + OString::number(i+1), FUNIT_CM));
+        m_aControlGroups[i] = m_xBuilder->weld_widget("controlgroups" + OString::number(i+1));
+        m_aControlGroupX[i] = m_xBuilder->weld_widget("controlgroupx" + OString::number(i+1));
+        m_aControlX[i] = m_xBuilder->weld_metric_spin_button("controlx" + OString::number(i+1), FUNIT_CM);
+        m_aControlGroupY[i] = m_xBuilder->weld_widget("controlgroupy" + OString::number(i+1));
+        m_aControlY[i] = m_xBuilder->weld_metric_spin_button("controly" + OString::number(i+1), FUNIT_CM);
     }
 
     // this page needs ExchangeSupport