diff options
Diffstat (limited to 'sc/source/ui/view/cellsh4.cxx')
| -rw-r--r-- | sc/source/ui/view/cellsh4.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index e8419a24c80f..545aba28ff47 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.cxx @@ -53,7 +53,7 @@ //------------------------------------------------------------------ #define IS_AVAILABLE(WhichId,ppItem) \ - (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET) + (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET) void ScCellShell::ExecuteCursor( SfxRequest& rReq ) @@ -61,10 +61,10 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) ScViewData* pData = GetViewData(); ScTabViewShell* pTabViewShell = pData->GetViewShell(); const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); + sal_uInt16 nSlotId = rReq.GetSlot(); SCsCOLROW nRepeat = 1; - BOOL bSel = FALSE; - BOOL bKeep = FALSE; + sal_Bool bSel = sal_False; + sal_Bool bKeep = sal_False; if ( pReqArgs != NULL ) { @@ -78,13 +78,13 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) { // evaluate locked selection mode - USHORT nLocked = pTabViewShell->GetLockedModifiers(); + sal_uInt16 nLocked = pTabViewShell->GetLockedModifiers(); if ( nLocked & KEY_SHIFT ) - bSel = TRUE; // EXT + bSel = sal_True; // EXT else if ( nLocked & KEY_MOD1 ) { // ADD mode: keep the selection, start a new block when marking with shift again - bKeep = TRUE; + bKeep = sal_True; pTabViewShell->SetNewStartIfMarking(); } } @@ -170,7 +170,7 @@ void ScCellShell::GetStateCursor( SfxItemSet& /* rSet */ ) void ScCellShell::ExecuteCursorSel( SfxRequest& rReq ) { const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); + sal_uInt16 nSlotId = rReq.GetSlot(); short nRepeat = 1; if ( pReqArgs != NULL ) @@ -199,14 +199,14 @@ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq ) return; } rReq.AppendItem( SfxInt16Item(FN_PARAM_1, nRepeat ) ); - rReq.AppendItem( SfxBoolItem(FN_PARAM_2, TRUE) ); + rReq.AppendItem( SfxBoolItem(FN_PARAM_2, sal_True) ); ExecuteSlot( rReq, GetInterface() ); } void ScCellShell::ExecuteMove( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - USHORT nSlotId = rReq.GetSlot(); + sal_uInt16 nSlotId = rReq.GetSlot(); if(nSlotId != SID_CURSORTOPOFSCREEN && nSlotId != SID_CURSORENDOFSCREEN) pTabViewShell->ExecuteInputDirect(); @@ -226,25 +226,25 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) // weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert case SID_NEXT_UNPROTECT: - pTabViewShell->FindNextUnprot( FALSE, !rReq.IsAPI() ); + pTabViewShell->FindNextUnprot( sal_False, !rReq.IsAPI() ); break; case SID_PREV_UNPROTECT: - pTabViewShell->FindNextUnprot( TRUE, !rReq.IsAPI() ); + pTabViewShell->FindNextUnprot( sal_True, !rReq.IsAPI() ); break; case SID_CURSORENTERUP: if (rReq.IsAPI()) - pTabViewShell->MoveCursorRel( 0, -1, SC_FOLLOW_LINE, FALSE ); + pTabViewShell->MoveCursorRel( 0, -1, SC_FOLLOW_LINE, sal_False ); else - pTabViewShell->MoveCursorEnter( TRUE ); + pTabViewShell->MoveCursorEnter( sal_True ); break; case SID_CURSORENTERDOWN: if (rReq.IsAPI()) - pTabViewShell->MoveCursorRel( 0, 1, SC_FOLLOW_LINE, FALSE ); + pTabViewShell->MoveCursorRel( 0, 1, SC_FOLLOW_LINE, sal_False ); else - pTabViewShell->MoveCursorEnter( FALSE ); + pTabViewShell->MoveCursorEnter( sal_False ); break; case SID_SELECT_COL: @@ -288,11 +288,11 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) break; case SID_CURSORTOPOFSCREEN: - pTabViewShell->MoveCursorScreen( 0, -1, SC_FOLLOW_LINE, FALSE ); + pTabViewShell->MoveCursorScreen( 0, -1, SC_FOLLOW_LINE, sal_False ); break; case SID_CURSORENDOFSCREEN: - pTabViewShell->MoveCursorScreen( 0, 1, SC_FOLLOW_LINE, FALSE ); + pTabViewShell->MoveCursorScreen( 0, 1, SC_FOLLOW_LINE, sal_False ); break; default: @@ -305,7 +305,7 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) void ScCellShell::ExecutePageSel( SfxRequest& rReq ) { - USHORT nSlotId = rReq.GetSlot(); + sal_uInt16 nSlotId = rReq.GetSlot(); switch ( nSlotId ) { case SID_CURSORHOME_SEL: rReq.SetSlot( SID_CURSORHOME ); break; @@ -316,7 +316,7 @@ void ScCellShell::ExecutePageSel( SfxRequest& rReq ) DBG_ERROR("Unbekannte Message bei ViewShell (ExecutePageSel)"); return; } - rReq.AppendItem( SfxBoolItem(FN_PARAM_2, TRUE) ); + rReq.AppendItem( SfxBoolItem(FN_PARAM_2, sal_True) ); ExecuteSlot( rReq, GetInterface() ); } @@ -324,9 +324,9 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); - BOOL bSel = FALSE; - BOOL bKeep = FALSE; + sal_uInt16 nSlotId = rReq.GetSlot(); + sal_Bool bSel = sal_False; + sal_Bool bKeep = sal_False; if ( pReqArgs != NULL ) { @@ -338,13 +338,13 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) { // evaluate locked selection mode - USHORT nLocked = pTabViewShell->GetLockedModifiers(); + sal_uInt16 nLocked = pTabViewShell->GetLockedModifiers(); if ( nLocked & KEY_SHIFT ) - bSel = TRUE; // EXT + bSel = sal_True; // EXT else if ( nLocked & KEY_MOD1 ) { // ADD mode: keep the selection, start a new block when marking with shift again - bKeep = TRUE; + bKeep = sal_True; pTabViewShell->SetNewStartIfMarking(); } } |