diff options
Diffstat (limited to 'sw/source/core/unocore/unoobj2.cxx')
| -rw-r--r-- | sw/source/core/unocore/unoobj2.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index d9334e97c841..76a42284309d 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -201,14 +201,14 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx, const bool _bAtCharAnchoredObjs ) { // _bAtCharAnchoredObjs: - // <TRUE>: at-character anchored objects are collected - // <FALSE>: at-paragraph anchored objects are collected + // <sal_True>: at-character anchored objects are collected + // <sal_False>: at-paragraph anchored objects are collected // alle Rahmen, Grafiken und OLEs suchen, die an diesem Absatz // gebunden sind SwDoc* pDoc = rIdx.GetNode().GetDoc(); - USHORT nChkType = static_cast< USHORT >((_bAtCharAnchoredObjs) + sal_uInt16 nChkType = static_cast< sal_uInt16 >((_bAtCharAnchoredObjs) ? FLY_AT_CHAR : FLY_AT_PARA); const SwCntntFrm* pCFrm; const SwCntntNode* pCNd; @@ -218,7 +218,7 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx, { const SwSortedObjs *pObjs = pCFrm->GetDrawObjs(); if( pObjs ) - for( USHORT i = 0; i < pObjs->Count(); ++i ) + for( sal_uInt16 i = 0; i < pObjs->Count(); ++i ) { SwAnchoredObject* pAnchoredObj = (*pObjs)[i]; SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt(); @@ -240,8 +240,8 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx, else { const SwSpzFrmFmts& rFmts = *pDoc->GetSpzFrmFmts(); - USHORT nSize = rFmts.Count(); - for ( USHORT i = 0; i < nSize; i++) + sal_uInt16 nSize = rFmts.Count(); + for ( sal_uInt16 i = 0; i < nSize; i++) { const SwFrmFmt* pFmt = rFmts[ i ]; const SwFmtAnchor& rAnchor = pFmt->GetAnchor(); @@ -407,8 +407,8 @@ void SwUnoCursorHelper::GetCrsrAttr(SwPaM & rPam, { SwPosition const & rStart( *pCurrent->Start() ); SwPosition const & rEnd( *pCurrent->End() ); - const ULONG nSttNd = rStart.nNode.GetIndex(); - const ULONG nEndNd = rEnd .nNode.GetIndex(); + const sal_uLong nSttNd = rStart.nNode.GetIndex(); + const sal_uLong nEndNd = rEnd .nNode.GetIndex(); if (nEndNd - nSttNd >= nMaxLookup) { @@ -419,7 +419,7 @@ void SwUnoCursorHelper::GetCrsrAttr(SwPaM & rPam, // the first node inserts the values into the get set // all other nodes merge their values into the get set - for (ULONG n = nSttNd; n <= nEndNd; ++n) + for (sal_uLong n = nSttNd; n <= nEndNd; ++n) { SwNode *const pNd = rPam.GetDoc()->GetNodes()[ n ]; switch (pNd->GetNodeType()) @@ -479,7 +479,7 @@ public: /// embedded tables. SwStartNode const*const m_pOwnStartNode; SwTable const*const m_pOwnTable; - const ULONG m_nEndIndex; + const sal_uLong m_nEndIndex; sal_Int32 m_nFirstParaStart; sal_Int32 m_nLastParaEnd; bool m_bFirstParagraph; @@ -935,7 +935,7 @@ throw (uno::RuntimeException) m_pImpl->m_rDoc, aCursor, rText, bForceExpandHints); SwUnoCursorHelper::SelectPam(aCursor, true); - aCursor.Left(rText.getLength(), CRSR_SKIP_CHARS, FALSE, FALSE); + aCursor.Left(rText.getLength(), CRSR_SKIP_CHARS, sal_False, sal_False); } SetPositions(aCursor); m_pImpl->m_rDoc.EndUndo(UNDO_INSERT, NULL); @@ -1191,7 +1191,7 @@ lcl_IsStartNodeInFormat(const bool bHeader, SwStartNode *const pSttNode, const SfxItemSet& rSet = pFrmFmt->GetAttrSet(); const SfxPoolItem* pItem; if (SFX_ITEM_SET == rSet.GetItemState( - static_cast<USHORT>(bHeader ? RES_HEADER : RES_FOOTER), + static_cast<sal_uInt16>(bHeader ? RES_HEADER : RES_FOOTER), sal_True, &pItem)) { SfxPoolItem *const pItemNonConst(const_cast<SfxPoolItem *>(pItem)); @@ -1360,7 +1360,7 @@ throw (uno::RuntimeException) } const SwPosition aPos(GetDoc()->GetNodes().GetEndOfContent()); const ::std::auto_ptr<SwUnoCrsr> pNewCrsr( - m_pImpl->m_rDoc.CreateUnoCrsr(aPos, FALSE)); + m_pImpl->m_rDoc.CreateUnoCrsr(aPos, sal_False)); if (!GetPositions(*pNewCrsr)) { throw uno::RuntimeException(); @@ -1382,7 +1382,7 @@ SwXTextRange::createEnumeration() throw (uno::RuntimeException) } const SwPosition aPos(GetDoc()->GetNodes().GetEndOfContent()); ::std::auto_ptr<SwUnoCrsr> pNewCrsr( - m_pImpl->m_rDoc.CreateUnoCrsr(aPos, FALSE)); + m_pImpl->m_rDoc.CreateUnoCrsr(aPos, sal_False)); if (!GetPositions(*pNewCrsr)) { throw uno::RuntimeException(); @@ -1807,7 +1807,7 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString) DBG_ASSERT( bSuccess, "DocInsertStringSplitCR" ); (void) bSuccess; SwUnoCursorHelper::SelectPam(rCursor, true); - rCursor.Left(rString.getLength(), CRSR_SKIP_CHARS, FALSE, FALSE); + rCursor.Left(rString.getLength(), CRSR_SKIP_CHARS, sal_False, sal_False); } pDoc->EndUndo(UNDO_INSERT, NULL); } @@ -1976,7 +1976,7 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration( SwPosFlyFrms aFlyFrms; //get all frames that are bound at paragraph or at character rPaM.GetDoc()->GetAllFlyFmts(aFlyFrms, m_pImpl->GetCursor()); - for(USHORT i = 0; i < aFlyFrms.Count(); i++) + for(sal_uInt16 i = 0; i < aFlyFrms.Count(); i++) { SwPosFlyFrm* pPosFly = aFlyFrms[i]; SwFrmFmt *const pFrmFmt = @@ -1996,7 +1996,7 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration( lcl_FillFrame(*m_pImpl.get(), *m_pImpl->GetCursor(), m_pImpl->m_Frames); m_pImpl->GetCursor()->Right( - 1, CRSR_SKIP_CHARS, FALSE, FALSE); + 1, CRSR_SKIP_CHARS, sal_False, sal_False); } while (*m_pImpl->GetCursor()->GetPoint() < *m_pImpl->GetCursor()->GetMark()); |