diff options
Diffstat (limited to 'sw/source/core/crsr/callnk.cxx')
| -rw-r--r-- | sw/source/core/crsr/callnk.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx index 37087c189355..74275c1014ef 100644 --- a/sw/source/core/crsr/callnk.cxx +++ b/sw/source/core/crsr/callnk.cxx @@ -48,8 +48,8 @@ #include <breakit.hxx> -SwCallLink::SwCallLink( SwCrsrShell & rSh, ULONG nAktNode, xub_StrLen nAktCntnt, - BYTE nAktNdTyp, long nLRPos, bool bAktSelection ) +SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, xub_StrLen nAktCntnt, + sal_uInt8 nAktNdTyp, long nLRPos, bool bAktSelection ) : rShell( rSh ), nNode( nAktNode ), nCntnt( nAktCntnt ), nNdTyp( nAktNdTyp ), nLeftFrmPos( nLRPos ), bHasSelection( bAktSelection ) @@ -98,8 +98,8 @@ SwCallLink::~SwCallLink() return; xub_StrLen nCmp, nAktCntnt = pCurCrsr->GetPoint()->nContent.GetIndex(); - USHORT nNdWhich = pCNd->GetNodeType(); - ULONG nAktNode = pCurCrsr->GetPoint()->nNode.GetIndex(); + sal_uInt16 nNdWhich = pCNd->GetNodeType(); + sal_uLong nAktNode = pCurCrsr->GetPoint()->nNode.GetIndex(); // melde die Shell beim akt. Node als abhaengig an, dadurch koennen // alle Attribut-Aenderungen ueber den Link weiter gemeldet werden. @@ -135,7 +135,7 @@ SwCallLink::~SwCallLink() { const SwpHints &rHts = ((SwTxtNode*)pCNd)->GetSwpHints(); - USHORT n; + sal_uInt16 n; xub_StrLen nStart; const xub_StrLen *pEnd; @@ -191,7 +191,7 @@ SwCallLink::~SwCallLink() const SwFrm* pFrm; const SwFlyFrm *pFlyFrm; - if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->GetFrm(0,0,FALSE) ) && + if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->GetFrm(0,0,sal_False) ) && 0 != ( pFlyFrm = pFrm->FindFlyFrm() ) && !rShell.IsTableMode() ) { const SwNodeIndex* pIndex = pFlyFrm->GetFmt()->GetCntnt().GetCntntIdx(); @@ -208,7 +208,7 @@ SwCallLink::~SwCallLink() } } -long SwCallLink::GetFrm( SwTxtNode& rNd, xub_StrLen nCntPos, BOOL bCalcFrm ) +long SwCallLink::GetFrm( SwTxtNode& rNd, xub_StrLen nCntPos, sal_Bool bCalcFrm ) { SwTxtFrm* pFrm = (SwTxtFrm*)rNd.GetFrm(0,0,bCalcFrm), *pNext = pFrm; if ( pFrm && !pFrm->IsHiddenNow() ) |