diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-21 13:37:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-21 19:34:16 +0000 |
| commit | 599fab44ad2ca626f046b9e9e4924110950a897c (patch) | |
| tree | 4304f1e7f0ab68f88b105f5779b8ec619e176c12 /svx | |
| parent | da4c217ac49ff05e352c0e6e46a46a4e9a0b78cc (diff) | |
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>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/docrecovery.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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 |