diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-06-02 09:13:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-06-02 10:45:44 +0200 |
| commit | e6de84d46c2a41fc4ae53e2744d432e50c4a4ac1 (patch) | |
| tree | 6be38c21e699cf240ff4b5eb3dd38e251dda96b5 /sd | |
| parent | 1577c0dc30ed3c9db361fb989e41a3e9d6c45dfa (diff) | |
std::move SfxPoolItem into SfxItemSet where possible
found with the help of a temporary loplugin (which i have put into the
store/ folder)
Change-Id: Ide40d09bef6993ace50039a8fd0439b7e29c09a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135288
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuolbull.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/func/fuscale.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drtxtob1.cxx | 11 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 1f91fe3e719c..beb57db5b31e 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -317,8 +317,7 @@ const SvxNumBulletItem* FuBulletAndPosition::GetNumBulletItem(SfxItemSet& aNewAt //DBG_ASSERT( pItem, "No EE_PARA_NUMBULLET in the Pool!" ); - std::unique_ptr<SfxPoolItem> pNewItem(pItem->CloneSetWhich(EE_PARA_NUMBULLET)); - aNewAttr.Put(*pNewItem); + aNewAttr.Put(pItem->CloneSetWhich(EE_PARA_NUMBULLET)); if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET) == SfxItemState::SET ) { diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index 5d5c4c29d26a..d4730b243209 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -103,7 +103,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) } pZoomItem->SetValueSet( nZoomValues ); - aNewAttr.Put( *pZoomItem ); + aNewAttr.Put( std::move(pZoomItem) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr<AbstractSvxZoomDialog> pDlg(pFact->CreateSvxZoomDialog(rReq.GetFrameWeld(), aNewAttr)); diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index eda20834083d..86b7a698aa95 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -197,8 +197,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) pNewItem->SetLeftValue( static_cast<sal_uInt16>(nLeft) ); SfxItemSet aNewAttrs( aAttr ); - aNewAttrs.Put( *pNewItem ); - pNewItem.reset(); + aNewAttrs.Put( std::move(pNewItem) ); pOLV->GetOutliner()->SetParaAttribs( nPara, aNewAttrs ); } } @@ -264,8 +263,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) pNewItem->SetLower( static_cast<sal_uInt16>(nLower) ); SfxItemSet aNewAttrs( aAttr ); - aNewAttrs.Put( *pNewItem ); - pNewItem.reset(); + aNewAttrs.Put( std::move(pNewItem) ); pOLV->GetOutliner()->SetParaAttribs( nPara, aNewAttrs ); } } @@ -306,8 +304,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) } pNewItem->SetLower( static_cast<sal_uInt16>(nLower) ); - aNewAttrs.Put( *pNewItem ); - pNewItem.reset(); + aNewAttrs.Put( std::move(pNewItem) ); mpView->SetAttributes( aNewAttrs ); } @@ -836,7 +833,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) } if (pColorItem) { - pNewArgs->Put(*pColorItem); + pNewArgs->Put(std::move(pColorItem)); } mpView->SetAttributes(*pNewArgs); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 8cd3dd04f7e1..a61d64599781 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -555,7 +555,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) } pZoomItem->SetValueSet( nZoomValues ); - rSet.Put( *pZoomItem ); + rSet.Put( std::move(pZoomItem) ); } } if( SfxItemState::DEFAULT == rSet.GetItemState( SID_ATTR_ZOOMSLIDER ) ) |