diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-31 09:19:20 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-31 15:50:04 +0200 |
commit | 5b8729a741bd65c2f61ae9caba7ea15a139835e5 (patch) | |
tree | c8e11588f87115b51b932af5b89bd0c68787e0a6 /cui | |
parent | 68a6c70f25762374f7aed0d4d755345c6f37c78d (diff) |
no need to allocate SvxNumRule separately in SvxNumBulletItem
Change-Id: I7903565a468fc0fbec603c88b92cca6560a86728
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116424
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index df227f53346d..fbeb40aa4b3d 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -239,7 +239,7 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) } if(SfxItemState::SET == rSet.GetItemState(nNumItemId, false, &pItem)) { - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); } if(pActNum && *pSaveNum != *pActNum) { @@ -283,7 +283,7 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet ) } } DBG_ASSERT(eState == SfxItemState::SET, "no item found!"); - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); if(!pActNum) pActNum.reset( new SvxNumRule(*pSaveNum) ); @@ -390,7 +390,7 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) } if(SfxItemState::SET == rSet.GetItemState(nNumItemId, false, &pItem)) { - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); } if(pActNum && *pSaveNum != *pActNum) { @@ -433,7 +433,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet ) } DBG_ASSERT(eState == SfxItemState::SET, "no item found!"); - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); if(!pActNum) pActNum.reset( new SvxNumRule(*pSaveNum) ); @@ -573,7 +573,7 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) } if(SfxItemState::SET == rSet.GetItemState(nNumItemId, false, &pItem)) { - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); } if(pActNum && *pSaveNum != *pActNum) { @@ -616,7 +616,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet* rSet ) } DBG_ASSERT(eState == SfxItemState::SET, "no item found!"); - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); if(!pActNum) pActNum.reset( new SvxNumRule(*pSaveNum) ); @@ -801,7 +801,7 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) } if(SfxItemState::SET == rSet.GetItemState(nNumItemId, false, &pItem)) { - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); } if(pActNum && *pSaveNum != *pActNum) { @@ -861,7 +861,7 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet* rSet ) } DBG_ASSERT(eState == SfxItemState::SET, "no item found!"); - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); if(!pActNum) pActNum.reset( new SvxNumRule(*pSaveNum) ); @@ -1148,7 +1148,7 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) } if(SfxItemState::SET == rSet.GetItemState(nNumItemId, false, &pItem)) { - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); } bModified = (!pActNum->Get( 0 ) || bPreset); @@ -1211,7 +1211,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet* rSet ) } DBG_ASSERT(eState == SfxItemState::SET, "no item found!"); - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); // insert levels if (!m_xLevelLB->n_children()) @@ -2758,7 +2758,7 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) } if(SfxItemState::SET == rSet.GetItemState(nNumItemId, false, &pItem)) { - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); } bModified = (!pActNum->Get( 0 ) || bPreset); if(*pSaveNum != *pActNum || @@ -2831,7 +2831,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet* rSet ) } DBG_ASSERT(eState == SfxItemState::SET, "no item found!"); - pSaveNum.reset( new SvxNumRule(*static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); + pSaveNum.reset( new SvxNumRule(static_cast<const SvxNumBulletItem*>(pItem)->GetNumRule()) ); // insert levels if (!m_xLevelLB->count_selected_rows()) |