diff options
Diffstat (limited to 'sc/source/ui/view/viewdata.cxx')
| -rw-r--r-- | sc/source/ui/view/viewdata.cxx | 304 |
1 files changed, 152 insertions, 152 deletions
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 7b35328f68bb..088d3580bd67 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -81,8 +81,8 @@ using namespace com::sun::star; #define TAG_TABBARWIDTH "tw:" -static BOOL bMoveArea = FALSE; //! Member? -USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!! +static sal_Bool bMoveArea = sal_False; //! Member? +sal_uInt16 nEditAdjust = SVX_ADJUST_LEFT; //! Member !!! //================================================================== @@ -101,7 +101,7 @@ ScViewDataTable::ScViewDataTable() : nFixPosY( 0 ), nCurX( 0 ), nCurY( 0 ), - bOldCurValid( FALSE ) + bOldCurValid( sal_False ) { nPosX[0]=nPosX[1]=0; nPosY[0]=nPosY[1]=0; @@ -312,21 +312,21 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) nTabNo ( 0 ), nRefTabNo ( 0 ), eEditActivePart( SC_SPLIT_BOTTOMLEFT ), - bActive ( TRUE ), //! wie initialisieren? - bIsRefMode ( FALSE ), - bDelMarkValid( FALSE ), + bActive ( sal_True ), //! wie initialisieren? + bIsRefMode ( sal_False ), + bDelMarkValid( sal_False ), nFillMode ( SC_FILL_NONE ), - bPagebreak ( FALSE ), - bSelCtrlMouseClick( FALSE ) + bPagebreak ( sal_False ), + bSelCtrlMouseClick( sal_False ) { - SetGridMode ( TRUE ); - SetSyntaxMode ( FALSE ); - SetHeaderMode ( TRUE ); - SetTabMode ( TRUE ); - SetVScrollMode ( TRUE ); - SetHScrollMode ( TRUE ); - SetOutlineMode ( TRUE ); + SetGridMode ( sal_True ); + SetSyntaxMode ( sal_False ); + SetHeaderMode ( sal_True ); + SetTabMode ( sal_True ); + SetVScrollMode ( sal_True ); + SetHScrollMode ( sal_True ); + SetOutlineMode ( sal_True ); aScrSize = Size( (long) ( STD_COL_WIDTH * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ), (long) ( ScGlobal::nStdRowHeight * PIXEL_PER_TWIPS * OLE_STD_CELLS_Y ) ); @@ -334,10 +334,10 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) for ( SCTAB i = 1; i <= MAXTAB; i++ ) pTabData[i] = NULL; pThisTab = pTabData[nTabNo]; - for (USHORT j=0; j<4; j++) + for (sal_uInt16 j=0; j<4; j++) { pEditView[j] = NULL; - bEditActive[j] = FALSE; + bEditActive[j] = sal_False; } nEditEndCol = nEditStartCol = nEditCol = 0; @@ -380,9 +380,9 @@ ScViewData::ScViewData( const ScViewData& rViewData ) nTabNo ( rViewData.nTabNo ), nRefTabNo ( rViewData.nTabNo ), // kein RefMode eEditActivePart( rViewData.eEditActivePart ), - bActive ( TRUE ), //! wie initialisieren? - bIsRefMode ( FALSE ), - bDelMarkValid( FALSE ), + bActive ( sal_True ), //! wie initialisieren? + bIsRefMode ( sal_False ), + bDelMarkValid( sal_False ), nFillMode ( SC_FILL_NONE ), bPagebreak ( rViewData.bPagebreak ), bSelCtrlMouseClick( rViewData.bSelCtrlMouseClick ) @@ -403,10 +403,10 @@ ScViewData::ScViewData( const ScViewData& rViewData ) else pTabData[i] = NULL; pThisTab = pTabData[nTabNo]; - for (USHORT j=0; j<4; j++) + for (sal_uInt16 j=0; j<4; j++) { pEditView[j] = NULL; - bEditActive[j] = FALSE; + bEditActive[j] = sal_False; } nEditEndCol = nEditStartCol = nEditCol = 0; @@ -612,7 +612,7 @@ void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs ) void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs ) { - BOOL bAll = ( tabs.size() == 0 ); + sal_Bool bAll = ( tabs.size() == 0 ); if ( !bAll ) // create associated table data CreateTabData( tabs ); @@ -639,7 +639,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs ) } } -void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll ) +void ScViewData::SetZoomType( SvxZoomType eNew, sal_Bool bAll ) { std::vector< SCTAB > vTabs; // Empty for all tabs if ( !bAll ) // get selected tabs @@ -656,7 +656,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll ) void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vector< SCTAB >& tabs ) { - BOOL bAll = ( tabs.size() == 0 ); + sal_Bool bAll = ( tabs.size() == 0 ); if ( !bAll ) // create associated table data CreateTabData( tabs ); Fraction aFrac20( 1,5 ); @@ -728,7 +728,7 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vec RefreshZoom(); } -void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll ) +void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool bAll ) { std::vector< SCTAB > vTabs; if ( !bAll ) // get selected tabs @@ -754,7 +754,7 @@ void ScViewData::RefreshZoom() aLogicMode.SetScaleY( GetZoomY() ); } -void ScViewData::SetPagebreakMode( BOOL bSet ) +void ScViewData::SetPagebreakMode( sal_Bool bSet ) { bPagebreak = bSet; @@ -821,7 +821,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple - BOOL bMulti = aNewMark.IsMultiMarked(); + sal_Bool bMulti = aNewMark.IsMultiMarked(); if (bMulti) { aNewMark.MarkToSimple(); @@ -830,7 +830,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const if (bMulti) { rRange = new ScRangeList; - aNewMark.FillRangeListWithMarks( rRange, FALSE ); + aNewMark.FillRangeListWithMarks( rRange, sal_False ); } else { @@ -841,7 +841,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const } } -BOOL ScViewData::SimpleColMarked() +sal_Bool ScViewData::SimpleColMarked() { SCCOL nStartCol; SCROW nStartRow; @@ -851,12 +851,12 @@ BOOL ScViewData::SimpleColMarked() SCTAB nEndTab; if (GetSimpleArea(nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab) == SC_MARK_SIMPLE) if (nStartRow==0 && nEndRow==MAXROW) - return TRUE; + return sal_True; - return FALSE; + return sal_False; } -BOOL ScViewData::SimpleRowMarked() +sal_Bool ScViewData::SimpleRowMarked() { SCCOL nStartCol; SCROW nStartRow; @@ -866,12 +866,12 @@ BOOL ScViewData::SimpleRowMarked() SCTAB nEndTab; if (GetSimpleArea(nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab) == SC_MARK_SIMPLE) if (nStartCol==0 && nEndCol==MAXCOL) - return TRUE; + return sal_True; - return FALSE; + return sal_False; } -BOOL ScViewData::IsMultiMarked() +sal_Bool ScViewData::IsMultiMarked() { // Test for "real" multi selection, calling MarkToSimple on a local copy, // and taking filtered in simple area marks into account. @@ -891,7 +891,7 @@ void ScViewData::SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, S } void ScViewData::SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - BYTE nMode ) + sal_uInt8 nMode ) { nFillMode = nMode; nFillStartX = nStartCol; @@ -934,19 +934,19 @@ void ScViewData::SetOldCursor( SCCOL nNewX, SCROW nNewY ) { pThisTab->nOldCurX = nNewX; pThisTab->nOldCurY = nNewY; - pThisTab->bOldCurValid = TRUE; + pThisTab->bOldCurValid = sal_True; } void ScViewData::ResetOldCursor() { - pThisTab->bOldCurValid = FALSE; + pThisTab->bOldCurValid = sal_False; } Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin, const ScPatternAttr* pPattern, - BOOL bForceToTop ) + sal_Bool bForceToTop ) { - return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,TRUE), + return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,sal_True), pWin, nPPTX, nPPTY, GetZoomX(), GetZoomY() ). GetEditArea( pPattern, bForceToTop ); } @@ -955,16 +955,16 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, ScEditEngineDefaulter* pNewEngine, Window* pWin, SCCOL nNewX, SCROW nNewY ) { - BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTabNo ); + sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo ); ScHSplitPos eHWhich = WhichH(eWhich); - BOOL bWasThere = FALSE; + sal_Bool bWasThere = sal_False; if (pEditView[eWhich]) { // Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert if (bEditActive[eWhich]) - bWasThere = TRUE; + bWasThere = sal_True; else pEditView[eWhich]->SetEditEngine(pNewEngine); @@ -981,26 +981,26 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576) - ULONG nEC = pNewEngine->GetControlWord(); + sal_uLong nEC = pNewEngine->GetControlWord(); pNewEngine->SetControlWord(nEC & ~EE_CNTRL_DOIDLEFORMAT); - ULONG nVC = pEditView[eWhich]->GetControlWord(); + sal_uLong nVC = pEditView[eWhich]->GetControlWord(); pEditView[eWhich]->SetControlWord(nVC & ~EV_CNTRL_AUTOSCROLL); - bEditActive[eWhich] = TRUE; + bEditActive[eWhich] = sal_True; const ScPatternAttr* pPattern = pDoc->GetPattern( nNewX, nNewY, nTabNo ); SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&) pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue(); - BOOL bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) || + sal_Bool bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) || ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue(); - BOOL bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler + sal_Bool bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler Rectangle aPixRect = ScEditUtil( pDoc, nNewX,nNewY,nTabNo, GetScrPos(nNewX,nNewY,eWhich), pWin, nPPTX,nPPTY,GetZoomX(),GetZoomY() ). - GetEditArea( pPattern, TRUE ); + GetEditArea( pPattern, sal_True ); // when right-aligned, leave space for the cursor // in vertical mode, editing is always right-aligned @@ -1030,13 +1030,13 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // For growing use only the alignment value from the attribute, numbers // (existing or started) with default aligment extend to the right. - BOOL bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); - BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left - BOOL bGrowBackwards = bGrowToLeft; // logical left + sal_Bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); + sal_Bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left + sal_Bool bGrowBackwards = bGrowToLeft; // logical left if ( bLayoutRTL ) bGrowBackwards = !bGrowBackwards; // invert on RTL sheet if ( bAsianVertical ) - bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode + bGrowCentered = bGrowToLeft = bGrowBackwards = sal_False; // keep old behavior for asian mode long nSizeXPix; if (bBreak && !bAsianVertical) @@ -1074,7 +1074,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, Fraction aFract(1,1); Rectangle aUtilRect = ScEditUtil( pDoc,nNewX,nNewY,nTabNo, Point(0,0), pWin, - HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ).GetEditArea( pPattern, FALSE ); + HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ).GetEditArea( pPattern, sal_False ); aPaperSize.Width() = aUtilRect.GetWidth(); } pNewEngine->SetPaperSize( aPaperSize ); @@ -1091,7 +1091,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, else if ( nEditAdjust == SVX_ADJUST_CENTER ) { aVis.Right() = ( aPaper.Width() - 1 + nDiff ) / 2; - bMoveArea = TRUE; // always + bMoveArea = sal_True; // always } else { @@ -1112,11 +1112,11 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // UpdateMode has been disabled in ScInputHandler::StartTable // must be enabled before EditGrowY (GetTextHeight) - pNewEngine->SetUpdateMode( TRUE ); + pNewEngine->SetUpdateMode( sal_True ); pNewEngine->SetStatusEventHdl( LINK( this, ScViewData, EditEngineHdl ) ); - EditGrowY( TRUE ); // adjust to existing text content + EditGrowY( sal_True ); // adjust to existing text content EditGrowX(); Point aDocPos = pEditView[eWhich]->GetWindowPosTopLeft(0); @@ -1135,7 +1135,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, Color aBackCol = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor(); ScModule* pScMod = SC_MOD(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True) if ( aBackCol.GetTransparency() > 0 || Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { @@ -1155,7 +1155,7 @@ IMPL_LINK_INLINE_END( ScViewData, EmptyEditHdl, EditStatus *, EMPTYARG ) IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus ) { - ULONG nStatus = pStatus->GetStatusWord(); + sal_uLong nStatus = pStatus->GetStatusWord(); if (nStatus & (EE_STAT_HSCROLL | EE_STAT_TEXTHEIGHTCHANGED | EE_STAT_TEXTWIDTHCHANGED | EE_STAT_CURSOROUT)) { EditGrowY(); @@ -1165,7 +1165,7 @@ IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus ) { ScSplitPos eWhich = GetActivePart(); if (pEditView[eWhich]) - pEditView[eWhich]->ShowCursor(FALSE); + pEditView[eWhich]->ShowCursor(sal_False); } } return 0; @@ -1182,7 +1182,7 @@ void ScViewData::EditGrowX() if ( !pCurView || !bEditActive[eWhich]) return; - BOOL bLayoutRTL = pLocalDoc->IsLayoutRTL( nTabNo ); + sal_Bool bLayoutRTL = pLocalDoc->IsLayoutRTL( nTabNo ); ScEditEngineDefaulter* pEngine = (ScEditEngineDefaulter*) pCurView->GetEditEngine(); @@ -1198,22 +1198,22 @@ void ScViewData::EditGrowX() // Margin ist schon bei der urspruenglichen Breite beruecksichtigt long nTextWidth = pEngine->CalcTextWidth(); - BOOL bChanged = FALSE; - BOOL bAsianVertical = pEngine->IsVertical(); + sal_Bool bChanged = sal_False; + sal_Bool bAsianVertical = pEngine->IsVertical(); // get bGrow... variables the same way as in SetEditEngine const ScPatternAttr* pPattern = pLocalDoc->GetPattern( nEditCol, nEditRow, nTabNo ); SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&) pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue(); - BOOL bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); - BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left - BOOL bGrowBackwards = bGrowToLeft; // logical left + sal_Bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); + sal_Bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left + sal_Bool bGrowBackwards = bGrowToLeft; // logical left if ( bLayoutRTL ) bGrowBackwards = !bGrowBackwards; // invert on RTL sheet if ( bAsianVertical ) - bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode + bGrowCentered = bGrowToLeft = bGrowBackwards = sal_False; // keep old behavior for asian mode - BOOL bUnevenGrow = FALSE; + sal_Bool bUnevenGrow = sal_False; if ( bGrowCentered ) { while (aArea.GetWidth() + 0 < nTextWidth && ( nEditStartCol > nLeft || nEditEndCol < nRight ) ) @@ -1244,9 +1244,9 @@ void ScViewData::EditGrowX() aArea.Right() = nCenter + aSize.Width() - nHalf - 1; } - bChanged = TRUE; + bChanged = sal_True; if ( nLogicLeft != nLogicRight ) - bUnevenGrow = TRUE; + bUnevenGrow = sal_True; } } else if ( bGrowBackwards ) @@ -1269,7 +1269,7 @@ void ScViewData::EditGrowX() aArea.Right() = aArea.Left() + aSize.Width() - 1; } - bChanged = TRUE; + bChanged = sal_True; } } else @@ -1292,7 +1292,7 @@ void ScViewData::EditGrowX() aArea.Right() = aArea.Left() + aSize.Width() - 1; } - bChanged = TRUE; + bChanged = sal_True; } } @@ -1333,7 +1333,7 @@ void ScViewData::EditGrowX() aVis.Right() -= nMove; } pCurView->SetVisArea( aVis ); - bMoveArea = FALSE; + bMoveArea = sal_False; } pCurView->SetOutputArea(aArea); @@ -1353,7 +1353,7 @@ void ScViewData::EditGrowX() } } -void ScViewData::EditGrowY( BOOL bInitial ) +void ScViewData::EditGrowY( sal_Bool bInitial ) { ScSplitPos eWhich = GetActivePart(); ScVSplitPos eVWhich = WhichV(eWhich); @@ -1362,7 +1362,7 @@ void ScViewData::EditGrowY( BOOL bInitial ) if ( !pCurView || !bEditActive[eWhich]) return; - ULONG nControl = pEditView[eWhich]->GetControlWord(); + sal_uLong nControl = pEditView[eWhich]->GetControlWord(); if ( nControl & EV_CNTRL_AUTOSCROLL ) { // if end of screen had already been reached and scrolling enabled, @@ -1394,13 +1394,13 @@ void ScViewData::EditGrowY( BOOL bInitial ) // because this occurs in the normal progress of editing a formula. // Subsequent calls with empty text might involve changed attributes (including // font height), so they are treated like normal text. - String aText = pEngine->GetText( (USHORT) 0 ); + String aText = pEngine->GetText( (sal_uInt16) 0 ); if ( ( aText.Len() == 0 && bInitial ) || aText.GetChar(0) == (sal_Unicode)'=' ) nAllowedExtra = SC_GROWY_BIG_EXTRA; } - BOOL bChanged = FALSE; - BOOL bMaxReached = FALSE; + sal_Bool bChanged = sal_False; + sal_Bool bMaxReached = sal_False; while (aArea.GetHeight() + nAllowedExtra < nTextHeight && nEditEndRow < nBottom && !bMaxReached) { ++nEditEndRow; @@ -1411,10 +1411,10 @@ void ScViewData::EditGrowY( BOOL bInitial ) if ( aArea.Bottom() > aArea.Top() + aSize.Height() - 1 ) { aArea.Bottom() = aArea.Top() + aSize.Height() - 1; - bMaxReached = TRUE; // don't occupy more cells beyond paper size + bMaxReached = sal_True; // don't occupy more cells beyond paper size } - bChanged = TRUE; + bChanged = sal_True; nAllowedExtra = SC_GROWY_SMALL_EXTRA; // larger value is only for first row } @@ -1436,7 +1436,7 @@ void ScViewData::EditGrowY( BOOL bInitial ) void ScViewData::ResetEditView() { EditEngine* pEngine = NULL; - for (USHORT i=0; i<4; i++) + for (sal_uInt16 i=0; i<4; i++) if (pEditView[i]) { if (bEditActive[i]) @@ -1445,7 +1445,7 @@ void ScViewData::ResetEditView() pEngine->RemoveView(pEditView[i]); pEditView[i]->SetOutputArea( Rectangle() ); } - bEditActive[i] = FALSE; + bEditActive[i] = sal_False; } if (pEngine) @@ -1454,7 +1454,7 @@ void ScViewData::ResetEditView() void ScViewData::KillEditView() { - for (USHORT i=0; i<4; i++) + for (sal_uInt16 i=0; i<4; i++) if (pEditView[i]) { if (bEditActive[i]) @@ -1529,7 +1529,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) } Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, - BOOL bAllowNeg ) const + sal_Bool bAllowNeg ) const { ScHSplitPos eWhichX = SC_SPLIT_LEFT; ScVSplitPos eWhichY = SC_SPLIT_BOTTOM; @@ -1559,7 +1559,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, ((ScViewData*)this)->aScrSize.Height() = pView->GetGridHeight(eWhichY); } - USHORT nTSize; + sal_uInt16 nTSize; SCCOL nPosX = GetPosX(eWhichX); SCCOL nX; @@ -1647,7 +1647,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, // Anzahl Zellen auf einem Bildschirm // -SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeX ) const +SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, sal_uInt16 nScrSizeX ) const { DBG_ASSERT( nDir==1 || nDir==-1, "falscher CellsAt Aufruf" ); @@ -1655,27 +1655,27 @@ SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHO ((ScViewData*)this)->aScrSize.Width() = pView->GetGridWidth(eWhichX); SCsCOL nX; - USHORT nScrPosX = 0; - if (nScrSizeX == SC_SIZE_NONE) nScrSizeX = (USHORT) aScrSize.Width(); + sal_uInt16 nScrPosX = 0; + if (nScrSizeX == SC_SIZE_NONE) nScrSizeX = (sal_uInt16) aScrSize.Width(); if (nDir==1) nX = nPosX; // vorwaerts else nX = nPosX-1; // rueckwaerts - BOOL bOut = FALSE; + sal_Bool bOut = sal_False; for ( ; nScrPosX<=nScrSizeX && !bOut; nX = sal::static_int_cast<SCsCOL>(nX + nDir) ) { SCsCOL nColNo = nX; if ( nColNo < 0 || nColNo > MAXCOL ) - bOut = TRUE; + bOut = sal_True; else { - USHORT nTSize = pDoc->GetColWidth( nColNo, nTabNo ); + sal_uInt16 nTSize = pDoc->GetColWidth( nColNo, nTabNo ); if (nTSize) { long nSizeXPix = ToPixel( nTSize, nPPTX ); - nScrPosX = sal::static_int_cast<USHORT>( nScrPosX + (USHORT) nSizeXPix ); + nScrPosX = sal::static_int_cast<sal_uInt16>( nScrPosX + (sal_uInt16) nSizeXPix ); } } } @@ -1689,14 +1689,14 @@ SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHO return nX; } -SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHORT nScrSizeY ) const +SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, sal_uInt16 nScrSizeY ) const { DBG_ASSERT( nDir==1 || nDir==-1, "falscher CellsAt Aufruf" ); if (pView) ((ScViewData*)this)->aScrSize.Height() = pView->GetGridHeight(eWhichY); - if (nScrSizeY == SC_SIZE_NONE) nScrSizeY = (USHORT) aScrSize.Height(); + if (nScrSizeY == SC_SIZE_NONE) nScrSizeY = (sal_uInt16) aScrSize.Height(); SCROW nY; @@ -1757,7 +1757,7 @@ SCROW ScViewData::PrevCellsY( ScVSplitPos eWhichY ) const //UNUSED2008-05 return CellsAtY( MAXROW+1, -1, eWhichY, SC_SIZE_NONE ); //UNUSED2008-05 } -BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ) +sal_Bool ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ) { const ScMergeAttr* pMerge = (const ScMergeAttr*) pDoc->GetAttr( nX,nY,nTabNo, ATTR_MERGE ); if ( pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1 ) @@ -1778,25 +1778,25 @@ BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r continue; } - USHORT nHeight = pDoc->GetRowHeight(nRow, nTabNo); + sal_uInt16 nHeight = pDoc->GetRowHeight(nRow, nTabNo); nOutHeight += ToPixel(nHeight, nPPTY); } rSizeXPix = nOutWidth; rSizeYPix = nOutHeight; - return TRUE; + return sal_True; } else { rSizeXPix = ToPixel( pDoc->GetColWidth( nX, nTabNo ), nPPTX ); rSizeYPix = ToPixel( pDoc->GetRowHeight( nY, nTabNo ), nPPTY ); - return FALSE; + return sal_False; } } -BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, +sal_Bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, SCsCOL& rPosX, SCsROW& rPosY, - BOOL bTestMerge, BOOL bRepair, BOOL bNextIfLarge ) + sal_Bool bTestMerge, sal_Bool bRepair, sal_Bool bNextIfLarge ) { // special handling of 0 is now in ScViewFunctionSet::SetCursorAtPoint @@ -1875,12 +1875,12 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, { //! public Methode um Position anzupassen - BOOL bHOver = FALSE; + sal_Bool bHOver = sal_False; while (pDoc->IsHorOverlapped( rPosX, rPosY, nTabNo )) - { --rPosX; bHOver=TRUE; } - BOOL bVOver = FALSE; + { --rPosX; bHOver=sal_True; } + sal_Bool bVOver = sal_False; while (pDoc->IsVerOverlapped( rPosX, rPosY, nTabNo )) - { --rPosY; bVOver=TRUE; } + { --rPosY; bVOver=sal_True; } if ( bRepair && ( bHOver || bVOver ) ) { @@ -1894,23 +1894,23 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, pDoc->RemoveFlagsTab( 0,0, MAXCOL,MAXROW, nTabNo, SC_MF_HOR | SC_MF_VER ); SCCOL nEndCol = MAXCOL; SCROW nEndRow = MAXROW; - pDoc->ExtendMerge( 0,0, nEndCol,nEndRow, nTabNo, TRUE, FALSE ); + pDoc->ExtendMerge( 0,0, nEndCol,nEndRow, nTabNo, sal_True, sal_False ); if (pDocShell) pDocShell->PostPaint( ScRange(0,0,nTabNo,MAXCOL,MAXROW,nTabNo), PAINT_GRID ); } } } - return FALSE; + return sal_False; } void ScViewData::GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich, - SCsCOL nPosX, SCsROW nPosY, BOOL& rLeft, BOOL& rTop ) + SCsCOL nPosX, SCsROW nPosY, sal_Bool& rLeft, sal_Bool& rTop ) { - BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTabNo ); + sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo ); long nLayoutSign = bLayoutRTL ? -1 : 1; - Point aCellStart = GetScrPos( nPosX, nPosY, eWhich, TRUE ); + Point aCellStart = GetScrPos( nPosX, nPosY, eWhich, sal_True ); long nSizeX; long nSizeY; GetMergeSizePixel( nPosX, nPosY, nSizeX, nSizeY ); @@ -1931,14 +1931,14 @@ void ScViewData::SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX ) { long nThis = pDoc->GetColWidth( i,nTabNo ); nTPosX -= nThis; - nPixPosX -= ToPixel(sal::static_int_cast<USHORT>(nThis), nPPTX); + nPixPosX -= ToPixel(sal::static_int_cast<sal_uInt16>(nThis), nPPTX); } else for ( i=nNewPosX; i<nOldPosX; i++ ) { long nThis = pDoc->GetColWidth( i,nTabNo ); nTPosX += nThis; - nPixPosX += ToPixel(sal::static_int_cast<USHORT>(nThis), nPPTX); + nPixPosX += ToPixel(sal::static_int_cast<sal_uInt16>(nThis), nPPTX); } pThisTab->nPosX[eWhich] = nNewPosX; @@ -1968,7 +1968,7 @@ void ScViewData::SetPosY( ScVSplitPos eWhich, SCROW nNewPosY ) SCROW nRows = std::min( nNewPosY, nHeightEndRow + 1) - i; i = nHeightEndRow; nTPosY -= nThis * nRows; - nPixPosY -= ToPixel(sal::static_int_cast<USHORT>(nThis), nPPTY) * nRows; + nPixPosY -= ToPixel(sal::static_int_cast<sal_uInt16>(nThis), nPPTY) * nRows; } else for ( i=nNewPosY; i<nOldPosY; i++ ) @@ -1977,7 +1977,7 @@ void ScViewData::SetPosY( ScVSplitPos eWhich, SCROW nNewPosY ) SCROW nRows = std::min( nOldPosY, nHeightEndRow + 1) - i; i = nHeightEndRow; nTPosY += nThis * nRows; - nPixPosY += ToPixel(sal::static_int_cast<USHORT>(nThis), nPPTY) * nRows; + nPixPosY += ToPixel(sal::static_int_cast<sal_uInt16>(nThis), nPPTY) * nRows; } pThisTab->nPosY[eWhich] = nNewPosY; @@ -1994,7 +1994,7 @@ void ScViewData::SetPosY( ScVSplitPos eWhich, SCROW nNewPosY ) void ScViewData::RecalcPixPos() // nach Zoom-Aenderungen { - for (USHORT eWhich=0; eWhich<2; eWhich++) + for (sal_uInt16 eWhich=0; eWhich<2; eWhich++) { long nPixPosX = 0; SCCOL nPosX = pThisTab->nPosX[eWhich]; @@ -2027,7 +2027,7 @@ void ScViewData::SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { SCCOL nCol; SCROW nRow; - USHORT nTSize; + sal_uInt16 nTSize; long nSizePix; long nScrPosX = 0; long nScrPosY = 0; @@ -2042,7 +2042,7 @@ void ScViewData::SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) if (nTSize) { nSizePix = ToPixel( nTSize, nPPTX ); - nScrPosX += (USHORT) nSizePix; + nScrPosX += (sal_uInt16) nSizePix; } } @@ -2052,7 +2052,7 @@ void ScViewData::SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) if (nTSize) { nSizePix = ToPixel( nTSize, nPPTY ); - nScrPosY += (USHORT) nSizePix; + nScrPosY += (sal_uInt16) nSizePix; } } @@ -2064,14 +2064,14 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart ) long nSize; long nTwips; long nAdd; - BOOL bEnd; + sal_Bool bEnd; nSize = 0; nTwips = (long) (rVisAreaStart.X() / HMM_PER_TWIPS); if ( pDoc->IsLayoutRTL( nTabNo ) ) nTwips = -nTwips; SCCOL nX1 = 0; - bEnd = FALSE; + bEnd = sal_False; while (!bEnd) { nAdd = (long) pDoc->GetColWidth(nX1,nTabNo); @@ -2081,13 +2081,13 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart ) ++nX1; } else - bEnd = TRUE; + bEnd = sal_True; } nSize = 0; nTwips = (long) (rVisAreaStart.Y() / HMM_PER_TWIPS); SCROW nY1 = 0; - bEnd = FALSE; + bEnd = sal_False; while (!bEnd) { nAdd = (long) pDoc->GetRowHeight(nY1,nTabNo); @@ -2097,7 +2097,7 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart ) ++nY1; } else - bEnd = TRUE; + bEnd = sal_True; } SetActivePart( SC_SPLIT_BOTTOMLEFT ); @@ -2156,7 +2156,7 @@ ScDrawView* ScViewData::GetScDrawView() return pView->GetScDrawView(); } -BOOL ScViewData::IsMinimized() +sal_Bool ScViewData::IsMinimized() { DBG_ASSERT( pView, "IsMinimized() ohne View" ); return pView->IsMinimized(); @@ -2167,7 +2167,7 @@ void ScViewData::UpdateScreenZoom( const Fraction& rNewX, const Fraction& rNewY Fraction aOldX = GetZoomX(); Fraction aOldY = GetZoomY(); - SetZoom( rNewX, rNewY, FALSE ); + SetZoom( rNewX, rNewY, sal_False ); Fraction aWidth = GetZoomX(); aWidth *= Fraction( aScrSize.Width(),1 ); @@ -2200,7 +2200,7 @@ void ScViewData::CalcPPT() if (nEndCol<20) nEndCol = 20; // same end position as when determining draw scale - USHORT nTwips = pDoc->GetCommonWidth( nEndCol, nTabNo ); + sal_uInt16 nTwips = pDoc->GetCommonWidth( nEndCol, nTabNo ); if ( nTwips ) { double fOriginal = nTwips * nPPTX; @@ -2236,10 +2236,10 @@ void ScViewData::WriteUserData(String& rData) // PosX[links]/PosX[rechts]/PosY[oben]/PosY[unten] // wenn Zeilen groesser 8192, "+" statt "/" - USHORT nZoom = (USHORT)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator()); + sal_uInt16 nZoom = (sal_uInt16)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator()); rData = String::CreateFromInt32( nZoom ); rData += '/'; - nZoom = (USHORT)((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator()); + nZoom = (sal_uInt16)((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator()); rData += String::CreateFromInt32( nZoom ); rData += '/'; if (bPagebreak) @@ -2325,10 +2325,10 @@ void ScViewData::ReadUserData(const String& rData) Fraction aZoomX, aZoomY, aPageZoomX, aPageZoomY; //! evaluate (all sheets?) String aZoomStr = rData.GetToken(0); // Zoom/PageZoom/Modus - USHORT nNormZoom = sal::static_int_cast<USHORT>(aZoomStr.GetToken(0,'/').ToInt32()); + sal_uInt16 nNormZoom = sal::static_int_cast<sal_uInt16>(aZoomStr.GetToken(0,'/').ToInt32()); if ( nNormZoom >= MINZOOM && nNormZoom <= MAXZOOM ) aZoomX = aZoomY = Fraction( nNormZoom, 100 ); // "normaler" Zoom (immer) - USHORT nPageZoom = sal::static_int_cast<USHORT>(aZoomStr.GetToken(1,'/').ToInt32()); + sal_uInt16 nPageZoom = sal::static_int_cast<sal_uInt16>(aZoomStr.GetToken(1,'/').ToInt32()); if ( nPageZoom >= MINZOOM && nPageZoom <= MAXZOOM ) aPageZoomX = aPageZoomY = Fraction( nPageZoom, 100 ); // Pagebreak-Zoom, wenn gesetzt sal_Unicode cMode = aZoomStr.GetToken(2,'/').GetChar(0); // 0 oder "0"/"1" @@ -2500,7 +2500,7 @@ void ScViewData::WriteExtOptions( ScExtDocOptions& rDocOpt ) const // sheet selection and selected ranges const ScMarkData& rMarkData = GetMarkData(); rTabSett.mbSelected = rMarkData.GetTableSelect( nTab ); - rMarkData.FillRangeListWithMarks( &rTabSett.maSelection, TRUE ); + rMarkData.FillRangeListWithMarks( &rTabSett.maSelection, sal_True ); // grid color rTabSett.maGridColor.SetColor( COL_AUTO ); @@ -2649,7 +2649,7 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& rDocOpt ) // Disabled, does not work correctly. Anyway, our own XML filters do not import a selection at all. // const ScRangeList& rSel = rTabSett.maSelection; // if( (rSel.Count() >= 2) || ((rSel.Count() == 1) && (*rSel.GetObject( 0 ) != ScRange( rCursor ))) ) -// rMarkData.MarkFromRangeList( rTabSett.maSelection, FALSE ); +// rMarkData.MarkFromRangeList( rTabSett.maSelection, sal_False ); // grid color -- #i47435# set automatic grid color explicitly if( pOptions ) @@ -2958,11 +2958,11 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> void ScViewData::SetOptions( const ScViewOptions& rOpt ) { // if visibility of horiz. ScrollBar is changed, TabBar may have to be resized... - BOOL bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) ); + sal_Bool bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) ); // if graphics are turned on or off, animation has to be started or stopped // graphics are controlled by VOBJ_TYPE_OLE - BOOL bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) != + sal_Bool bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) != rOpt.GetObjMode(VOBJ_TYPE_OLE) ); *pOptions = rOpt; @@ -2980,34 +2980,34 @@ Point ScViewData::GetMousePosPixel() return pView->GetMousePosPixel(); } -void ScViewData::UpdateInputHandler( BOOL bForce, BOOL bStopEditing ) +void ScViewData::UpdateInputHandler( sal_Bool bForce, sal_Bool bStopEditing ) { if (pViewShell) pViewShell->UpdateInputHandler( bForce, bStopEditing ); } -BOOL ScViewData::IsOle() +sal_Bool ScViewData::IsOle() { return pDocShell && pDocShell->IsOle(); } -BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert +sal_Bool ScViewData::UpdateFixX( SCTAB nTab ) // sal_True = Wert geaendert { if (!ValidTab(nTab)) // Default nTab=nTabNo; // akuelle Tabelle if (!pView || pTabData[nTab]->eHSplitMode != SC_SPLIT_FIX) - return FALSE; + return sal_False; ScDocument* pLocalDoc = GetDocument(); if (!pLocalDoc->HasTable(nTab)) // #114007# if called from reload, the sheet may not exist - return FALSE; + return sal_False; SCCOL nFix = pTabData[nTab]->nFixPosX; long nNewPos = 0; for (SCCOL nX=pTabData[nTab]->nPosX[SC_SPLIT_LEFT]; nX<nFix; nX++) { - USHORT nTSize = pLocalDoc->GetColWidth( nX, nTab ); + sal_uInt16 nTSize = pLocalDoc->GetColWidth( nX, nTab ); if (nTSize) { long nPix = ToPixel( nTSize, nPPTX ); @@ -3020,29 +3020,29 @@ BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert pTabData[nTab]->nHSplitPos = nNewPos; if (nTab == nTabNo) RecalcPixPos(); //! sollte nicht noetig sein !!! - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert +sal_Bool ScViewData::UpdateFixY( SCTAB nTab ) // sal_True = Wert geaendert { if (!ValidTab(nTab)) // Default nTab=nTabNo; // akuelle Tabelle if (!pView || pTabData[nTab]->eVSplitMode != SC_SPLIT_FIX) - return FALSE; + return sal_False; ScDocument* pLocalDoc = GetDocument(); if (!pLocalDoc->HasTable(nTab)) // #114007# if called from reload, the sheet may not exist - return FALSE; + return sal_False; SCROW nFix = pTabData[nTab]->nFixPosY; long nNewPos = 0; for (SCROW nY=pTabData[nTab]->nPosY[SC_SPLIT_TOP]; nY<nFix; nY++) { - USHORT nTSize = pLocalDoc->GetRowHeight( nY, nTab ); + sal_uInt16 nTSize = pLocalDoc->GetRowHeight( nY, nTab ); if (nTSize) { long nPix = ToPixel( nTSize, nPPTY ); @@ -3055,18 +3055,18 @@ BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert pTabData[nTab]->nVSplitPos = nNewPos; if (nTab == nTabNo) RecalcPixPos(); //! sollte nicht noetig sein !!! - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const { ScDocument* pLocalDoc = GetDocument(); - BOOL bOnlineSpell = pLocalDoc->GetDocOptions().IsAutoSpell(); + sal_Bool bOnlineSpell = pLocalDoc->GetDocOptions().IsAutoSpell(); - ULONG nCntrl = rOutl.GetControlWord(); + sal_uLong nCntrl = rOutl.GetControlWord(); nCntrl |= EE_CNTRL_URLSFXEXECUTE; nCntrl |= EE_CNTRL_MARKFIELDS; nCntrl |= EE_CNTRL_AUTOCORRECT; @@ -3106,7 +3106,7 @@ void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY, while (rScrY <= nEndPixels && nRow <= nEndRow) { SCROW nHeightEndRow; - USHORT nHeight = pDoc->GetRowHeight( nRow, nTabNo, NULL, &nHeightEndRow); + sal_uInt16 nHeight = pDoc->GetRowHeight( nRow, nTabNo, NULL, &nHeightEndRow); if (nHeightEndRow > nEndRow) nHeightEndRow = nEndRow; if (!nHeight) @@ -3147,7 +3147,7 @@ void ScViewData::AddPixelsWhileBackward( long & rScrY, long nEndPixels, while (rScrY <= nEndPixels && nRow >= nStartRow) { SCROW nHeightStartRow; - USHORT nHeight = pDoc->GetRowHeight( nRow, nTabNo, &nHeightStartRow, NULL); + sal_uInt16 nHeight = pDoc->GetRowHeight( nRow, nTabNo, &nHeightStartRow, NULL); if (nHeightStartRow < nStartRow) nHeightStartRow = nStartRow; if (!nHeight) |