Kaydet (Commit) 905a2bdd authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in SvxBmpMask

Change-Id: I78a15fa022bd46596117349a5f8d0e7212233dc3
Reviewed-on: https://gerrit.libreoffice.org/55226Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 5386d544
......@@ -33,6 +33,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/graph.hxx>
#include <vcl/vclptr.hxx>
#include <memory>
namespace vcl { class Window; }
......@@ -121,7 +122,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
VclPtr<MetricField> m_pSp4;
VclPtr<SvxColorListBox> m_pLbColor4;
MaskData* pData;
std::unique_ptr<MaskData> pData;
VclPtr<CheckBox> m_pCbxTrans;
VclPtr<SvxColorListBox> m_pLbColorTrans;
......
......@@ -408,21 +408,21 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window*
m_pLbColor3->SelectEntry(COL_TRANSPARENT);
m_pLbColor4->SelectEntry(COL_TRANSPARENT);
m_pTbxPipette->SetSelectHdl( LINK( pData, MaskData, PipetteHdl ) );
m_pBtnExec->SetClickHdl( LINK( pData, MaskData, ExecHdl ) );
m_pTbxPipette->SetSelectHdl( LINK( pData.get(), MaskData, PipetteHdl ) );
m_pBtnExec->SetClickHdl( LINK( pData.get(), MaskData, ExecHdl ) );
m_pCbx1->SetClickHdl( LINK( pData, MaskData, CbxHdl ) );
m_pCbx2->SetClickHdl( LINK( pData, MaskData, CbxHdl ) );
m_pCbx3->SetClickHdl( LINK( pData, MaskData, CbxHdl ) );
m_pCbx4->SetClickHdl( LINK( pData, MaskData, CbxHdl ) );
m_pCbxTrans->SetClickHdl( LINK( pData, MaskData, CbxTransHdl ) );
m_pCbx1->SetClickHdl( LINK( pData.get(), MaskData, CbxHdl ) );
m_pCbx2->SetClickHdl( LINK( pData.get(), MaskData, CbxHdl ) );
m_pCbx3->SetClickHdl( LINK( pData.get(), MaskData, CbxHdl ) );
m_pCbx4->SetClickHdl( LINK( pData.get(), MaskData, CbxHdl ) );
m_pCbxTrans->SetClickHdl( LINK( pData.get(), MaskData, CbxTransHdl ) );
SetAccessibleNames ();
m_pLbColor1->SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
m_pLbColor2->SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
m_pLbColor3->SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
m_pLbColor4->SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
m_pLbColor1->SetGetFocusHdl( LINK( pData.get(), MaskData, FocusLbHdl ) );
m_pLbColor2->SetGetFocusHdl( LINK( pData.get(), MaskData, FocusLbHdl ) );
m_pLbColor3->SetGetFocusHdl( LINK( pData.get(), MaskData, FocusLbHdl ) );
m_pLbColor4->SetGetFocusHdl( LINK( pData.get(), MaskData, FocusLbHdl ) );
m_pLbColorTrans->Disable();
OUString sColorPalette (SvxResId( RID_SVXDLG_BMPMASK_STR_PALETTE));
......@@ -474,8 +474,7 @@ void SvxBmpMask::dispose()
m_pQSet3.disposeAndClear();
m_pQSet4.disposeAndClear();
m_pCtlPipette.disposeAndClear();
delete pData;
pData = nullptr;
pData.reset();
m_pTbxPipette.clear();
m_pBtnExec.clear();
m_pCbx1.clear();
......
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