mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use std::make_unique instead of new

Browse Source 
Change-Id: Icc5cb2f5fa5720eb9f6e22ec380397bb88542689
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116644
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2021-06-03 09:39:06 +01:00
parent 027c7b4113
commit 4bd56577ec
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
editeng/source/rtf/svxrtf.cxx
View File

@@ -735,40 +735,39 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
// - all character attributes sre keep the area // - all character attributes sre keep the area
// - all paragraph attributes to get the area // - all paragraph attributes to get the area
// up to the previous paragraph // up to the previous paragraph
std::unique_ptr<SvxRTFItemStackType> pNew( auto xNew = std::make_unique<SvxRTFItemStackType>(*pOld, *mxInsertPosition, true);
new SvxRTFItemStackType(*pOld, *mxInsertPosition, true)); xNew->aAttrSet.SetParent( pOld->aAttrSet.GetParent() );
pNew->aAttrSet.SetParent( pOld->aAttrSet.GetParent() );
// Delete all paragraph attributes from pNew // Delete all paragraph attributes from xNew
for( sal_uInt16 n = 0; n < (sizeof(aPardMap) / sizeof(sal_uInt16)) && for( sal_uInt16 n = 0; n < (sizeof(aPardMap) / sizeof(sal_uInt16)) &&
pNew->aAttrSet.Count(); ++n ) xNew->aAttrSet.Count(); ++n )
if( reinterpret_cast<sal_uInt16*>(&aPardMap)[n] ) if( reinterpret_cast<sal_uInt16*>(&aPardMap)[n] )
pNew->aAttrSet.ClearItem( reinterpret_cast<sal_uInt16*>(&aPardMap)[n] ); xNew->aAttrSet.ClearItem( reinterpret_cast<sal_uInt16*>(&aPardMap)[n] );
pNew->SetRTFDefaults( GetRTFDefaults() ); xNew->SetRTFDefaults( GetRTFDefaults() );
// Were there any? // Were there any?
if( pNew->aAttrSet.Count() == pOld->aAttrSet.Count() ) if( xNew->aAttrSet.Count() == pOld->aAttrSet.Count() )
{ {
pNew.reset(); xNew.reset();
} }
else else
{ {
pNew->nStyleNo = 0; xNew->nStyleNo = 0;
// Now span the real area of pNew from old // Now span the real area of xNew from old
SetEndPrevPara( pOld->mxEndNodeIdx, pOld->nEndCnt ); SetEndPrevPara( pOld->mxEndNodeIdx, pOld->nEndCnt );
pNew->nSttCnt = 0; xNew->nSttCnt = 0;
if( IsChkStyleAttr() ) if( IsChkStyleAttr() )
{ {
ClearStyleAttr_( *pOld ); ClearStyleAttr_( *pOld );
ClearStyleAttr_( *pNew ); //#i10381#, methinks. ClearStyleAttr_( *xNew ); //#i10381#, methinks.
} }
if( pCurrent ) if( pCurrent )
{ {
pCurrent->Add(std::move(pOld)); pCurrent->Add(std::move(pOld));
pCurrent->Add(std::move(pNew)); pCurrent->Add(std::move(xNew));
} }
else else
{ {
@@ -776,7 +775,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack
// read. (Span no attributes!) // read. (Span no attributes!)
m_AttrSetList.push_back(std::move(pOld)); m_AttrSetList.push_back(std::move(pOld));
m_AttrSetList.push_back(std::move(pNew)); m_AttrSetList.push_back(std::move(xNew));
} }
break; break;
} }