strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unique_ptr->optional in UndoTransliterate_Data

Browse source 
Change-Id: Ibb694d7257124a8fe4c22da45c854df3be56526e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138213
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2022-08-09 15:47:44 +02:00 committed by Noel Grandin
parent 030eb8b168
commit dc05dfde93
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sw/source/core/undo/unovwr.cxx
View file

@ -327,7 +327,7 @@ struct UndoTransliterate_Data
{
OUString sText;
std::unique_ptr<SwHistory> pHistory;
std::unique_ptr<Sequence< sal_Int32 >> pOffsets;
std::optional<Sequence< sal_Int32 >> oOffsets;
SwNodeOffset nNdIdx;
sal_Int32 nStart, nLen;
@ -399,8 +399,8 @@ void SwUndoTransliterate::AddChanges( SwTextNode& rTNd,
if( *p != ( nStart + n ))
{
// create the Offset array
pNew->pOffsets.reset( new Sequence <sal_Int32> ( nLen ) );
sal_Int32* pIdx = pNew->pOffsets->getArray();
pNew->oOffsets.emplace( nLen );
sal_Int32* pIdx = pNew->oOffsets->getArray();
p = pOffsets;
tools::Long nMyOff, nNewVal = nStart;
for( n = 0, nMyOff = nStart; n < nOffsLen; ++p, ++n, ++nMyOff )
@ -453,9 +453,9 @@ void UndoTransliterate_Data::SetChangeAtNode( SwDoc& rDoc )
if( !pTNd )
return;
Sequence <sal_Int32> aOffsets( pOffsets ? pOffsets->getLength() : nLen );
if( pOffsets )
aOffsets = *pOffsets;
Sequence <sal_Int32> aOffsets( oOffsets ? oOffsets->getLength() : nLen );
if( oOffsets )
aOffsets = *oOffsets;
else
{
sal_Int32* p = aOffsets.getArray();