diff options
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdobjplusdata.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdobjuserdatalist.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdotxln.cxx | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 9351a676a5c7..4157679c1089 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2614,7 +2614,7 @@ SdrObjUserData* SdrObject::GetUserData(sal_uInt16 nNum) const return &pPlusData->pUserDataList->GetUserData(nNum); } -void SdrObject::AppendUserData(SdrObjUserData* pData) +void SdrObject::AppendUserData(std::unique_ptr<SdrObjUserData> pData) { if (!pData) { @@ -2626,7 +2626,7 @@ void SdrObject::AppendUserData(SdrObjUserData* pData) if (!pPlusData->pUserDataList) pPlusData->pUserDataList.reset( new SdrObjUserDataList ); - pPlusData->pUserDataList->AppendUserData(pData); + pPlusData->pUserDataList->AppendUserData(std::move(pData)); } void SdrObject::DeleteUserData(sal_uInt16 nNum) diff --git a/svx/source/svdraw/svdobjplusdata.cxx b/svx/source/svdraw/svdobjplusdata.cxx index ee7a801cd8e4..45d8bf97c487 100644 --- a/svx/source/svdraw/svdobjplusdata.cxx +++ b/svx/source/svdraw/svdobjplusdata.cxx @@ -36,9 +36,9 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const if (nCount!=0) { pNeuPlusData->pUserDataList.reset(new SdrObjUserDataList); for (sal_uInt16 i=0; i<nCount; i++) { - SdrObjUserData* pNeuUserData=pUserDataList->GetUserData(i).Clone(pObj1); - if (pNeuUserData!=nullptr) { - pNeuPlusData->pUserDataList->AppendUserData(pNeuUserData); + std::unique_ptr<SdrObjUserData> pNewUserData=pUserDataList->GetUserData(i).Clone(pObj1); + if (pNewUserData!=nullptr) { + pNeuPlusData->pUserDataList->AppendUserData(std::move(pNewUserData)); } else { OSL_FAIL("SdrObjPlusData::Clone(): UserData.Clone() returns NULL."); } diff --git a/svx/source/svdraw/svdobjuserdatalist.cxx b/svx/source/svdraw/svdobjuserdatalist.cxx index 679af34fa785..2595b799bd74 100644 --- a/svx/source/svdraw/svdobjuserdatalist.cxx +++ b/svx/source/svdraw/svdobjuserdatalist.cxx @@ -24,9 +24,9 @@ SdrObjUserData& SdrObjUserDataList::GetUserData(size_t nNum) return *maList.at(nNum).get(); } -void SdrObjUserDataList::AppendUserData(SdrObjUserData* pData) +void SdrObjUserDataList::AppendUserData(std::unique_ptr<SdrObjUserData> pData) { - maList.push_back(std::unique_ptr<SdrObjUserData>(pData)); + maList.push_back(std::move(pData)); } void SdrObjUserDataList::DeleteUserData(size_t nNum) diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 27d4b9679da8..3145fa4b5cb3 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -108,7 +108,7 @@ ImpSdrObjTextLinkUserData::~ImpSdrObjTextLinkUserData() { } -SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* ) const +std::unique_ptr<SdrObjUserData> ImpSdrObjTextLinkUserData::Clone(SdrObject* ) const { ImpSdrObjTextLinkUserData* pData=new ImpSdrObjTextLinkUserData; pData->aFileName =aFileName; @@ -116,7 +116,7 @@ SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* ) const pData->aFileDate0 =aFileDate0; pData->eCharSet =eCharSet; pData->pLink=nullptr; - return pData; + return std::unique_ptr<SdrObjUserData>(pData); } @@ -132,7 +132,7 @@ void SdrTextObj::SetTextLink(const OUString& rFileName, const OUString& rFilterN pData->aFileName=rFileName; pData->aFilterName=rFilterName; pData->eCharSet=eCharSet; - AppendUserData(pData); + AppendUserData(std::unique_ptr<SdrObjUserData>(pData)); ImpRegisterLink(); } |