summaryrefslogtreecommitdiff
path: root/sc/source/ui/view/cellsh4.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/view/cellsh4.cxx')
-rw-r--r--sc/source/ui/view/cellsh4.cxx102
1 files changed, 51 insertions, 51 deletions
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index d5062793940d..894bee330330 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -55,22 +55,22 @@
//------------------------------------------------------------------
#define IS_AVAILABLE(WhichId,ppItem) \
- (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
+ (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
void ScCellShell::ExecuteCursor( SfxRequest& rReq )
{
ScViewData* pData = GetViewData();
- ScTabViewShell* pTabViewShell = pData->GetViewShell();
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- sal_uInt16 nSlotId = rReq.GetSlot();
- SCsCOLROW nRepeat = 1;
- sal_Bool bSel = false;
- sal_Bool bKeep = false;
+ ScTabViewShell* pTabViewShell = pData->GetViewShell();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlotId = rReq.GetSlot();
+ SCsCOLROW nRepeat = 1;
+ BOOL bSel = FALSE;
+ BOOL bKeep = FALSE;
if ( pReqArgs != NULL )
{
- const SfxPoolItem* pItem;
+ const SfxPoolItem* pItem;
if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
nRepeat = static_cast<SCsCOLROW>(((const SfxInt16Item*)pItem)->GetValue());
if( IS_AVAILABLE( FN_PARAM_2, &pItem ) )
@@ -78,15 +78,15 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
}
else
{
- // evaluate locked selection mode
+ // evaluate locked selection mode
- sal_uInt16 nLocked = pTabViewShell->GetLockedModifiers();
+ USHORT nLocked = pTabViewShell->GetLockedModifiers();
if ( nLocked & KEY_SHIFT )
- bSel = sal_True; // EXT
+ bSel = TRUE; // EXT
else if ( nLocked & KEY_MOD1 )
{
// ADD mode: keep the selection, start a new block when marking with shift again
- bKeep = true;
+ bKeep = TRUE;
}
}
@@ -140,7 +140,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
SCsCOLROW nRTLSign = 1;
if ( pData->GetDocument()->IsLayoutRTL( pData->GetTabNo() ) )
{
- //! evaluate cursor movement option?
+ //! evaluate cursor movement option?
nRTLSign = -1;
}
@@ -152,7 +152,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
switch ( nSlotId )
{
case SID_CURSORDOWN:
- pTabViewShell->MoveCursorRel( 0, nRepeat, SC_FOLLOW_LINE, bSel, bKeep );
+ pTabViewShell->MoveCursorRel( 0, nRepeat, SC_FOLLOW_LINE, bSel, bKeep );
break;
case SID_CURSORBLKDOWN:
@@ -160,7 +160,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
break;
case SID_CURSORUP:
- pTabViewShell->MoveCursorRel( 0, -nRepeat, SC_FOLLOW_LINE, bSel, bKeep );
+ pTabViewShell->MoveCursorRel( 0, -nRepeat, SC_FOLLOW_LINE, bSel, bKeep );
break;
case SID_CURSORBLKUP:
@@ -176,7 +176,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
break;
case SID_CURSORRIGHT:
- pTabViewShell->MoveCursorRel( static_cast<SCsCOL>(nRepeat * nRTLSign), 0, SC_FOLLOW_LINE, bSel, bKeep );
+ pTabViewShell->MoveCursorRel( static_cast<SCsCOL>(nRepeat * nRTLSign), 0, SC_FOLLOW_LINE, bSel, bKeep );
break;
case SID_CURSORBLKRIGHT:
@@ -184,11 +184,11 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
break;
case SID_CURSORPAGEDOWN:
- pTabViewShell->MoveCursorPage( 0, nRepeat, SC_FOLLOW_FIX, bSel, bKeep );
+ pTabViewShell->MoveCursorPage( 0, nRepeat, SC_FOLLOW_FIX, bSel, bKeep );
break;
case SID_CURSORPAGEUP:
- pTabViewShell->MoveCursorPage( 0, -nRepeat, SC_FOLLOW_FIX, bSel, bKeep );
+ pTabViewShell->MoveCursorPage( 0, -nRepeat, SC_FOLLOW_FIX, bSel, bKeep );
break;
case SID_CURSORPAGERIGHT_: //XXX !!!
@@ -200,7 +200,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
break;
default:
- OSL_FAIL("Unbekannte Message bei ViewShell (Cursor)");
+ DBG_ERROR("Unbekannte Message bei ViewShell (Cursor)");
return;
}
@@ -279,8 +279,8 @@ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
void ScCellShell::ExecuteMove( SfxRequest& rReq )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- sal_uInt16 nSlotId = rReq.GetSlot();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ USHORT nSlotId = rReq.GetSlot();
if(nSlotId != SID_CURSORTOPOFSCREEN && nSlotId != SID_CURSORENDOFSCREEN)
pTabViewShell->ExecuteInputDirect();
@@ -296,29 +296,29 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
pTabViewShell->SelectNextTab( -1, (nSlotId == SID_PREV_TABLE_SEL) );
break;
- // Cursorbewegungen in Bloecken gehen nicht von Basic aus,
- // weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert
+ // Cursorbewegungen in Bloecken gehen nicht von Basic aus,
+ // weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert
case SID_NEXT_UNPROTECT:
- pTabViewShell->FindNextUnprot( false, !rReq.IsAPI() );
+ pTabViewShell->FindNextUnprot( FALSE, !rReq.IsAPI() );
break;
case SID_PREV_UNPROTECT:
- pTabViewShell->FindNextUnprot( sal_True, !rReq.IsAPI() );
+ pTabViewShell->FindNextUnprot( 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, FALSE );
else
- pTabViewShell->MoveCursorEnter( sal_True );
+ pTabViewShell->MoveCursorEnter( TRUE );
break;
case SID_CURSORENTERDOWN:
if (rReq.IsAPI())
- pTabViewShell->MoveCursorRel( 0, 1, SC_FOLLOW_LINE, false );
+ pTabViewShell->MoveCursorRel( 0, 1, SC_FOLLOW_LINE, FALSE );
else
- pTabViewShell->MoveCursorEnter( false );
+ pTabViewShell->MoveCursorEnter( FALSE );
break;
case SID_SELECT_COL:
@@ -362,15 +362,15 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
break;
case SID_CURSORTOPOFSCREEN:
- pTabViewShell->MoveCursorScreen( 0, -1, SC_FOLLOW_LINE, false );
+ pTabViewShell->MoveCursorScreen( 0, -1, SC_FOLLOW_LINE, FALSE );
break;
case SID_CURSORENDOFSCREEN:
- pTabViewShell->MoveCursorScreen( 0, 1, SC_FOLLOW_LINE, false );
+ pTabViewShell->MoveCursorScreen( 0, 1, SC_FOLLOW_LINE, FALSE );
break;
default:
- OSL_FAIL("Unbekannte Message bei ViewShell (Cursor)");
+ DBG_ERROR("Unbekannte Message bei ViewShell (Cursor)");
return;
}
@@ -379,46 +379,46 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
void ScCellShell::ExecutePageSel( SfxRequest& rReq )
{
- sal_uInt16 nSlotId = rReq.GetSlot();
+ USHORT nSlotId = rReq.GetSlot();
switch ( nSlotId )
{
- case SID_CURSORHOME_SEL: rReq.SetSlot( SID_CURSORHOME ); break;
- case SID_CURSOREND_SEL: rReq.SetSlot( SID_CURSOREND ); break;
- case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break;
- case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break;
+ case SID_CURSORHOME_SEL: rReq.SetSlot( SID_CURSORHOME ); break;
+ case SID_CURSOREND_SEL: rReq.SetSlot( SID_CURSOREND ); break;
+ case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break;
+ case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break;
default:
- OSL_FAIL("Unbekannte Message bei ViewShell (ExecutePageSel)");
+ DBG_ERROR("Unbekannte Message bei ViewShell (ExecutePageSel)");
return;
}
- rReq.AppendItem( SfxBoolItem(FN_PARAM_2, sal_True) );
+ rReq.AppendItem( SfxBoolItem(FN_PARAM_2, TRUE) );
ExecuteSlot( rReq, GetInterface() );
}
void ScCellShell::ExecutePage( SfxRequest& rReq )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- sal_uInt16 nSlotId = rReq.GetSlot();
- sal_Bool bSel = false;
- sal_Bool bKeep = false;
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlotId = rReq.GetSlot();
+ BOOL bSel = FALSE;
+ BOOL bKeep = FALSE;
if ( pReqArgs != NULL )
{
- const SfxPoolItem* pItem;
+ const SfxPoolItem* pItem;
if( IS_AVAILABLE( FN_PARAM_2, &pItem ) )
bSel = ((const SfxBoolItem*)pItem)->GetValue();
}
else
{
- // evaluate locked selection mode
+ // evaluate locked selection mode
- sal_uInt16 nLocked = pTabViewShell->GetLockedModifiers();
+ USHORT nLocked = pTabViewShell->GetLockedModifiers();
if ( nLocked & KEY_SHIFT )
- bSel = sal_True; // EXT
+ bSel = TRUE; // EXT
else if ( nLocked & KEY_MOD1 )
{
// ADD mode: keep the selection, start a new block when marking with shift again
- bKeep = true;
+ bKeep = TRUE;
}
}
@@ -442,7 +442,7 @@ void ScCellShell::ExecutePage( SfxRequest& rReq )
break;
default:
- OSL_FAIL("Unbekannte Message bei ViewShell (ExecutePage)");
+ DBG_ERROR("Unbekannte Message bei ViewShell (ExecutePage)");
return;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 13:58:54 +0000