diff options
Diffstat (limited to 'sw/source/core/doc/doclay.cxx')
| -rw-r--r-- | sw/source/core/doc/doclay.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index cc29cc8406d0..da1b64aed389 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -115,7 +115,7 @@ using ::rtl::OUString; #define DEF_FLY_WIDTH 2268 //Defaultbreite fuer FlyFrms (2268 == 4cm) /* #109161# */ -static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which) +static bool lcl_IsItemSet(const SwCntntNode & rNode, sal_uInt16 which) { bool bResult = false; @@ -314,9 +314,9 @@ void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt ) if ( pTbl ) { std::vector<SwFrmFmt*> aToDeleteFrmFmts; - const ULONG nNodeIdxOfFlyFmt( pCntntIdx->GetIndex() ); + const sal_uLong nNodeIdxOfFlyFmt( pCntntIdx->GetIndex() ); - for ( USHORT i = 0; i < pTbl->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pTbl->Count(); ++i ) { SwFrmFmt* pTmpFmt = (*pTbl)[i]; const SwFmtAnchor &rAnch = pTmpFmt->GetAnchor(); @@ -732,7 +732,7 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos, if( DoesUndo() ) { ClearRedo(); - ULONG nNodeIdx = rAnchPos.nNode.GetIndex(); + sal_uLong nNodeIdx = rAnchPos.nNode.GetIndex(); xub_StrLen nCntIdx = rAnchPos.nContent.GetIndex(); AppendUndo( new SwUndoInsLayFmt( pFmt, nNodeIdx, nCntIdx )); } @@ -744,7 +744,7 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos, SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType, const SwPosition* pAnchorPos, const SfxItemSet* pFlySet, - SwFrmFmt* pFrmFmt, BOOL bCalledFromShell ) + SwFrmFmt* pFrmFmt, sal_Bool bCalledFromShell ) { SwFlyFrmFmt* pFmt = 0; sal_Bool bCallMake = sal_True; @@ -788,7 +788,7 @@ SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType, if (bCalledFromShell && !lcl_IsItemSet(*pNewTxtNd, RES_PARATR_ADJUST) && SFX_ITEM_SET == pAnchorNode->GetSwAttrSet(). - GetItemState(RES_PARATR_ADJUST, TRUE, &pItem)) + GetItemState(RES_PARATR_ADJUST, sal_True, &pItem)) static_cast<SwCntntNode *>(pNewTxtNd)->SetAttr(*pItem); pFmt = _MakeFlySection( *pAnchorPos, *pNewTxtNd, @@ -860,7 +860,7 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet, rTbl.MakeCopy( this, aPos, *pSelBoxes ); // Don't delete a part of a table with row span!! // You could delete the content instead -> ToDo - //rTbl.DeleteSel( this, *pSelBoxes, 0, 0, TRUE, TRUE ); + //rTbl.DeleteSel( this, *pSelBoxes, 0, 0, sal_True, sal_True ); } // wenn Tabelle im Rahmen, dann ohne nachfolgenden TextNode @@ -888,9 +888,9 @@ if( DoesUndo() ) // werden erstmal alle Undo - Objecte geloescht. */ // copy all Pams and then delete all SwPaM* pTmp = (SwPaM*)&rPam; - BOOL bOldFlag = mbCopyIsMove, bOldUndo = mbUndo; - mbCopyIsMove = TRUE; - mbUndo = FALSE; + sal_Bool bOldFlag = mbCopyIsMove, bOldUndo = mbUndo; + mbCopyIsMove = sal_True; + mbUndo = sal_False; do { if( pTmp->HasMark() && *pTmp->GetPoint() != *pTmp->GetMark() ) @@ -1055,7 +1055,7 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg, sal_Bool TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos, RndStdIds nAnchorId ) { - sal_Bool bOk = FALSE; + sal_Bool bOk = sal_False; const SwPaM* pTmp = pPam; do { const sal_uInt32 nFlyIndex = pFlyPos->nNode.GetIndex(); @@ -1227,7 +1227,7 @@ void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uInt16 nWh SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator, const String& rNumberingSeparator, - const sal_Bool bBefore, const sal_uInt16 nId, const ULONG nNdIdx, + const sal_Bool bBefore, const sal_uInt16 nId, const sal_uLong nNdIdx, const String& rCharacterStyle, const sal_Bool bCpyBrd ) { @@ -1280,7 +1280,7 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co { SwStartNode *pSttNd = GetNodes()[nNdIdx]->GetStartNode(); ASSERT( pSttNd, "Kein StartNode in InsertLabel." ); - ULONG nNode; + sal_uLong nNode; if( bBefore ) { nNode = pSttNd->GetIndex(); @@ -1499,7 +1499,7 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co SwCharFmt* pCharFmt = FindCharFmtByName( rCharacterStyle ); if( !pCharFmt ) { - const USHORT nMyId = SwStyleNameMapper::GetPoolIdFromUIName(rCharacterStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT); + const sal_uInt16 nMyId = SwStyleNameMapper::GetPoolIdFromUIName(rCharacterStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT); pCharFmt = GetCharFmtFromPool( nMyId ); } if (pCharFmt) @@ -1788,7 +1788,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt, SwCharFmt* pCharFmt = FindCharFmtByName( rCharacterStyle ); if ( !pCharFmt ) { - const USHORT nMyId = SwStyleNameMapper::GetPoolIdFromUIName( rCharacterStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ); + const sal_uInt16 nMyId = SwStyleNameMapper::GetPoolIdFromUIName( rCharacterStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ); pCharFmt = GetCharFmtFromPool( nMyId ); } if ( pCharFmt ) @@ -1880,7 +1880,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer ) if (GetRootFrm()->IsNeedGrammarCheck()) { - BOOL bIsOnlineSpell = pSh->GetViewOptions()->IsOnlineSpell(); + sal_Bool bIsOnlineSpell = pSh->GetViewOptions()->IsOnlineSpell(); sal_Bool bIsAutoGrammar = sal_False; SvtLinguConfig().GetProperty( ::rtl::OUString::createFromAscii( @@ -2270,7 +2270,7 @@ short SwDoc::GetTextDirection( const SwPosition& rPos, if( !pItem ) { - const SwPageDesc* pPgDsc = pNd->FindPageDesc( FALSE ); + const SwPageDesc* pPgDsc = pNd->FindPageDesc( sal_False ); if( pPgDsc ) pItem = &pPgDsc->GetMaster().GetFrmDir(); } |