diff options
Diffstat (limited to 'sw/source/core/unocore/unoidx.cxx')
| -rw-r--r-- | sw/source/core/unocore/unoidx.cxx | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index cc4a31c5af9b..a3f23ea6bfb4 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -1247,31 +1247,11 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, case WID_INDEX_MARKS: { SwTOXMarks aMarks; -<<<<<<< local const SwTOXType* pType = pTOXBase->GetTOXType(); SwTOXMark::InsertTOXMarks( aMarks, *pType ); uno::Sequence< uno::Reference<text::XDocumentIndexMark> > aXMarks(aMarks.Count()); uno::Reference<text::XDocumentIndexMark>* pxMarks = aXMarks.getArray(); - for(USHORT i = 0; i < aMarks.Count(); i++) -======= - SwTOXType const*const pType = pTOXBase->GetTOXType(); - SwClientIter aIter(*pType); - SwTOXMark * pMark = - static_cast<SwTOXMark*>(aIter.First(TYPE(SwTOXMark))); - while( pMark ) - { - if(pMark->GetTxtTOXMark()) - { - aMarks.C40_INSERT(SwTOXMark, pMark, aMarks.Count()); - } - pMark = static_cast<SwTOXMark*>(aIter.Next()); - } - uno::Sequence< uno::Reference<text::XDocumentIndexMark> > - aXMarks(aMarks.Count()); - uno::Reference<text::XDocumentIndexMark>* pxMarks = - aXMarks.getArray(); for(sal_uInt16 i = 0; i < aMarks.Count(); i++) ->>>>>>> other { SwTOXMark* pMark = aMarks.GetObject(i); pxMarks[i] = SwXDocumentIndexMark::CreateXDocumentIndexMark( |