diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-24 13:43:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-29 17:04:13 +0200 |
| commit | 85409aa4dd71ed63e586819bb79134e82faa8f34 (patch) | |
| tree | a9b744e1088a708104265ef69ce0e8a890c1548e /svtools | |
| parent | be2188598ef038f3e110f0a528ae682c93f2a6fd (diff) | |
loplugin:useuniqueptr in ExportDialog
Change-Id: I84dd42783be04d7acb8c0d4a9afa920db0e22d8e
Reviewed-on: https://gerrit.libreoffice.org/53596
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter/exportdialog.cxx | 10 | ||||
| -rw-r--r-- | svtools/source/filter/exportdialog.hxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 71c753bd9e3d..8f2dc48e1803 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -182,7 +182,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC FilterConfigItem* pFilterOptions; if ( bUpdateConfig ) - pFilterOptions = mpFilterOptionsItem; + pFilterOptions = mpFilterOptionsItem.get(); else { uno::Sequence< beans::PropertyValue > aFilterData( mpFilterOptionsItem->GetFilterData() ); @@ -647,9 +647,9 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara, maExt = maExt.toAsciiUpperCase(); OUString aFilterConfigPath( "Office.Common/Filter/Graphic/Export/" ); - mpOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); + mpOptionsItem.reset(new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData )); aFilterConfigPath += maExt; - mpFilterOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); + mpFilterOptionsItem.reset(new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData )); mnInitialResolutionUnit = mbIsPixelFormat ? mpOptionsItem->ReadInt32("PixelExportUnit", UNIT_DEFAULT) @@ -1011,8 +1011,8 @@ ExportDialog::~ExportDialog() void ExportDialog::dispose() { mpTempStream.reset(); - delete mpFilterOptionsItem; - delete mpOptionsItem; + mpFilterOptionsItem.reset(); + mpOptionsItem.reset(); mpMfSizeX.clear(); mpLbSizeX.clear(); mpMfSizeY.clear(); diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index 59119350e7a3..d2aa54f1fb80 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -111,8 +111,8 @@ private: OUString ms8BitColorPalette; OUString ms24BitColor; - FilterConfigItem* mpOptionsItem; - FilterConfigItem* mpFilterOptionsItem; + std::unique_ptr<FilterConfigItem> mpOptionsItem; + std::unique_ptr<FilterConfigItem> mpFilterOptionsItem; OUString maExt; sal_Int16 mnFormat; |