diff options
Diffstat (limited to 'sc/source/ui/view/tabview3.cxx')
| -rw-r--r-- | sc/source/ui/view/tabview3.cxx | 330 |
1 files changed, 165 insertions, 165 deletions
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 93d1edd7fee5..3622042646e2 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -114,7 +114,7 @@ using namespace com::sun::star; // --- Public-Funktionen // -void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ) +void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, sal_Bool bControl ) { ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); @@ -123,11 +123,11 @@ void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ) while (pDoc->IsVerOverlapped( nPosX, nPosY, nTab )) --nPosY; - BOOL bRefMode = SC_MOD()->IsFormulaMode(); + sal_Bool bRefMode = SC_MOD()->IsFormulaMode(); if ( bRefMode ) { - DoneRefMode( FALSE ); + DoneRefMode( sal_False ); if (bControl) SC_MOD()->AddRefEntry(); @@ -146,9 +146,9 @@ void ScTabView::UpdateAutoFillMark() { // single selection or cursor ScRange aMarkRange; - BOOL bMarked = (aViewData.GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE); + sal_Bool bMarked = (aViewData.GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE); - USHORT i; + sal_uInt16 i; for (i=0; i<4; i++) if (pGridWin[i] && pGridWin[i]->IsVisible()) pGridWin[i]->UpdateAutoFillMark( bMarked, aMarkRange ); @@ -174,7 +174,7 @@ void ScTabView::FakeButtonUp( ScSplitPos eWhich ) void ScTabView::HideAllCursors() { - for (USHORT i=0; i<4; i++) + for (sal_uInt16 i=0; i<4; i++) if (pGridWin[i]) if (pGridWin[i]->IsVisible()) { @@ -188,7 +188,7 @@ void ScTabView::HideAllCursors() void ScTabView::ShowAllCursors() { - for (USHORT i=0; i<4; i++) + for (sal_uInt16 i=0; i<4; i++) if (pGridWin[i]) if (pGridWin[i]->IsVisible()) { @@ -276,7 +276,7 @@ void ScTabView::InvalidateAttribs() #pragma optimize ( "", off ) #endif -void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew ) +void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, sal_Bool bNew ) { SCCOL nOldX = aViewData.GetCurX(); SCROW nOldY = aViewData.GetCurY(); @@ -452,7 +452,7 @@ void ScTabView::SelectionChanged() void ScTabView::CursorPosChanged() { - BOOL bRefMode = SC_MOD()->IsFormulaMode(); + sal_Bool bRefMode = SC_MOD()->IsFormulaMode(); if ( !bRefMode ) // Abfrage, damit RefMode bei Tabellenwechsel funktioniert aViewData.GetDocShell()->Broadcast( SfxSimpleHint( FID_KILLEDITVIEW ) ); @@ -474,7 +474,7 @@ void ScTabView::TestHintWindow() { // show input help window and list drop-down button for validity - BOOL bListValButton = FALSE; + sal_Bool bListValButton = sal_False; ScAddress aListValPos; ScDocument* pDoc = aViewData.GetDocument(); @@ -556,13 +556,13 @@ void ScTabView::TestHintWindow() if ( pData && pData->HasSelectionList() ) { aListValPos.Set( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo() ); - bListValButton = TRUE; + bListValButton = sal_True; } } else DELETEZ(pInputHintWindow); - for ( USHORT i=0; i<4; i++ ) + for ( sal_uInt16 i=0; i<4; i++ ) if ( pGridWin[i] && pGridWin[i]->IsVisible() ) pGridWin[i]->UpdateListValPos( bListValButton, aListValPos ); } @@ -619,8 +619,8 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, ScSplitPos eActive = aViewData.GetActivePart(); ScHSplitPos eActiveX = WhichH(eActive); ScVSplitPos eActiveY = WhichV(eActive); - BOOL bHFix = (aViewData.GetHSplitMode() == SC_SPLIT_FIX); - BOOL bVFix = (aViewData.GetVSplitMode() == SC_SPLIT_FIX); + sal_Bool bHFix = (aViewData.GetHSplitMode() == SC_SPLIT_FIX); + sal_Bool bVFix = (aViewData.GetVSplitMode() == SC_SPLIT_FIX); if (bHFix) if (eActiveX == SC_SPLIT_LEFT && nCurX >= (SCsCOL)aViewData.GetFixPosX()) { @@ -664,7 +664,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, long nSpaceY = ( aScrSize.Height() - nCellSizeY ) / 2; // nSpaceY: desired start position of cell for FOLLOW_JUMP, modified if dialog interferes - BOOL bForceNew = FALSE; // force new calculation of JUMP position (vertical only) + sal_Bool bForceNew = sal_False; // force new calculation of JUMP position (vertical only) // VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY ) @@ -679,7 +679,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, Window* pCare = lcl_GetCareWin( aViewData.GetViewShell()->GetViewFrame() ); if (pCare) { - BOOL bLimit = FALSE; + sal_Bool bLimit = sal_False; Rectangle aDlgPixel; Size aWinSize; Window* pWin = GetActiveWin(); @@ -692,7 +692,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, { if ( nCurX < nDeltaX || nCurX >= nDeltaX+nSizeX || nCurY < nDeltaY || nCurY >= nDeltaY+nSizeY ) - bLimit = TRUE; // es wird sowieso gescrollt + bLimit = sal_True; // es wird sowieso gescrollt else { // Cursor ist auf dem Bildschirm @@ -701,14 +701,14 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, aViewData.GetMergeSizePixel( nCurX, nCurY, nCSX, nCSY ); Rectangle aCursor( aStart, Size( nCSX, nCSY ) ); if ( aCursor.IsOver( aDlgPixel ) ) - bLimit = TRUE; // Zelle vom Dialog ueberdeckt + bLimit = sal_True; // Zelle vom Dialog ueberdeckt } } } if (bLimit) { - BOOL bBottom = FALSE; + sal_Bool bBottom = sal_False; long nTopSpace = aDlgPixel.Top(); long nBotSpace = aWinSize.Height() - aDlgPixel.Bottom(); if ( nBotSpace > 0 && nBotSpace > nTopSpace ) @@ -723,14 +723,14 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, if ( nCurY >= nDiff ) // Pos. kann nicht negativ werden { nSpaceY = nDlgBot + ( nBotSpace - nCellSizeY ) / 2; - bBottom = TRUE; - bForceNew = TRUE; + bBottom = sal_True; + bForceNew = sal_True; } } if ( !bBottom && nTopSpace > 0 ) { nSpaceY = ( nTopSpace - nCellSizeY ) / 2; - bForceNew = TRUE; + bForceNew = sal_True; } } } @@ -739,28 +739,28 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, SCsCOL nNewDeltaX = nDeltaX; SCsROW nNewDeltaY = nDeltaY; - BOOL bDoLine = FALSE; + sal_Bool bDoLine = sal_False; switch (eMode) { case SC_FOLLOW_JUMP: if ( nCurX < nDeltaX || nCurX >= nDeltaX+nSizeX ) { - nNewDeltaX = nCurX - static_cast<SCsCOL>(aViewData.CellsAtX( nCurX, -1, eAlignX, static_cast<USHORT>(nSpaceX) )); + nNewDeltaX = nCurX - static_cast<SCsCOL>(aViewData.CellsAtX( nCurX, -1, eAlignX, static_cast<sal_uInt16>(nSpaceX) )); if (nNewDeltaX < 0) nNewDeltaX = 0; nSizeX = (SCsCOL) aViewData.CellsAtX( nNewDeltaX, 1, eAlignX ); } if ( nCurY < nDeltaY || nCurY >= nDeltaY+nSizeY || bForceNew ) { - nNewDeltaY = nCurY - static_cast<SCsROW>(aViewData.CellsAtY( nCurY, -1, eAlignY, static_cast<USHORT>(nSpaceY) )); + nNewDeltaY = nCurY - static_cast<SCsROW>(aViewData.CellsAtY( nCurY, -1, eAlignY, static_cast<sal_uInt16>(nSpaceY) )); if (nNewDeltaY < 0) nNewDeltaY = 0; nSizeY = (SCsROW) aViewData.CellsAtY( nNewDeltaY, 1, eAlignY ); } - bDoLine = TRUE; + bDoLine = sal_True; break; case SC_FOLLOW_LINE: - bDoLine = TRUE; + bDoLine = sal_True; break; case SC_FOLLOW_FIX: @@ -790,7 +790,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, nSizeY = (SCsROW) aViewData.CellsAtY( nNewDeltaY, 1, eAlignY ); } - bDoLine = TRUE; + bDoLine = sal_True; break; case SC_FOLLOW_NONE: @@ -856,22 +856,22 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, } } -BOOL ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt ) +sal_Bool ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; // #i3875# *Hack* - BOOL bMod1Locked = aViewData.GetViewShell()->GetLockedModifiers() & KEY_MOD1 ? TRUE : FALSE; + sal_Bool bMod1Locked = aViewData.GetViewShell()->GetLockedModifiers() & KEY_MOD1 ? sal_True : sal_False; aViewData.SetSelCtrlMouseClick( rMEvt.IsMod1() || bMod1Locked ); if ( pSelEngine ) { bMoveIsShift = rMEvt.IsShift(); bRet = pSelEngine->SelMouseButtonDown( rMEvt ); - bMoveIsShift = FALSE; + bMoveIsShift = sal_False; } - aViewData.SetSelCtrlMouseClick( FALSE ); // #i3875# *Hack* + aViewData.SetSelCtrlMouseClick( sal_False ); // #i3875# *Hack* return bRet; } @@ -881,7 +881,7 @@ BOOL ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt ) // void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, - BOOL bShift, BOOL bControl, BOOL bKeepOld, BOOL bKeepSel ) + sal_Bool bShift, sal_Bool bControl, sal_Bool bKeepOld, sal_Bool bKeepSel ) { if (!bKeepOld) aViewData.ResetOldCursor(); @@ -896,8 +896,8 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, if ( bShift && bNewStartIfMarking && IsBlockMode() ) { // used for ADD selection mode: start a new block from the cursor position - DoneBlockMode( TRUE ); - InitBlockMode( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo(), TRUE ); + DoneBlockMode( sal_True ); + InitBlockMode( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo(), sal_True ); } // aktiven Teil umschalten jetzt in AlignToCursor @@ -909,11 +909,11 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, SetCursor( nCurX, nCurY ); // Markierung stehenlassen else { - BOOL bSame = ( nCurX == aViewData.GetCurX() && nCurY == aViewData.GetCurY() ); + sal_Bool bSame = ( nCurX == aViewData.GetCurX() && nCurY == aViewData.GetCurY() ); bMoveIsShift = bShift; pSelEngine->CursorPosChanging( bShift, bControl ); - bMoveIsShift = FALSE; - aFunctionSet.SetCursorAtCell( nCurX, nCurY, FALSE ); + bMoveIsShift = sal_False; + aFunctionSet.SetCursorAtCell( nCurX, nCurY, sal_False ); // Wenn der Cursor nicht bewegt wurde, muss das SelectionChanged fuer das // Aufheben der Selektion hier einzeln passieren: @@ -925,7 +925,7 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, } void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, - BOOL bShift, BOOL bKeepSel ) + sal_Bool bShift, sal_Bool bKeepSel ) { ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); @@ -960,12 +960,12 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, nCurY = (nMovY != 0) ? nOldY+nMovY : (SCsROW) aViewData.GetOldCurY(); } - BOOL bSkipCell = FALSE; + sal_Bool bSkipCell = sal_False; aViewData.ResetOldCursor(); if (nMovX != 0 && VALIDCOLROW(nCurX,nCurY)) { - BOOL bHFlip = FALSE; + sal_Bool bHFlip = sal_False; do { SCCOL nLastCol = -1; @@ -982,13 +982,13 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, if (bHFlip) { nCurX = nOldX; - bSkipCell = FALSE; + bSkipCell = sal_False; } else { nMovX = -nMovX; if (nMovX > 0) ++nCurX; else --nCurX; // zuruecknehmen - bHFlip = TRUE; + bHFlip = sal_True; } } else @@ -1007,7 +1007,7 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, if (nMovY != 0 && VALIDCOLROW(nCurX,nCurY)) { - BOOL bVFlip = FALSE; + sal_Bool bVFlip = sal_False; do { SCROW nLastRow = -1; @@ -1024,13 +1024,13 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, if (bVFlip) { nCurY = nOldY; - bSkipCell = FALSE; + bSkipCell = sal_False; } else { nMovY = -nMovY; if (nMovY > 0) ++nCurY; else --nCurY; // zuruecknehmen - bVFlip = TRUE; + bVFlip = sal_True; } } else @@ -1047,10 +1047,10 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, } } - MoveCursorAbs( nCurX, nCurY, eMode, bShift, FALSE, TRUE, bKeepSel ); + MoveCursorAbs( nCurX, nCurY, eMode, bShift, sal_False, sal_True, bKeepSel ); } -void ScTabView::MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel ) +void ScTabView::MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, sal_Bool bShift, sal_Bool bKeepSel ) { SCCOL nCurX; SCROW nCurY; @@ -1078,7 +1078,7 @@ void ScTabView::MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, MoveCursorRel( nPageX, nPageY, eMode, bShift, bKeepSel ); } -void ScTabView::MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel ) +void ScTabView::MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, sal_Bool bShift, sal_Bool bKeepSel ) { SCCOL nCurX; SCROW nCurY; @@ -1116,7 +1116,7 @@ void ScTabView::MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, eMode, bShift, bKeepSel ); } -void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel ) +void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, sal_Bool bShift, sal_Bool bKeepSel ) { ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); @@ -1146,7 +1146,7 @@ void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, B MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, eMode, bShift, bKeepSel ); } -void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift ) +void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, sal_Bool bShift ) { ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); @@ -1186,15 +1186,15 @@ void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode while (pDoc->IsVerOverlapped( nNewX, nNewY, nTab )) --nNewY; - MoveCursorAbs( nNewX, nNewY, eMode, bShift, FALSE, TRUE ); + MoveCursorAbs( nNewX, nNewY, eMode, bShift, sal_False, sal_True ); } -void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter +void ScTabView::MoveCursorEnter( sal_Bool bShift ) // bShift -> hoch/runter { const ScInputOptions& rOpt = SC_MOD()->GetInputOptions(); if (!rOpt.GetMoveSelection()) { - aViewData.UpdateInputHandler(TRUE); + aViewData.UpdateInputHandler(sal_True); return; } @@ -1227,14 +1227,14 @@ void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter SCTAB nTab = aViewData.GetTabNo(); ScDocument* pDoc = aViewData.GetDocument(); - pDoc->GetNextPos( nNewX,nNewY, nTab, nMoveX,nMoveY, TRUE,FALSE, rMark ); + pDoc->GetNextPos( nNewX,nNewY, nTab, nMoveX,nMoveY, sal_True,sal_False, rMark ); MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, - SC_FOLLOW_LINE, FALSE, TRUE ); + SC_FOLLOW_LINE, sal_False, sal_True ); // update input line even if cursor was not moved if ( nNewX == nCurX && nNewY == nCurY ) - aViewData.UpdateInputHandler(TRUE); + aViewData.UpdateInputHandler(sal_True); } else { @@ -1251,12 +1251,12 @@ void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter } } - MoveCursorRel( nMoveX,nMoveY, SC_FOLLOW_LINE, FALSE ); + MoveCursorRel( nMoveX,nMoveY, SC_FOLLOW_LINE, sal_False ); } } -BOOL ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) +sal_Bool ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) { const KeyCode& rKCode = rKeyEvent.GetKeyCode(); @@ -1265,8 +1265,8 @@ BOOL ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) (rKCode.IsMod2() ? MOD_BOTH : MOD_CTRL) : (rKCode.IsMod2() ? MOD_ALT : MOD_NONE); - BOOL bSel = rKCode.IsShift(); - USHORT nCode = rKCode.GetCode(); + sal_Bool bSel = rKCode.IsShift(); + sal_uInt16 nCode = rKCode.GetCode(); // CURSOR keys SCsCOL nDX = 0; @@ -1289,8 +1289,8 @@ BOOL ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) // added to avoid warnings } } - // always TRUE to suppress changes of col/row size (ALT+CURSOR) - return TRUE; + // always sal_True to suppress changes of col/row size (ALT+CURSOR) + return sal_True; } // PAGEUP/PAGEDOWN @@ -1307,7 +1307,7 @@ BOOL ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) // added to avoid warnings } } - return TRUE; + return sal_True; } // HOME/END @@ -1324,20 +1324,20 @@ BOOL ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) // added to avoid warnings } } - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } // naechste/vorherige nicht geschuetzte Zelle -void ScTabView::FindNextUnprot( BOOL bShift, BOOL bInSelection ) +void ScTabView::FindNextUnprot( sal_Bool bShift, sal_Bool bInSelection ) { short nMove = bShift ? -1 : 1; ScMarkData& rMark = aViewData.GetMarkData(); - BOOL bMarked = bInSelection && (rMark.IsMarked() || rMark.IsMultiMarked()); + sal_Bool bMarked = bInSelection && (rMark.IsMarked() || rMark.IsMultiMarked()); SCCOL nCurX; SCROW nCurY; @@ -1347,14 +1347,14 @@ void ScTabView::FindNextUnprot( BOOL bShift, BOOL bInSelection ) SCTAB nTab = aViewData.GetTabNo(); ScDocument* pDoc = aViewData.GetDocument(); - pDoc->GetNextPos( nNewX,nNewY, nTab, nMove,0, bMarked,TRUE, rMark ); + pDoc->GetNextPos( nNewX,nNewY, nTab, nMove,0, bMarked,sal_True, rMark ); SCCOL nTabCol = aViewData.GetTabStartCol(); if ( nTabCol == SC_TABSTART_NONE ) nTabCol = nCurX; // auf diese Spalte zurueck bei Enter MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, - SC_FOLLOW_LINE, FALSE, TRUE ); + SC_FOLLOW_LINE, sal_False, sal_True ); // in MoveCursorRel wird die TabCol zurueckgesetzt... aViewData.SetTabStartCol( nTabCol ); @@ -1414,7 +1414,7 @@ void ScTabView::MarkRows() SelectionChanged(); } -void ScTabView::MarkDataArea( BOOL bIncludeCursor ) +void ScTabView::MarkDataArea( sal_Bool bIncludeCursor ) { ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); @@ -1441,17 +1441,17 @@ void ScTabView::MarkMatrixFormula() ScRange aMatrix; if ( pDoc->GetMatrixFormulaRange( aCursor, aMatrix ) ) { - MarkRange( aMatrix, FALSE ); // cursor is already within the range + MarkRange( aMatrix, sal_False ); // cursor is already within the range } } -void ScTabView::MarkRange( const ScRange& rRange, BOOL bSetCursor, BOOL bContinue ) +void ScTabView::MarkRange( const ScRange& rRange, sal_Bool bSetCursor, sal_Bool bContinue ) { SCTAB nTab = rRange.aStart.Tab(); SetTabNo( nTab ); HideAllCursors(); - DoneBlockMode( bContinue ); // bContinue==TRUE -> clear old mark + DoneBlockMode( bContinue ); // bContinue==sal_True -> clear old mark if (bSetCursor) // Wenn Cursor gesetzt wird, immer auch alignen { SCCOL nAlignX = rRange.aStart.Col(); @@ -1491,7 +1491,7 @@ void ScTabView::Unmark() SCCOL nCurX; SCROW nCurY; aViewData.GetMoveCursor( nCurX,nCurY ); - MoveCursorAbs( nCurX, nCurY, SC_FOLLOW_NONE, FALSE, FALSE ); + MoveCursorAbs( nCurX, nCurY, SC_FOLLOW_NONE, sal_False, sal_False ); SelectionChanged(); } @@ -1513,7 +1513,7 @@ void ScTabView::MarkDataChanged() UpdateSelectionOverlay(); } -void ScTabView::SelectNextTab( short nDir, BOOL bExtendSelection ) +void ScTabView::SelectNextTab( short nDir, sal_Bool bExtendSelection ) { if (!nDir) return; DBG_ASSERT( nDir==-1 || nDir==1, "SelectNextTab: falscher Wert"); @@ -1542,14 +1542,14 @@ void ScTabView::SelectNextTab( short nDir, BOOL bExtendSelection ) } } - SetTabNo( nTab, FALSE, bExtendSelection ); + SetTabNo( nTab, sal_False, bExtendSelection ); PaintExtras(); } // SetTabNo - angezeigte Tabelle -void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSameTabButMoved ) +void ScTabView::SetTabNo( SCTAB nTab, sal_Bool bNew, sal_Bool bExtendSelection, bool bSameTabButMoved ) { if ( !ValidTab(nTab) ) { @@ -1563,7 +1563,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell(); if (pFormSh) { - BOOL bAllowed = sal::static_int_cast<BOOL>( pFormSh->PrepareClose( TRUE ) ); + sal_Bool bAllowed = sal::static_int_cast<sal_Bool>( pFormSh->PrepareClose( sal_True ) ); if (!bAllowed) { //! Fehlermeldung? oder macht das die FormShell selber? @@ -1586,14 +1586,14 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa SCTAB nOldPos = nTab; while (!pDoc->IsVisible(nTab)) // naechste sichtbare suchen { - BOOL bUp = (nTab>=nOldPos); + sal_Bool bUp = (nTab>=nOldPos); if (bUp) { ++nTab; if (nTab>=nTabCount) { nTab = nOldPos; - bUp = FALSE; + bUp = sal_False; } } @@ -1604,7 +1604,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa else { DBG_ERROR("keine sichtbare Tabelle"); - pDoc->SetVisible( 0, TRUE ); + pDoc->SetVisible( 0, sal_True ); } } } @@ -1614,7 +1614,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa DrawDeselectAll(); ScModule* pScMod = SC_MOD(); - BOOL bRefMode = pScMod->IsFormulaMode(); + sal_Bool bRefMode = pScMod->IsFormulaMode(); if ( !bRefMode ) // Abfrage, damit RefMode bei Tabellenwechsel funktioniert { DoneBlockMode(); @@ -1623,14 +1623,14 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa } ScSplitPos eOldActive = aViewData.GetActivePart(); // before switching - BOOL bFocus = pGridWin[eOldActive]->HasFocus(); + sal_Bool bFocus = pGridWin[eOldActive]->HasFocus(); aViewData.SetTabNo( nTab ); // UpdateShow noch vor SetCursor, damit UpdateAutoFillMark die richtigen // Fenster findet (wird aus SetCursor gerufen) UpdateShow(); aViewData.ResetOldCursor(); - SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), TRUE ); + SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), sal_True ); SfxBindings& rBindings = aViewData.GetBindings(); ScMarkData& rMark = aViewData.GetMarkData(); @@ -1659,7 +1659,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa bExtendSelection = false; if (bExtendSelection) - rMark.SelectTable( nTab, TRUE ); + rMark.SelectTable( nTab, sal_True ); else { rMark.SelectOneTable( nTab ); @@ -1675,7 +1675,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa if ( bRefMode ) // hide EditView if necessary (after aViewData.SetTabNo !) { - for ( USHORT i=0; i<4; i++ ) + for ( sal_uInt16 i=0; i<4; i++ ) if ( pGridWin[i] ) if ( pGridWin[i]->IsVisible() ) pGridWin[i]->UpdateEditViewPos(); @@ -1723,13 +1723,13 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa // Fixierungen - BOOL bResize = FALSE; + sal_Bool bResize = sal_False; if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX ) if (aViewData.UpdateFixX()) - bResize = TRUE; + bResize = sal_True; if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX ) if (aViewData.UpdateFixY()) - bResize = TRUE; + bResize = sal_True; if (bResize) RepeatResize(); InvalidateSplit(); @@ -1739,7 +1739,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa // #53551# Form-Layer muss den sichtbaren Ausschnitt der neuen Tabelle kennen // dafuer muss hier schon der MapMode stimmen - for (USHORT i=0; i<4; i++) + for (sal_uInt16 i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() ); SetNewVisArea(); @@ -1762,7 +1762,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa if(pScMod->IsRefDialogOpen()) { - USHORT nCurRefDlgId=pScMod->GetCurRefDlgId(); + sal_uInt16 nCurRefDlgId=pScMod->GetCurRefDlgId(); SfxViewFrame* pViewFrm = aViewData.GetViewShell()->GetViewFrame(); SfxChildWindow* pChildWnd = pViewFrm->GetChildWindow( nCurRefDlgId ); if ( pChildWnd ) @@ -1783,11 +1783,11 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW DrawDeselectAll(); if (pDrawView) - DrawEnableAnim( FALSE ); + DrawEnableAnim( sal_False ); EditView* pSpellingView = aViewData.GetSpellingView(); - for (USHORT i=0; i<4; i++) + for (sal_uInt16 i=0; i<4; i++) if (pGridWin[i]) if ( pGridWin[i]->IsVisible() && !aViewData.HasEditView((ScSplitPos)i) ) { @@ -1796,7 +1796,7 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW SCCOL nScrX = aViewData.GetPosX( eHWhich ); SCROW nScrY = aViewData.GetPosY( eVWhich ); - BOOL bPosVisible = + sal_Bool bPosVisible = ( nCol >= nScrX && nCol <= nScrX + aViewData.VisibleCellsX(eHWhich) + 1 && nRow >= nScrY && nRow <= nScrY + aViewData.VisibleCellsY(eVWhich) + 1 ); @@ -1836,7 +1836,7 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW void ScTabView::UpdateEditView() { ScSplitPos eActive = aViewData.GetActivePart(); - for (USHORT i=0; i<4; i++) + for (sal_uInt16 i=0; i<4; i++) if (aViewData.HasEditView( (ScSplitPos) i )) { EditView* pEditView = aViewData.GetEditView( (ScSplitPos) i ); @@ -1844,22 +1844,22 @@ void ScTabView::UpdateEditView() static_cast<ScEditEngineDefaulter*>(pEditView->GetEditEngine()), pGridWin[i], GetViewData()->GetCurX(), GetViewData()->GetCurY() ); if ( (ScSplitPos)i == eActive ) - pEditView->ShowCursor( FALSE ); + pEditView->ShowCursor( sal_False ); } } -void ScTabView::KillEditView( BOOL bNoPaint ) +void ScTabView::KillEditView( sal_Bool bNoPaint ) { - USHORT i; + sal_uInt16 i; SCCOL nCol1 = aViewData.GetEditStartCol(); SCROW nRow1 = aViewData.GetEditStartRow(); SCCOL nCol2 = aViewData.GetEditEndCol(); SCROW nRow2 = aViewData.GetEditEndRow(); - BOOL bPaint[4]; - BOOL bNotifyAcc(false); + sal_Bool bPaint[4]; + sal_Bool bNotifyAcc(false); - BOOL bExtended = nRow1 != nRow2; // Col wird sowieso bis zum Ende gezeichnet - BOOL bAtCursor = nCol1 <= aViewData.GetCurX() && + sal_Bool bExtended = nRow1 != nRow2; // Col wird sowieso bis zum Ende gezeichnet + sal_Bool bAtCursor = nCol1 <= aViewData.GetCurX() && nCol2 >= aViewData.GetCurX() && nRow1 == aViewData.GetCurY(); for (i=0; i<4; i++) @@ -1891,12 +1891,12 @@ void ScTabView::KillEditView( BOOL bNoPaint ) } if (pDrawView) - DrawEnableAnim( TRUE ); + DrawEnableAnim( sal_True ); // GrabFocus immer dann, wenn diese View aktiv ist und // die Eingabezeile den Focus hat - BOOL bGrabFocus = FALSE; + sal_Bool bGrabFocus = sal_False; if (aViewData.IsActive()) { ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); @@ -1904,7 +1904,7 @@ void ScTabView::KillEditView( BOOL bNoPaint ) { ScInputWindow* pInputWin = pInputHdl->GetInputWindow(); if (pInputWin && pInputWin->IsInputActive()) - bGrabFocus = TRUE; + bGrabFocus = sal_True; } } @@ -1939,7 +1939,7 @@ void ScTabView::UpdateFormulas() if ( aViewData.GetDocument()->IsAutoCalcShellDisabled() ) return ; - USHORT i; + sal_uInt16 i; for (i=0; i<4; i++) if (pGridWin[i]) if (pGridWin[i]->IsVisible()) @@ -1960,7 +1960,7 @@ void ScTabView::UpdateFormulas() void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScUpdateMode eMode ) { - USHORT i; + sal_uInt16 i; SCCOL nCol1; SCROW nRow1; SCCOL nCol2; @@ -1975,7 +1975,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO { ScHSplitPos eHWhich = WhichH( (ScSplitPos) i ); ScVSplitPos eVWhich = WhichV( (ScSplitPos) i ); - BOOL bOut = FALSE; + sal_Bool bOut = sal_False; nCol1 = nStartCol; nRow1 = nStartRow; @@ -1990,16 +1990,16 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO if ( eMode == SC_UPDATE_ALL ) // #91240# for UPDATE_ALL, paint anyway nCol2 = nScrX; // (because of extending strings to the right) else - bOut = TRUE; // completely outside the window + bOut = sal_True; // completely outside the window } if (nRow1 < nScrY) nRow1 = nScrY; - if (nRow2 < nScrY) bOut = TRUE; + if (nRow2 < nScrY) bOut = sal_True; SCCOL nLastX = nScrX + aViewData.VisibleCellsX( eHWhich ) + 1; SCROW nLastY = nScrY + aViewData.VisibleCellsY( eVWhich ) + 1; - if (nCol1 > nLastX) bOut = TRUE; + if (nCol1 > nLastX) bOut = sal_True; if (nCol2 > nLastX) nCol2 = nLastX; - if (nRow1 > nLastY) bOut = TRUE; + if (nRow1 > nLastY) bOut = sal_True; if (nRow2 > nLastY) nRow2 = nLastY; if (!bOut) @@ -2008,7 +2008,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO pGridWin[i]->Draw( nCol1, nRow1, nCol2, nRow2, eMode ); else // ALL oder MARKS { - BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); + sal_Bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); long nLayoutSign = bLayoutRTL ? -1 : 1; Point aStart = aViewData.GetScrPos( nCol1, nRow1, (ScSplitPos) i ); @@ -2022,14 +2022,14 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO if ( eMode == SC_UPDATE_ALL && nRow2 >= MAXROW ) aEnd.Y() = pGridWin[i]->GetOutputSizePixel().Height(); - BOOL bShowChanges = TRUE; //! ... + sal_Bool bShowChanges = sal_True; //! ... if (bShowChanges) { aStart.X() -= nLayoutSign; // include change marks aStart.Y() -= 1; } - BOOL bMarkClipped = aViewData.GetOptions().GetOption( VOPT_CLIPMARKS ); + sal_Bool bMarkClipped = aViewData.GetOptions().GetOption( VOPT_CLIPMARKS ); if (bMarkClipped) { // dazu muesste ScColumn::IsEmptyBlock optimiert werden @@ -2068,8 +2068,8 @@ void ScTabView::PaintRangeFinder( long nNumber ) if ( pRangeFinder && pRangeFinder->GetDocName() == aViewData.GetDocShell()->GetTitle() ) { SCTAB nTab = aViewData.GetTabNo(); - USHORT nCount = (USHORT)pRangeFinder->Count(); - for (USHORT i=0; i<nCount; i++) + sal_uInt16 nCount = (sal_uInt16)pRangeFinder->Count(); + for (sal_uInt16 i=0; i<nCount; i++) if ( nNumber < 0 || nNumber == i ) { ScRangeFindData* pData = pRangeFinder->GetObject(i); @@ -2091,19 +2091,19 @@ void ScTabView::PaintRangeFinder( long nNumber ) // wegnehmen -> Repaint // SC_UPDATE_MARKS: Invalidate, nicht bis zum Zeilenende - BOOL bHiddenEdge = FALSE; + sal_Bool bHiddenEdge = sal_False; SCROW nTmp; ScDocument* pDoc = aViewData.GetDocument(); SCCOL nLastCol = -1; while ( nCol1 > 0 && pDoc->ColHidden(nCol1, nTab, nLastCol) ) { --nCol1; - bHiddenEdge = TRUE; + bHiddenEdge = sal_True; } while ( nCol2 < MAXCOL && pDoc->ColHidden(nCol2, nTab, nLastCol) ) { ++nCol2; - bHiddenEdge = TRUE; + bHiddenEdge = sal_True; } nTmp = pDoc->LastVisibleRow(0, nRow1, nTab); if (!ValidRow(nTmp)) @@ -2111,7 +2111,7 @@ void ScTabView::PaintRangeFinder( long nNumber ) if (nTmp < nRow1) { nRow1 = nTmp; - bHiddenEdge = TRUE; + bHiddenEdge = sal_True; } nTmp = pDoc->FirstVisibleRow(nRow2, MAXROW, nTab); if (!ValidRow(nTmp)) @@ -2119,7 +2119,7 @@ void ScTabView::PaintRangeFinder( long nNumber ) if (nTmp > nRow2) { nRow2 = nTmp; - bHiddenEdge = TRUE; + bHiddenEdge = sal_True; } if ( nCol2 - nCol1 > 1 && nRow2 - nRow1 > 1 && !bHiddenEdge ) @@ -2161,8 +2161,8 @@ void ScTabView::ClearHighlightRanges() pHighlightRanges = NULL; // Repaint ohne Highlight SCTAB nTab = aViewData.GetTabNo(); - ULONG nCount = pTemp->Count(); - for (ULONG i=0; i<nCount; i++) + sal_uLong nCount = pTemp->Count(); + for (sal_uLong i=0; i<nCount; i++) { ScHighlightEntry* pEntry = pTemp->GetObject( i ); if (pEntry) @@ -2208,7 +2208,7 @@ void ScTabView::DoChartSelection( //UNUSED2008-05 { //UNUSED2008-05 if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX || aViewData.GetVSplitMode() == SC_SPLIT_FIX ) //UNUSED2008-05 { -//UNUSED2008-05 for (USHORT i=0; i<4; i++) +//UNUSED2008-05 for (sal_uInt16 i=0; i<4; i++) //UNUSED2008-05 if (pGridWin[i]) //UNUSED2008-05 if (pGridWin[i]->IsVisible()) //UNUSED2008-05 pGridWin[i]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); @@ -2223,7 +2223,7 @@ void ScTabView::DoChartSelection( //UNUSED2008-05 { //UNUSED2008-05 if ( aViewData.GetTabNo() == nTab ) //UNUSED2008-05 { -//UNUSED2008-05 USHORT i; +//UNUSED2008-05 sal_uInt16 i; //UNUSED2008-05 for (i=0; i<4; i++) //UNUSED2008-05 if (pGridWin[i]) //UNUSED2008-05 if (pGridWin[i]->IsVisible()) @@ -2245,7 +2245,7 @@ void ScTabView::DoChartSelection( void ScTabView::PaintGrid() { - USHORT i; + sal_uInt16 i; for (i=0; i<4; i++) if (pGridWin[i]) if (pGridWin[i]->IsVisible()) @@ -2256,7 +2256,7 @@ void ScTabView::PaintGrid() void ScTabView::PaintTop() { - USHORT i; + sal_uInt16 i; for (i=0; i<2; i++) { if (pColBar[i]) @@ -2268,7 +2268,7 @@ void ScTabView::PaintTop() void ScTabView::CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress) { - UINT16 i; + sal_uInt16 i; for(i=0; i<4; i++) { @@ -2301,10 +2301,10 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) if (nStartCol>0) --nStartCol; //! allgemeiner ? - BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); + sal_Bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); long nLayoutSign = bLayoutRTL ? -1 : 1; - for (USHORT i=0; i<2; i++) + for (sal_uInt16 i=0; i<2; i++) { ScHSplitPos eWhich = (ScHSplitPos) i; if (pColBar[eWhich]) @@ -2329,7 +2329,7 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) void ScTabView::PaintLeft() { - USHORT i; + sal_uInt16 i; for (i=0; i<2; i++) { if (pRowBar[i]) @@ -2358,7 +2358,7 @@ void ScTabView::PaintLeftArea( SCROW nStartRow, SCROW nEndRow ) if (nStartRow>0) --nStartRow; - for (USHORT i=0; i<2; i++) + for (sal_uInt16 i=0; i<2; i++) { ScVSplitPos eWhich = (ScVSplitPos) i; if (pRowBar[eWhich]) @@ -2402,11 +2402,11 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, return; } - BOOL bSingle = rMark.IsMultiMarked(); - BOOL bMerge = pDoc->HasAttrib( nStartX, nStartY, nTab, nEndX, nEndY, nTab, + sal_Bool bSingle = rMark.IsMultiMarked(); + sal_Bool bMerge = pDoc->HasAttrib( nStartX, nStartY, nTab, nEndX, nEndY, nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ); - USHORT i; + sal_uInt16 i; if ( bMerge || bSingle ) { for (i=0; i<4; i++) @@ -2448,7 +2448,7 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, // wenn Controls betroffen, neu malen // - BOOL bHide = TRUE; // wird Teil der Markierung aufgehoben ? + sal_Bool bHide = sal_True; // wird Teil der Markierung aufgehoben ? if (rMark.IsMarked()) { ScRange aMarkRange; @@ -2456,23 +2456,23 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, if ( aMarkRange.aStart.Col() <= nStartX && aMarkRange.aEnd.Col() >= nEndX && aMarkRange.aStart.Row() <= nStartY && aMarkRange.aEnd.Row() >= nEndY ) { - bHide = FALSE; // der ganze Bereich ist markiert + bHide = sal_False; // der ganze Bereich ist markiert } } } -BOOL ScTabView::PaintExtras() +sal_Bool ScTabView::PaintExtras() { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); if (!pDoc->HasTable(nTab)) // Tabelle geloescht ? { SCTAB nCount = pDoc->GetTableCount(); aViewData.SetTabNo(nCount-1); - bRet = TRUE; + bRet = sal_True; } - pTabControl->UpdateStatus(); // TRUE = active + pTabControl->UpdateStatus(); // sal_True = active return bRet; } @@ -2486,8 +2486,8 @@ void ScTabView::RecalcPPT() aViewData.RefreshZoom(); // pre-calculate new PPT values - BOOL bChangedX = ( aViewData.GetPPTX() != nOldX ); - BOOL bChangedY = ( aViewData.GetPPTY() != nOldY ); + sal_Bool bChangedX = ( aViewData.GetPPTX() != nOldX ); + sal_Bool bChangedY = ( aViewData.GetPPTY() != nOldY ); if ( bChangedX || bChangedY ) { // call view SetZoom (including draw scale, split update etc) @@ -2495,7 +2495,7 @@ void ScTabView::RecalcPPT() Fraction aZoomX = aViewData.GetZoomX(); Fraction aZoomY = aViewData.GetZoomY(); - SetZoom( aZoomX, aZoomY, FALSE ); + SetZoom( aZoomX, aZoomY, sal_False ); PaintGrid(); if (bChangedX) @@ -2505,7 +2505,7 @@ void ScTabView::RecalcPPT() } } -void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) +void ScTabView::ActivateView( sal_Bool bActivate, sal_Bool bFirst ) { if ( bActivate == aViewData.IsActive() && !bFirst ) { @@ -2516,13 +2516,13 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) // wird nur bei MDI-(De)Activate gerufen // aViewData.Activate hinten wegen Cursor-Show bei KillEditView - // Markierung nicht mehr loeschen - wenn an der ViewData Activate(FALSE) gesetzt ist, + // Markierung nicht mehr loeschen - wenn an der ViewData Activate(sal_False) gesetzt ist, // wird die Markierung nicht ausgegeben if (!bActivate) { ScModule* pScMod = SC_MOD(); - BOOL bRefMode = pScMod->IsFormulaMode(); + sal_Bool bRefMode = pScMod->IsFormulaMode(); // Referenzeingabe nicht abbrechen, um Referenzen auf // andere Dokumente zuzulassen @@ -2542,7 +2542,7 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) aViewData.Activate(bActivate); - PaintBlock(FALSE); // Repaint, Markierung je nach Active-Status + PaintBlock(sal_False); // Repaint, Markierung je nach Active-Status if (!bActivate) HideAllCursors(); // Cursor @@ -2592,9 +2592,9 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) ScSplitPos eOld = aViewData.GetActivePart(); if ( eOld != eWhich ) { - bInActivatePart = TRUE; + bInActivatePart = sal_True; - BOOL bRefMode = SC_MOD()->IsFormulaMode(); + sal_Bool bRefMode = SC_MOD()->IsFormulaMode(); // #40565# the HasEditView call during SetCursor would fail otherwise if ( aViewData.HasEditView(eOld) && !bRefMode ) @@ -2604,11 +2604,11 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) ScVSplitPos eOldV = WhichV(eOld); ScHSplitPos eNewH = WhichH(eWhich); ScVSplitPos eNewV = WhichV(eWhich); - BOOL bTopCap = pColBar[eOldH] && pColBar[eOldH]->IsMouseCaptured(); - BOOL bLeftCap = pRowBar[eOldV] && pRowBar[eOldV]->IsMouseCaptured(); + sal_Bool bTopCap = pColBar[eOldH] && pColBar[eOldH]->IsMouseCaptured(); + sal_Bool bLeftCap = pRowBar[eOldV] && pRowBar[eOldV]->IsMouseCaptured(); - BOOL bFocus = pGridWin[eOld]->HasFocus(); - BOOL bCapture = pGridWin[eOld]->IsMouseCaptured(); + sal_Bool bFocus = pGridWin[eOld]->HasFocus(); + sal_Bool bCapture = pGridWin[eOld]->IsMouseCaptured(); if (bCapture) pGridWin[eOld]->ReleaseMouse(); pGridWin[eOld]->ClickExtern(); @@ -2636,8 +2636,8 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) if ( bTopCap && pColBar[eNewH] ) { - pColBar[eOldH]->SetIgnoreMove(TRUE); - pColBar[eNewH]->SetIgnoreMove(FALSE); + pColBar[eOldH]->SetIgnoreMove(sal_True); + pColBar[eNewH]->SetIgnoreMove(sal_False); pHdrSelEng->SetWindow( pColBar[eNewH] ); long nWidth = pColBar[eNewH]->GetOutputSizePixel().Width(); pHdrSelEng->SetVisibleArea( Rectangle( 0, LONG_MIN, nWidth-1, LONG_MAX ) ); @@ -2645,8 +2645,8 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) } if ( bLeftCap && pRowBar[eNewV] ) { - pRowBar[eOldV]->SetIgnoreMove(TRUE); - pRowBar[eNewV]->SetIgnoreMove(FALSE); + pRowBar[eOldV]->SetIgnoreMove(sal_True); + pRowBar[eNewV]->SetIgnoreMove(sal_False); pHdrSelEng->SetWindow( pRowBar[eNewV] ); long nHeight = pRowBar[eNewV]->GetOutputSizePixel().Height(); pHdrSelEng->SetVisibleArea( Rectangle( LONG_MIN, 0, LONG_MAX, nHeight-1 ) ); @@ -2658,7 +2658,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) pGridWin[eWhich]->ShowCursor(); SfxInPlaceClient* pClient = aViewData.GetViewShell()->GetIPClient(); - BOOL bOleActive = ( pClient && pClient->IsObjectInPlaceActive() ); + sal_Bool bOleActive = ( pClient && pClient->IsObjectInPlaceActive() ); // #103823# don't switch ViewShell's active window during RefInput, because the focus // might change, and subsequent SetReference calls wouldn't find the right EditView @@ -2673,13 +2673,13 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) pGridWin[eWhich]->GrabFocus(); } - bInActivatePart = FALSE; + bInActivatePart = sal_False; } } void ScTabView::HideListBox() { - for (USHORT i=0; i<4; i++) + for (sal_uInt16 i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->ClickExtern(); } @@ -2778,7 +2778,7 @@ void ScTabView::ZoomChanged() void ScTabView::CheckNeedsRepaint() { - USHORT i; + sal_uInt16 i; for (i=0; i<4; i++) if ( pGridWin[i] && pGridWin[i]->IsVisible() ) pGridWin[i]->CheckNeedsRepaint(); |