diff options
| -rw-r--r-- | sw/source/core/doc/docfld.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index c30341c23394..563c525685f6 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -1138,15 +1138,18 @@ void SwDocUpdateField::RemoveFieldType( const SwFieldType& rType ) if( pFnd ) { if( aFieldTypeTable[ n ] == pFnd ) + { aFieldTypeTable[ n ] = static_cast<SwCalcFieldType*>(pFnd->pNext.release()); + delete pFnd; + } else { SwHash* pPrev = aFieldTypeTable[ n ]; while( pPrev->pNext.get() != pFnd ) pPrev = pPrev->pNext.get(); - pPrev->pNext.reset( pFnd->pNext.release() ); + pPrev->pNext = std::move(pFnd->pNext); + // no need to explicitly delete here, the embedded linked list uses unique_ptr } - delete pFnd; } } } |