Kaydet (Commit) 746c89bf authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in CntStaticPoolDefaults_Impl

Change-Id: I8d7766d473499b4d154debc1aafaf03359078aa3
Reviewed-on: https://gerrit.libreoffice.org/48372Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 18bc0ea4
...@@ -37,7 +37,7 @@ class CntItemPool; ...@@ -37,7 +37,7 @@ class CntItemPool;
class CntStaticPoolDefaults_Impl class CntStaticPoolDefaults_Impl
{ {
static const sal_uInt32 m_nItems = 1; static const sal_uInt32 m_nItems = 1;
std::vector<SfxPoolItem*>* m_pDefaults; std::vector<SfxPoolItem*> mvDefaults;
std::unique_ptr<SfxItemInfo[]> m_pItemInfos; std::unique_ptr<SfxItemInfo[]> m_pItemInfos;
private: private:
...@@ -49,7 +49,7 @@ public: ...@@ -49,7 +49,7 @@ public:
CntStaticPoolDefaults_Impl(const CntStaticPoolDefaults_Impl&) = delete; CntStaticPoolDefaults_Impl(const CntStaticPoolDefaults_Impl&) = delete;
CntStaticPoolDefaults_Impl& operator=(const CntStaticPoolDefaults_Impl&) = delete; CntStaticPoolDefaults_Impl& operator=(const CntStaticPoolDefaults_Impl&) = delete;
std::vector<SfxPoolItem*>* GetDefaults() const { return m_pDefaults; } std::vector<SfxPoolItem*>* GetDefaults() { return &mvDefaults; }
const SfxItemInfo* GetItemInfos() const { return m_pItemInfos.get(); } const SfxItemInfo* GetItemInfos() const { return m_pItemInfos.get(); }
}; };
...@@ -161,7 +161,7 @@ inline void CntStaticPoolDefaults_Impl::Insert( ...@@ -161,7 +161,7 @@ inline void CntStaticPoolDefaults_Impl::Insert(
{ {
sal_uInt16 nPos = pItem->Which() - WID_CHAOS_START; sal_uInt16 nPos = pItem->Which() - WID_CHAOS_START;
(*m_pDefaults)[ nPos ] = pItem; mvDefaults[ nPos ] = pItem;
m_pItemInfos[ nPos ]._nSID = 0; m_pItemInfos[ nPos ]._nSID = 0;
m_pItemInfos[ nPos ]._bPoolable = true; m_pItemInfos[ nPos ]._bPoolable = true;
} }
...@@ -170,14 +170,12 @@ inline void CntStaticPoolDefaults_Impl::Insert( ...@@ -170,14 +170,12 @@ inline void CntStaticPoolDefaults_Impl::Insert(
CntStaticPoolDefaults_Impl::~CntStaticPoolDefaults_Impl() CntStaticPoolDefaults_Impl::~CntStaticPoolDefaults_Impl()
{ {
for ( sal_uInt32 n = 0; n < m_nItems; ++n ) for ( sal_uInt32 n = 0; n < m_nItems; ++n )
delete (*m_pDefaults)[ n ]; delete mvDefaults[ n ];
delete m_pDefaults;
} }
CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl() CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl()
: m_pDefaults( new std::vector<SfxPoolItem*>( m_nItems, nullptr ) ), : mvDefaults( m_nItems, nullptr ),
m_pItemInfos( new SfxItemInfo [ m_nItems ] ) m_pItemInfos( new SfxItemInfo [ m_nItems ] )
{ {
memset( m_pItemInfos.get(), 0, sizeof( SfxItemInfo ) * m_nItems ); memset( m_pItemInfos.get(), 0, sizeof( SfxItemInfo ) * m_nItems );
......
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