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

fix RenameHdl in previous commit:

Browse Source 
::boost::ptr_vector::erase will delete the element, so p points to freed
memory after that line; try to get this to work via the transfer method.
This commit is contained in:
Michael Stahl
2012-05-14 18:53:42 +02:00
parent 60473b5eca
commit 5031e17d4b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sw/source/ui/table/tautofmt.cxx
View File

@@ -472,21 +472,22 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
if( n >= pTableTbl->size() )
{
// Format mit dem Namen noch nicht vorhanden, also
// umbenennen
// no format with this name exists, so rename it
aLbFormat.RemoveEntry( nDfltStylePos + nIndex );
SwTableAutoFmt* p = &(*pTableTbl)[ nIndex ];
pTableTbl->erase( pTableTbl->begin() + nIndex );
p->SetName( aFormatName );
// Sortiert einfuegen!!
// keep all arrays sorted!
for( n = 1; n < pTableTbl->size(); ++n )
if( (*pTableTbl)[ n ].GetName() > aFormatName )
if ((n != nIndex) &&
((*pTableTbl)[n].GetName() > aFormatName))
{
break;
}
pTableTbl->insert( pTableTbl->begin() + n, p );
pTableTbl->transfer(pTableTbl->begin() + n,
pTableTbl->begin() + nIndex, *pTableTbl);
aLbFormat.InsertEntry( aFormatName, nDfltStylePos + n );
aLbFormat.SelectEntryPos( nDfltStylePos + n );