Kaydet (Commit) 85409aa4 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in ExportDialog

Change-Id: I84dd42783be04d7acb8c0d4a9afa920db0e22d8e
Reviewed-on: https://gerrit.libreoffice.org/53596Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst be218859
......@@ -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();
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment