diff options
Diffstat (limited to 'sw/source/core/unocore/unoidx.cxx')
| -rw-r--r-- | sw/source/core/unocore/unoidx.cxx | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 46d373194eb6..cc4a31c5af9b 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -562,7 +562,7 @@ throw (uno::RuntimeException) { vos::OGuard g(Application::GetSolarMutex()); - USHORT nObjectType = SW_SERVICE_TYPE_INDEX; + sal_uInt16 nObjectType = SW_SERVICE_TYPE_INDEX; switch (m_pImpl->m_eTOXType) { // case TOX_INDEX: break; @@ -990,8 +990,8 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, { SwSections aSectArr; pSectionFmt->GetChildSections(aSectArr, - SORTSECT_NOT, FALSE); - for(USHORT i = 0; i < aSectArr.Count(); i++) + SORTSECT_NOT, sal_False); + for(sal_uInt16 i = 0; i < aSectArr.Count(); i++) { SwSection* pSect = aSectArr[i]; if(pSect->GetType() == TOX_HEADER_SECTION) @@ -1247,11 +1247,31 @@ 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( @@ -2025,7 +2045,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( // n.b.: toxmarks must have either alternative text or an extent if (bMark && rMark.GetAlternativeText().Len()) { - rPam.Normalize(TRUE); + rPam.Normalize(sal_True); rPam.DeleteMark(); bMark = false; } @@ -3281,7 +3301,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, if(SVX_TAB_ADJUST_END == aToken.eTabAlign) { pArr[1].Name = C2U("TabStopRightAligned"); - BOOL bTemp = sal_True; + sal_Bool bTemp = sal_True; pArr[1].Value.setValue(&bTemp, ::getCppuBooleanType()); } else |