diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-07 12:36:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-19 07:13:46 +0100 |
| commit | 9ee96d942603ff45370558c55ff989700b64045e (patch) | |
| tree | c6355838188e242f0788f4541794ee3755a4f7ef /fpicker/source/office/iodlg.cxx | |
| parent | e5fe9cbb421dfc0f373e5ea56c93aab2a149ddcc (diff) | |
loplugin:useuniqueptr in filepicker
Change-Id: I367bea33bdb9ea3132d3ed079a16b516498b4fcc
Reviewed-on: https://gerrit.libreoffice.org/49947
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'fpicker/source/office/iodlg.cxx')
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index f8b5e1dd5d7f..873b5ccd2f76 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -119,7 +119,7 @@ namespace OUString getMostCurrentFilter( std::unique_ptr<SvtExpFileDlg_Impl> const & pImpl ) { assert( pImpl && "invalid impl pointer" ); - const SvtFileDialogFilter_Impl* pFilter = pImpl->_pUserFilter; + const SvtFileDialogFilter_Impl* pFilter = pImpl->_pUserFilter.get(); if ( !pFilter ) pFilter = pImpl->GetCurFilter(); @@ -768,8 +768,7 @@ IMPL_LINK_NOARG( SvtFileDialog, NewFolderHdl_Impl, Button*, void) void SvtFileDialog::createNewUserFilter( const OUString& _rNewFilter ) { // delete the old user filter and create a new one - DELETEZ( pImpl->_pUserFilter ); - pImpl->_pUserFilter = new SvtFileDialogFilter_Impl( _rNewFilter, _rNewFilter ); + pImpl->_pUserFilter.reset( new SvtFileDialogFilter_Impl( _rNewFilter, _rNewFilter ) ); // remember the extension bool bIsAllFiles = _rNewFilter == FILEDIALOG_FILTER_ALL; @@ -910,7 +909,7 @@ void SvtFileDialog::OpenHdl_Impl(void const * pVoid) // MBA->PB: ?! if ( aFileName.isEmpty() && pVoid == pImpl->_pEdFileName && pImpl->_pUserFilter ) { - DELETEZ( pImpl->_pUserFilter ); + pImpl->_pUserFilter.reset(); return; } @@ -1181,7 +1180,7 @@ IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl, ListBox&, void ) { // Store the old filter for the auto extension handling OUString sLastFilterExt = pImpl->GetCurFilter()->GetExtension(); - DELETEZ( pImpl->_pUserFilter ); + pImpl->_pUserFilter.reset(); // if applicable remove filter of the user pImpl->SetCurFilter( pSelectedFilter, sSelectedFilterDisplayName ); |