diff options
Diffstat (limited to 'sw/source/ui/wrtsh/move.cxx')
-rw-r--r-- | sw/source/ui/wrtsh/move.cxx | 180 |
1 files changed, 90 insertions, 90 deletions
diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx index dc196de9d9da..34a9b5554c36 100644 --- a/sw/source/ui/wrtsh/move.cxx +++ b/sw/source/ui/wrtsh/move.cxx @@ -54,12 +54,12 @@ const long nReadOnlyScrollOfst = 10; class ShellMoveCrsr { SwWrtShell* pSh; - BOOL bAct; + sal_Bool bAct; public: - inline ShellMoveCrsr( SwWrtShell* pWrtSh, BOOL bSel ) + inline ShellMoveCrsr( SwWrtShell* pWrtSh, sal_Bool bSel ) { - bAct = !pWrtSh->ActionPend() && (pWrtSh->GetFrmType(0,FALSE) & FRMTYPE_FLY_ANY); - ( pSh = pWrtSh )->MoveCrsr( BOOL(bSel) ); + bAct = !pWrtSh->ActionPend() && (pWrtSh->GetFrmType(0,sal_False) & FRMTYPE_FLY_ANY); + ( pSh = pWrtSh )->MoveCrsr( sal_Bool(bSel) ); pWrtSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_HYPERLINK_GETLINK); } inline ~ShellMoveCrsr() @@ -74,7 +74,7 @@ public: } }; -void SwWrtShell::MoveCrsr( BOOL bWithSelect ) +void SwWrtShell::MoveCrsr( sal_Bool bWithSelect ) { ResetCursorStack(); if ( IsGCAttr() ) @@ -87,35 +87,35 @@ void SwWrtShell::MoveCrsr( BOOL bWithSelect ) else { EndSelect(); - (this->*fnKillSel)( 0, FALSE ); + (this->*fnKillSel)( 0, sal_False ); } } -BOOL SwWrtShell::SimpleMove( FNSimpleMove FnSimpleMove, BOOL bSelect ) +sal_Bool SwWrtShell::SimpleMove( FNSimpleMove FnSimpleMove, sal_Bool bSelect ) { - BOOL nRet; + sal_Bool nRet; if( bSelect ) { SttCrsrMove(); - MoveCrsr( TRUE ); + MoveCrsr( sal_True ); nRet = (this->*FnSimpleMove)(); EndCrsrMove(); } else if( 0 != ( nRet = (this->*FnSimpleMove)() ) ) - MoveCrsr( FALSE ); + MoveCrsr( sal_False ); return nRet; } -BOOL SwWrtShell::Left( USHORT nMode, BOOL bSelect, - USHORT nCount, BOOL bBasicCall, BOOL bVisual ) +sal_Bool SwWrtShell::Left( sal_uInt16 nMode, sal_Bool bSelect, + sal_uInt16 nCount, sal_Bool bBasicCall, sal_Bool bVisual ) { if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly()) { Point aTmp( VisArea().Pos() ); aTmp.X() -= VisArea().Width() * nReadOnlyScrollOfst / 100; rView.SetVisArea( aTmp ); - return TRUE; + return sal_True; } else { @@ -126,8 +126,8 @@ BOOL SwWrtShell::Left( USHORT nMode, BOOL bSelect, -BOOL SwWrtShell::Right( USHORT nMode, BOOL bSelect, - USHORT nCount, BOOL bBasicCall, BOOL bVisual ) +sal_Bool SwWrtShell::Right( sal_uInt16 nMode, sal_Bool bSelect, + sal_uInt16 nCount, sal_Bool bBasicCall, sal_Bool bVisual ) { if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly() ) { @@ -135,7 +135,7 @@ BOOL SwWrtShell::Right( USHORT nMode, BOOL bSelect, aTmp.X() += VisArea().Width() * nReadOnlyScrollOfst / 100; aTmp.X() = rView.SetHScrollMax( aTmp.X() ); rView.SetVisArea( aTmp ); - return TRUE; + return sal_True; } else { @@ -146,14 +146,14 @@ BOOL SwWrtShell::Right( USHORT nMode, BOOL bSelect, -BOOL SwWrtShell::Up( BOOL bSelect, USHORT nCount, BOOL bBasicCall ) +sal_Bool SwWrtShell::Up( sal_Bool bSelect, sal_uInt16 nCount, sal_Bool bBasicCall ) { if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly()) { Point aTmp( VisArea().Pos() ); aTmp.Y() -= VisArea().Height() * nReadOnlyScrollOfst / 100; rView.SetVisArea( aTmp ); - return TRUE; + return sal_True; } else { @@ -164,7 +164,7 @@ BOOL SwWrtShell::Up( BOOL bSelect, USHORT nCount, BOOL bBasicCall ) -BOOL SwWrtShell::Down( BOOL bSelect, USHORT nCount, BOOL bBasicCall ) +sal_Bool SwWrtShell::Down( sal_Bool bSelect, sal_uInt16 nCount, sal_Bool bBasicCall ) { if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly()) { @@ -172,7 +172,7 @@ BOOL SwWrtShell::Down( BOOL bSelect, USHORT nCount, BOOL bBasicCall ) aTmp.Y() += VisArea().Height() * nReadOnlyScrollOfst / 100; aTmp.Y() = rView.SetVScrollMax( aTmp.Y() ); rView.SetVisArea( aTmp ); - return TRUE; + return sal_True; } else { @@ -183,14 +183,14 @@ BOOL SwWrtShell::Down( BOOL bSelect, USHORT nCount, BOOL bBasicCall ) -BOOL SwWrtShell::LeftMargin( BOOL bSelect, BOOL bBasicCall ) +sal_Bool SwWrtShell::LeftMargin( sal_Bool bSelect, sal_Bool bBasicCall ) { if ( !bSelect && !bBasicCall && IsCrsrReadonly() ) { Point aTmp( VisArea().Pos() ); aTmp.X() = DOCUMENTBORDER; rView.SetVisArea( aTmp ); - return TRUE; + return sal_True; } else { @@ -201,7 +201,7 @@ BOOL SwWrtShell::LeftMargin( BOOL bSelect, BOOL bBasicCall ) -BOOL SwWrtShell::RightMargin( BOOL bSelect, BOOL bBasicCall ) +sal_Bool SwWrtShell::RightMargin( sal_Bool bSelect, sal_Bool bBasicCall ) { if ( !bSelect && !bBasicCall && IsCrsrReadonly() ) { @@ -210,7 +210,7 @@ BOOL SwWrtShell::RightMargin( BOOL bSelect, BOOL bBasicCall ) if( DOCUMENTBORDER > aTmp.X() ) aTmp.X() = DOCUMENTBORDER; rView.SetVisArea( aTmp ); - return TRUE; + return sal_True; } else { @@ -221,12 +221,12 @@ BOOL SwWrtShell::RightMargin( BOOL bSelect, BOOL bBasicCall ) -BOOL SwWrtShell::GoStart( BOOL bKeepArea, BOOL *pMoveTable, - BOOL bSelect, BOOL bDontMoveRegion ) +sal_Bool SwWrtShell::GoStart( sal_Bool bKeepArea, sal_Bool *pMoveTable, + sal_Bool bSelect, sal_Bool bDontMoveRegion ) { if ( IsCrsrInTbl() ) { - const BOOL bBoxSelection = HasBoxSelection(); + const sal_Bool bBoxSelection = HasBoxSelection(); if( !bBlockMode ) { if ( !bSelect ) @@ -239,14 +239,14 @@ BOOL SwWrtShell::GoStart( BOOL bKeepArea, BOOL *pMoveTable, || bDontMoveRegion)) { if ( pMoveTable ) - *pMoveTable = FALSE; - return TRUE; + *pMoveTable = sal_False; + return sal_True; } if( MoveTable( fnTableCurr, fnTableStart ) || bDontMoveRegion ) { if ( pMoveTable ) - *pMoveTable = TRUE; - return TRUE; + *pMoveTable = sal_True; + return sal_True; } else if( bBoxSelection && pMoveTable ) { @@ -255,8 +255,8 @@ BOOL SwWrtShell::GoStart( BOOL bKeepArea, BOOL *pMoveTable, // SelAll gesetzt). Dann darf die Tabelle nicht // verlassen werden; sonst ist keine Selektion der // gesamten Tabelle moeglich! - *pMoveTable = TRUE; - return TRUE; + *pMoveTable = sal_True; + return sal_True; } } @@ -267,29 +267,29 @@ BOOL SwWrtShell::GoStart( BOOL bKeepArea, BOOL *pMoveTable, else SttSelect(); } - const USHORT nFrmType = GetFrmType(0,FALSE); + const sal_uInt16 nFrmType = GetFrmType(0,sal_False); if ( FRMTYPE_FLY_ANY & nFrmType ) { if( MoveSection( fnSectionCurr, fnSectionStart ) ) - return TRUE; + return sal_True; else if ( FRMTYPE_FLY_FREE & nFrmType || bDontMoveRegion ) - return FALSE; + return sal_False; } if(( FRMTYPE_HEADER | FRMTYPE_FOOTER | FRMTYPE_FOOTNOTE ) & nFrmType ) { if ( MoveSection( fnSectionCurr, fnSectionStart ) ) - return TRUE; + return sal_True; else if ( bKeepArea ) - return TRUE; + return sal_True; } // Bereiche ??? return SwCrsrShell::MoveRegion( fnRegionCurrAndSkip, fnRegionStart ) || - SwCrsrShell::SttEndDoc(TRUE); + SwCrsrShell::SttEndDoc(sal_True); } -BOOL SwWrtShell::GoEnd(BOOL bKeepArea, BOOL *pMoveTable) +sal_Bool SwWrtShell::GoEnd(sal_Bool bKeepArea, sal_Bool *pMoveTable) { if ( pMoveTable && *pMoveTable ) return MoveTable( fnTableCurr, fnTableEnd ); @@ -298,49 +298,49 @@ BOOL SwWrtShell::GoEnd(BOOL bKeepArea, BOOL *pMoveTable) { if ( MoveSection( fnSectionCurr, fnSectionEnd ) || MoveTable( fnTableCurr, fnTableEnd ) ) - return TRUE; + return sal_True; } else { - const USHORT nFrmType = GetFrmType(0,FALSE); + const sal_uInt16 nFrmType = GetFrmType(0,sal_False); if ( FRMTYPE_FLY_ANY & nFrmType ) { if ( MoveSection( fnSectionCurr, fnSectionEnd ) ) - return TRUE; + return sal_True; else if ( FRMTYPE_FLY_FREE & nFrmType ) - return FALSE; + return sal_False; } if(( FRMTYPE_HEADER | FRMTYPE_FOOTER | FRMTYPE_FOOTNOTE ) & nFrmType ) { if ( MoveSection( fnSectionCurr, fnSectionEnd) ) - return TRUE; + return sal_True; else if ( bKeepArea ) - return TRUE; + return sal_True; } } // Bereiche ??? return SwCrsrShell::MoveRegion( fnRegionCurrAndSkip, fnRegionEnd ) || - SwCrsrShell::SttEndDoc(FALSE); + SwCrsrShell::SttEndDoc(sal_False); } -BOOL SwWrtShell::SttDoc( BOOL bSelect ) +sal_Bool SwWrtShell::SttDoc( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect ); - return GoStart(FALSE, 0, bSelect ); + return GoStart(sal_False, 0, bSelect ); } -BOOL SwWrtShell::EndDoc( BOOL bSelect) +sal_Bool SwWrtShell::EndDoc( sal_Bool bSelect) { ShellMoveCrsr aTmp( this, bSelect ); return GoEnd(); } -BOOL SwWrtShell::SttNxtPg( BOOL bSelect ) +sal_Bool SwWrtShell::SttNxtPg( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect ); return MovePage( fnPageNext, fnPageStart ); @@ -348,7 +348,7 @@ BOOL SwWrtShell::SttNxtPg( BOOL bSelect ) -BOOL SwWrtShell::SttPrvPg( BOOL bSelect ) +sal_Bool SwWrtShell::SttPrvPg( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect ); return MovePage( fnPagePrev, fnPageStart ); @@ -356,7 +356,7 @@ BOOL SwWrtShell::SttPrvPg( BOOL bSelect ) -BOOL SwWrtShell::EndNxtPg( BOOL bSelect ) +sal_Bool SwWrtShell::EndNxtPg( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect ); return MovePage( fnPageNext, fnPageEnd ); @@ -364,7 +364,7 @@ BOOL SwWrtShell::EndNxtPg( BOOL bSelect ) -BOOL SwWrtShell::EndPrvPg( BOOL bSelect ) +sal_Bool SwWrtShell::EndPrvPg( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect ); return MovePage( fnPagePrev, fnPageEnd ); @@ -372,7 +372,7 @@ BOOL SwWrtShell::EndPrvPg( BOOL bSelect ) -BOOL SwWrtShell::SttPg( BOOL bSelect ) +sal_Bool SwWrtShell::SttPg( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect ); return MovePage( fnPageCurr, fnPageStart ); @@ -380,7 +380,7 @@ BOOL SwWrtShell::SttPg( BOOL bSelect ) -BOOL SwWrtShell::EndPg( BOOL bSelect ) +sal_Bool SwWrtShell::EndPg( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect ); return MovePage( fnPageCurr, fnPageEnd ); @@ -388,7 +388,7 @@ BOOL SwWrtShell::EndPg( BOOL bSelect ) -BOOL SwWrtShell::SttPara( BOOL bSelect ) +sal_Bool SwWrtShell::SttPara( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect ); return MovePara( fnParaCurr, fnParaStart ); @@ -396,7 +396,7 @@ BOOL SwWrtShell::SttPara( BOOL bSelect ) -BOOL SwWrtShell::EndPara( BOOL bSelect ) +sal_Bool SwWrtShell::EndPara( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect ); return MovePara(fnParaCurr,fnParaEnd); @@ -411,7 +411,7 @@ BOOL SwWrtShell::EndPara( BOOL bSelect ) -BOOL SwWrtShell::StartOfColumn( BOOL bSelect ) +sal_Bool SwWrtShell::StartOfColumn( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect); return MoveColumn(fnColumnCurr, fnColumnStart); @@ -419,7 +419,7 @@ BOOL SwWrtShell::StartOfColumn( BOOL bSelect ) -BOOL SwWrtShell::EndOfColumn( BOOL bSelect ) +sal_Bool SwWrtShell::EndOfColumn( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect); return MoveColumn(fnColumnCurr, fnColumnEnd); @@ -427,7 +427,7 @@ BOOL SwWrtShell::EndOfColumn( BOOL bSelect ) -BOOL SwWrtShell::StartOfNextColumn( BOOL bSelect ) +sal_Bool SwWrtShell::StartOfNextColumn( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect); return MoveColumn( fnColumnNext, fnColumnStart); @@ -435,7 +435,7 @@ BOOL SwWrtShell::StartOfNextColumn( BOOL bSelect ) -BOOL SwWrtShell::EndOfNextColumn( BOOL bSelect ) +sal_Bool SwWrtShell::EndOfNextColumn( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect); return MoveColumn(fnColumnNext, fnColumnEnd); @@ -443,7 +443,7 @@ BOOL SwWrtShell::EndOfNextColumn( BOOL bSelect ) -BOOL SwWrtShell::StartOfPrevColumn( BOOL bSelect ) +sal_Bool SwWrtShell::StartOfPrevColumn( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect); return MoveColumn(fnColumnPrev, fnColumnStart); @@ -451,7 +451,7 @@ BOOL SwWrtShell::StartOfPrevColumn( BOOL bSelect ) -BOOL SwWrtShell::EndOfPrevColumn( BOOL bSelect ) +sal_Bool SwWrtShell::EndOfPrevColumn( sal_Bool bSelect ) { ShellMoveCrsr aTmp( this, bSelect); return MoveColumn(fnColumnPrev, fnColumnEnd); @@ -459,9 +459,9 @@ BOOL SwWrtShell::EndOfPrevColumn( BOOL bSelect ) -BOOL SwWrtShell::PushCrsr(SwTwips lOffset, BOOL bSelect) +sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect) { - BOOL bDiff = FALSE; + sal_Bool bDiff = sal_False; SwRect aOldRect( GetCharRect() ), aTmpArea( VisArea() ); //bDestOnStack besagt, ob ich den Cursor nicht an die aktuelle Position @@ -478,15 +478,15 @@ BOOL SwWrtShell::PushCrsr(SwTwips lOffset, BOOL bSelect) aPt.Y() += lOffset; aDest = GetCntntPos(aPt,lOffset > 0); aDest.X() = aPt.X(); - bDestOnStack = TRUE; + bDestOnStack = sal_True; } //falls wir eine Rahmenselektion hatten, muss diese nach dem //fnSetCrsr entfernt werden und damit wir da wieder hinkommen //auf dem Stack gemerkt werden. - BOOL bIsFrmSel = FALSE; + sal_Bool bIsFrmSel = sal_False; - BOOL bIsObjSel = FALSE; + sal_Bool bIsObjSel = sal_False; //Zielposition liegt jetzt innerhalb des sichtbaren Bereiches --> //Cursor an die Zielposition setzen; merken, dass keine Ziel- @@ -517,7 +517,7 @@ BOOL SwWrtShell::PushCrsr(SwTwips lOffset, BOOL bSelect) CallChgLnk(); } - (this->*fnSetCrsr)( &aDest, TRUE ); + (this->*fnSetCrsr)( &aDest, sal_True ); bDiff = aOldRect != GetCharRect(); @@ -530,7 +530,7 @@ BOOL SwWrtShell::PushCrsr(SwTwips lOffset, BOOL bSelect) } // Zuruecksetzen des Dest. SPoint Flags - bDestOnStack = FALSE; + bDestOnStack = sal_False; } // Position auf den Stack; bDiff besagt, ob ein Unterschied zwischen @@ -542,12 +542,12 @@ BOOL SwWrtShell::PushCrsr(SwTwips lOffset, BOOL bSelect) -BOOL SwWrtShell::PopCrsr(BOOL bUpdate, BOOL bSelect) +sal_Bool SwWrtShell::PopCrsr(sal_Bool bUpdate, sal_Bool bSelect) { if( 0 == pCrsrStack) - return FALSE; + return sal_False; - const BOOL bValidPos = pCrsrStack->bValidCurPos; + const sal_Bool bValidPos = pCrsrStack->bValidCurPos; if( bUpdate && bValidPos ) { // falls ein Vorgaenger auf dem Stack steht, dessen Flag fuer eine @@ -575,7 +575,7 @@ BOOL SwWrtShell::PopCrsr(BOOL bUpdate, BOOL bSelect) else { _ResetCursorStack(); - return FALSE; + return sal_False; } } CrsrStack *pTmp = pCrsrStack; @@ -584,7 +584,7 @@ BOOL SwWrtShell::PopCrsr(BOOL bUpdate, BOOL bSelect) if( 0 == pCrsrStack ) { ePageMove = MV_NO; - bDestOnStack = FALSE; + bDestOnStack = sal_False; } return bValidPos; } @@ -606,7 +606,7 @@ void SwWrtShell::_ResetCursorStack() pCrsrStack = pTmp; } ePageMove = MV_NO; - bDestOnStack = FALSE; + bDestOnStack = sal_False; } /************** @@ -621,10 +621,10 @@ void SwWrtShell::_ResetCursorStack() -BOOL SwWrtShell::PageCrsr(SwTwips lOffset, BOOL bSelect) +sal_Bool SwWrtShell::PageCrsr(SwTwips lOffset, sal_Bool bSelect) { // nichts tun, wenn ein Offset von 0 angegeben wurde - if(!lOffset) return FALSE; + if(!lOffset) return sal_False; // Diente mal dazu, eine Neuformatierung fuer das Layout // zu erzwingen. // Hat so nicht funktioniert, da der Cursor nicht gesetzt @@ -640,19 +640,19 @@ BOOL SwWrtShell::PageCrsr(SwTwips lOffset, BOOL bSelect) // ViewShell::StartAction(); PageMove eDir = lOffset > 0? MV_PAGE_DOWN: MV_PAGE_UP; // Richtungswechsel und Stack vorhanden - if( eDir != ePageMove && ePageMove != MV_NO && PopCrsr( TRUE, bSelect )) - return TRUE; + if( eDir != ePageMove && ePageMove != MV_NO && PopCrsr( sal_True, bSelect )) + return sal_True; - const BOOL bRet = PushCrsr(lOffset, bSelect); + const sal_Bool bRet = PushCrsr(lOffset, bSelect); ePageMove = eDir; return bRet; } -BOOL SwWrtShell::GotoPage(USHORT nPage, BOOL bRecord) +sal_Bool SwWrtShell::GotoPage(sal_uInt16 nPage, sal_Bool bRecord) { - ShellMoveCrsr aTmp( this, FALSE); + ShellMoveCrsr aTmp( this, sal_False); if( SwCrsrShell::GotoPage(nPage) && bRecord) { if(IsSelFrmMode()) @@ -660,14 +660,14 @@ BOOL SwWrtShell::GotoPage(USHORT nPage, BOOL bRecord) UnSelectFrm(); LeaveSelFrmMode(); } - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, BOOL bSelect, BOOL bStart ) +sal_Bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, sal_Bool bSelect, sal_Bool bStart ) { ShellMoveCrsr aTmp( this, bSelect ); return SwCrsrShell::GotoMark( pMark, bStart ); @@ -675,13 +675,13 @@ BOOL SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, BOOL bSelect, B -BOOL SwWrtShell::SelectTxtAttr( USHORT nWhich, const SwTxtAttr* pAttr ) +sal_Bool SwWrtShell::SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr ) { - BOOL bRet; + sal_Bool bRet; { MV_KONTEXT(this); SttSelect(); - bRet = SwCrsrShell::SelectTxtAttr( nWhich, FALSE, pAttr ); + bRet = SwCrsrShell::SelectTxtAttr( nWhich, sal_False, pAttr ); } EndSelect(); return bRet; |