Kaydet (Commit) 4ab105d1 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in SvxDefaultColorOptPage

Change-Id: I398ba3828bddf295e99624d7caa8d636e96c360c
Reviewed-on: https://gerrit.libreoffice.org/56100
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 6a99ac6a
......@@ -135,20 +135,20 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(vcl::Window* pParent, const SfxIt
m_pValSetColorBox->SetExtraSpacing( 0 );
m_pValSetColorBox->Show();
pChartOptions = new SvxChartOptions;
pChartOptions.reset(new SvxChartOptions);
pColorList = XColorList::CreateStdColorList();
const SfxPoolItem* pItem = nullptr;
if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, false, &pItem ) == SfxItemState::SET )
{
pColorConfig = static_cast< SvxChartColorTableItem* >(pItem->Clone());
pColorConfig.reset(static_cast< SvxChartColorTableItem* >(pItem->Clone()));
}
else
{
SvxChartColorTable aTable;
aTable.useDefault();
pColorConfig = new SvxChartColorTableItem( SID_SCH_EDITOPTIONS, aTable );
pColorConfig->SetOptions( pChartOptions );
pColorConfig.reset(new SvxChartColorTableItem( SID_SCH_EDITOPTIONS, aTable ));
pColorConfig->SetOptions( pChartOptions.get() );
}
Construct();
......@@ -167,10 +167,8 @@ void SvxDefaultColorOptPage::dispose()
pChartOptions->SetDefaultColors( pColorConfig->GetColorList() );
pChartOptions->Commit();
delete pColorConfig;
pColorConfig = nullptr;
delete pChartOptions;
pChartOptions = nullptr;
pColorConfig.reset();
pChartOptions.reset();
}
m_pLbChartColors.clear();
m_pValSetColorBox.clear();
......@@ -198,7 +196,7 @@ VclPtr<SfxTabPage> SvxDefaultColorOptPage::Create( TabPageParent pParent, const
bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
{
if( pColorConfig )
rOutAttrs->Put( *static_cast< SfxPoolItem* >(pColorConfig) );
rOutAttrs->Put( *pColorConfig );
return true;
}
......
......@@ -40,8 +40,8 @@ private:
VclPtr<PushButton> m_pPBAdd;
VclPtr<PushButton> m_pPBRemove;
SvxChartOptions* pChartOptions;
SvxChartColorTableItem* pColorConfig;
std::unique_ptr<SvxChartOptions> pChartOptions;
std::unique_ptr<SvxChartColorTableItem> pColorConfig;
XColorListRef pColorList;
ImpColorList aColorList;
......
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