Kaydet (Commit) 81a09c92 authored tarafından Michael Stahl's avatar Michael Stahl

sw: fix merge conflict with 925dabe8

Change-Id: I2befd713e15ba65131ab7fa9b58d1505793155f4
üst 99f23a45
......@@ -457,7 +457,7 @@ void SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
{
maMSTOCExpression = rSource.maMSTOCExpression;
SwTOXType* pType = const_cast<SwTOXType*>(rSource.GetTOXType());
if( pDoc && !pDoc->GetTOXTypes().Contains( pType ))
if( pDoc && !pDoc->GetTOXTypes().IsAlive(pType))
{
// type not in pDoc, so create it now
const SwTOXTypes& rTypes = pDoc->GetTOXTypes();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment