hide ScopedPtr::reset and add disposeAndClear

Change-Id: I55d6e789abd408b8478a2b9ae141d8899af2c309
Reviewed-on: https://gerrit.libreoffice.org/18745
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 13 insertions, 13 deletions

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 1495984f4ea8..e18be0f9cdbe 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1045,17 +1045,17 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 
         if(pPageInfo->m_nPageId == RID_SVXPAGE_COLOR)
         {
-            pPageInfo->m_pPage.reset( ::CreateGeneralTabPage(
+            pPageInfo->m_pPage.disposeAndReset( ::CreateGeneralTabPage(
                 pPageInfo->m_nPageId, pTabBox, *pColorPageItemSet ) );
             mpColorPage = static_cast<SvxColorTabPage*>(pPageInfo->m_pPage.get());
             mpColorPage->SetupForViewFrame( SfxViewFrame::Current() );
         }
         else
         {
-            pPageInfo->m_pPage.reset( ::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet ) );
+            pPageInfo->m_pPage.disposeAndReset( ::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet ) );
 
             if(!pPageInfo->m_pPage && pGroupInfo->m_pModule)
-                pPageInfo->m_pPage.reset( pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet) );
+                pPageInfo->m_pPage.disposeAndReset( pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet) );
 
         }
 
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 462e9abf9fff..22fa3d32056e 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -528,7 +528,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void)
 
         if( !pWarnBox )
         {
-            pWarnBox.reset(VclPtr<MessageDialog>::Create( GetParentDialog()
+            pWarnBox.disposeAndReset(VclPtr<MessageDialog>::Create( GetParentDialog()
                                         ,"DuplicateNameDialog"
                                         ,"cui/ui/queryduplicatedialog.ui"));
         }
@@ -538,7 +538,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void)
     }
 
     pDlg.reset();
-    pWarnBox.reset();
+    pWarnBox.disposeAndClear();
 
     if( !nError )
     {
@@ -636,7 +636,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl_Impl, Button*, void)
 
                 if( !pWarnBox )
                 {
-                    pWarnBox.reset(VclPtr<MessageDialog>::Create( GetParentDialog()
+                    pWarnBox.disposeAndReset(VclPtr<MessageDialog>::Create( GetParentDialog()
                                                  ,"DuplicateNameDialog"
                                                  ,"cui/ui/queryduplicatedialog.ui"));
                 }
@@ -646,7 +646,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl_Impl, Button*, void)
             }
 
             pDlg.reset();
-            pWarnBox.reset();
+            pWarnBox.disposeAndClear();
 
             if( !nError )
             {
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 53c04b00966d..be9c42beba58 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -736,7 +736,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void)
 
         if( !pWarnBox )
         {
-            pWarnBox.reset(VclPtr<MessageDialog>::Create( GetParentDialog()
+            pWarnBox.disposeAndReset(VclPtr<MessageDialog>::Create( GetParentDialog()
                                         ,"DuplicateNameDialog"
                                         ,"cui/ui/queryduplicatedialog.ui"));
         }
@@ -746,7 +746,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void)
     }
 
     pDlg.reset();
-    pWarnBox.reset();
+    pWarnBox.disposeAndClear();
 
     if (!nError)
     {
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 0396464d6fca..7bf1bdb2dc7a 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -476,7 +476,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void)
 
         if( !pWarnBox )
         {
-            pWarnBox.reset(VclPtr<MessageDialog>::Create( GetParentDialog()
+            pWarnBox.disposeAndReset(VclPtr<MessageDialog>::Create( GetParentDialog()
                                         ,"DuplicateNameDialog"
                                         ,"cui/ui/queryduplicatedialog.ui"));
         }
@@ -485,7 +485,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void)
             break;
     }
     pDlg.reset();
-    pWarnBox.reset();
+    pWarnBox.disposeAndClear();
 
     if( !nError )
     {
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index cbe50521cd09..d528bd85dc93 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -518,7 +518,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void)
 
         if( !pWarnBox )
         {
-            pWarnBox.reset(VclPtr<MessageDialog>::Create( GetParentDialog()
+            pWarnBox.disposeAndReset(VclPtr<MessageDialog>::Create( GetParentDialog()
                                          ,"DuplicateNameDialog"
                                          ,"cui/ui/queryduplicatedialog.ui"));
         }
@@ -527,7 +527,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void)
             break;
     }
     pDlg.reset();
-    pWarnBox.reset();
+    pWarnBox.disposeAndClear();
 
     if( !nError )
     {