From 599fab44ad2ca626f046b9e9e4924110950a897c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 21 Sep 2015 13:37:17 +0100 Subject: hide ScopedPtr::reset and add disposeAndClear MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I55d6e789abd408b8478a2b9ae141d8899af2c309 Reviewed-on: https://gerrit.libreoffice.org/18745 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svx/source/dialog/docrecovery.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svx') diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 84a8a0ef91ce..559f1385c890 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -682,7 +682,7 @@ IMPL_LINK_NOARG_TYPED(SaveDialog, OKButtonHdl, Button*, void) // start crash-save with progress ScopedVclPtrInstance< SaveProgressDialog > pProgress(this, m_pCore); short nResult = pProgress->Execute(); - pProgress.reset(); + pProgress.disposeAndClear(); // if "CANCEL" => return "CANCEL" // if "OK" => "AUTOLUNCH" always ! @@ -993,7 +993,7 @@ short RecoveryDialog::execute() nRet = pBrokenRecoveryDialog->Execute(); sSaveDir = pBrokenRecoveryDialog->getSaveDirURL(); } - pBrokenRecoveryDialog.reset(); + pBrokenRecoveryDialog.disposeAndClear(); switch(nRet) { @@ -1065,7 +1065,7 @@ short RecoveryDialog::execute() nRet = pBrokenRecoveryDialog->Execute(); sSaveDir = pBrokenRecoveryDialog->getSaveDirURL(); } - pBrokenRecoveryDialog.reset(); + pBrokenRecoveryDialog.disposeAndClear(); // Possible states: // a) nRet == DLG_RET_UNKNOWN -- cgit