[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

 sw/source/core/tox/tox.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81a09c92f00a3c0f9e87272e49db49c25d14aeb5
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 3 15:05:25 2017 +0200

    sw: fix merge conflict with 925dabe8fd42d85e5d8e610dc75252372161d1b3
    
    Change-Id: I2befd713e15ba65131ab7fa9b58d1505793155f4

diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index cb26ad4a6d1b..e53f07aa1ee6 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -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();