diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-23 11:08:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-23 11:11:51 +0200 |
| commit | 6dda3d45c902d64323a085ea1604a993521f313d (patch) | |
| tree | 9b964839510ac36762733bd99951539040f8ffc0 /sc/source/ui/view | |
| parent | e32da7783686f088fa83cdae209bcf1c81d82f1e (diff) | |
sc: sal_Bool->bool
Change-Id: I70aad0b38979f45a313b8ac36890fb6c64d11bb0
Diffstat (limited to 'sc/source/ui/view')
33 files changed, 419 insertions, 419 deletions
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 79da4a4ed08a..498d17387541 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -282,8 +282,8 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) sal_uInt16 nWhich = aIter.FirstWhich(); while ( nWhich ) { - sal_Bool bDisable = false; - sal_Bool bNeedEdit = sal_True; // need cursor position be editable? + bool bDisable = false; + bool bNeedEdit = true; // need cursor position be editable? switch ( nWhich ) { case SID_THESAURUS: @@ -309,7 +309,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) if (!pDoc->IsBlockEditable( aCursor.Tab(), aRange.aStart.Col(),aRange.aStart.Row(), aRange.aEnd.Col(),aRange.aEnd.Row() )) { - bDisable = sal_True; + bDisable = true; } bNeedEdit=false; } @@ -320,7 +320,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) { if ( pDocShell && pDocShell->IsDocShared() ) { - bDisable = sal_True; + bDisable = true; } } break; @@ -328,14 +328,14 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) if (!bDisable && bNeedEdit) if (!pDoc->IsBlockEditable( aCursor.Tab(), aCursor.Col(),aCursor.Row(), aCursor.Col(),aCursor.Row() )) - bDisable = sal_True; + bDisable = true; if (bDisable) rSet.DisableItem(nWhich); nWhich = aIter.NextWhich(); } } -static sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHelper& rDataHelper, +static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHelper& rDataHelper, SotFormatStringId nFormatId ) { if ( rDataHelper.HasFormat( nFormatId ) ) @@ -363,7 +363,7 @@ static sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const Transferabl else rFormats.AddClipbrdFormat( nFormatId ); - return sal_True; + return true; } return false; @@ -372,7 +372,7 @@ static sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const Transferabl void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ) { Window* pWin = GetViewData()->GetActiveWin(); - sal_Bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); + bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) ); @@ -401,11 +401,11 @@ void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ) // insert, insert contents -static sal_Bool lcl_IsCellPastePossible( const TransferableDataHelper& rData ) +static bool lcl_IsCellPastePossible( const TransferableDataHelper& rData ) { - sal_Bool bPossible = false; + bool bPossible = false; if ( ScTransferObj::GetOwnClipboard( NULL ) || ScDrawTransferObj::GetOwnClipboard( NULL ) ) - bPossible = sal_True; + bPossible = true; else { if ( rData.HasFormat( SOT_FORMATSTR_ID_PNG ) || @@ -426,7 +426,7 @@ static sal_Bool lcl_IsCellPastePossible( const TransferableDataHelper& rData ) rData.HasFormat( SOT_FORMATSTR_ID_HTML_SIMPLE ) || rData.HasFormat( SOT_FORMATSTR_ID_DIF ) ) { - bPossible = sal_True; + bPossible = true; } } return bPossible; diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index eb8440680ae6..c485a99e1d89 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -196,7 +196,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) else { ScDocument* pDoc = GetViewData()->GetDocument(); - sal_Bool bTheFlag=(pDoc->GetChangeTrack()!=NULL); + bool bTheFlag=(pDoc->GetChangeTrack()!=NULL); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); @@ -331,7 +331,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); aFlags = aFlags.toAsciiUpperCase(); - sal_Bool bCont = sal_True; + bool bCont = true; for (sal_Int32 i=0 ; bCont && i<aFlags.getLength(); ++i) { @@ -433,8 +433,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { sal_uInt16 nFlags = IDF_NONE; sal_uInt16 nFunction = PASTE_NOFUNC; - sal_Bool bSkipEmpty = false; - sal_Bool bAsLink = false; + bool bSkipEmpty = false; + bool bAsLink = false; if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { @@ -445,7 +445,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); aFlags = aFlags.toAsciiUpperCase(); - sal_Bool bCont = sal_True; + bool bCont = true; for (sal_Int32 i=0; bCont && i < aFlags.getLength(); ++i) { @@ -530,7 +530,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) double fStartVal = MAXDOUBLE; double fIncVal = 1; double fMaxVal = MAXDOUBLE; - sal_Bool bDoIt = false; + bool bDoIt = false; GetViewData()->GetSimpleArea( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ); @@ -613,7 +613,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( pFormatter->IsNumberFormat( aFillMax, nKey, fTmpVal )) fMaxVal = fTmpVal; - bDoIt = sal_True; + bDoIt = true; } else // (pReqArgs == NULL) => raise Dialog @@ -729,7 +729,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) fStartVal = pDlg->GetStart(); fIncVal = pDlg->GetStep(); fMaxVal = pDlg->GetMax(); - bDoIt = sal_True; + bDoIt = true; } delete pDlg; } @@ -1037,8 +1037,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case SID_OUTLINE_MAKE: { - sal_Bool bColumns = false; - sal_Bool bOk = sal_True; + bool bColumns = false; + bool bOk = true; if ( GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ) ) @@ -1098,7 +1098,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) else // Dialog, when not whole rows/columns are marked { if ( GetViewData()->SimpleColMarked() && !GetViewData()->SimpleRowMarked() ) - bColumns = sal_True; + bColumns = true; else if ( !GetViewData()->SimpleColMarked() && GetViewData()->SimpleRowMarked() ) bColumns = false; else @@ -1131,8 +1131,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case SID_OUTLINE_REMOVE: { - sal_Bool bColumns = false; - sal_Bool bOk = sal_True; + bool bColumns = false; + bool bOk = true; if ( GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ) ) @@ -1175,7 +1175,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) delete pDlg; } else if ( bColPoss ) - bColumns = sal_True; + bColumns = true; else if ( bRowPoss ) bColumns = false; else @@ -1243,9 +1243,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( nFormat ) { Window* pWin = GetViewData()->GetActiveWin(); - sal_Bool bCells = ( ScTransferObj::GetOwnClipboard( pWin ) != NULL ); - sal_Bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); - sal_Bool bOle = ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE ); + bool bCells = ( ScTransferObj::GetOwnClipboard( pWin ) != NULL ); + bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); + bool bOle = ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE ); if ( bCells && bOle ) pTabViewShell->PasteFromSystem(); @@ -1266,14 +1266,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { sal_uInt16 nFlags = IDF_NONE; sal_uInt16 nFunction = PASTE_NOFUNC; - sal_Bool bSkipEmpty = false; - sal_Bool bTranspose = false; - sal_Bool bAsLink = false; + bool bSkipEmpty = false; + bool bTranspose = false; + bool bAsLink = false; InsCellCmd eMoveMode = INS_NONE; Window* pWin = GetViewData()->GetActiveWin(); ScDocument* pDoc = GetViewData()->GetDocument(); - sal_Bool bOtherDoc = !pDoc->IsClipboardSource(); + bool bOtherDoc = !pDoc->IsClipboardSource(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); if ( pOwnClip ) { @@ -1288,7 +1288,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); aFlags = aFlags.toAsciiUpperCase(); - sal_Bool bCont = sal_True; + bool bCont = true; for (sal_Int32 i=0 ; bCont && i<aFlags.getLength(); ++i) { @@ -1493,10 +1493,10 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pItem->ISA(SfxUInt32Item) ) { sal_uLong nFormat = ((const SfxUInt32Item*)pItem)->GetValue(); - sal_Bool bRet=sal_True; + bool bRet=true; { WaitObject aWait( GetViewData()->GetDialogParent() ); - sal_Bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); + bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); if ( bDraw && nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE ) pTabViewShell->PasteDraw(); else @@ -1505,7 +1505,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( bRet ) { - rReq.SetReturnValue(SfxInt16Item(nSlot, bRet)); // 1 = success, 0 = fail + rReq.SetReturnValue(SfxInt16Item(nSlot, bRet ? 1 : 0)); // 1 = success, 0 = fail rReq.Done(); } else @@ -1523,7 +1523,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } else // draw objects or external data { - sal_Bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); + bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); GetPossibleClipboardFormats( aFormats ); @@ -1703,9 +1703,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( RET_OK == nDialogRet ) { //get some parameters from the dialog - sal_Bool bToSimplified = sal_True; - sal_Bool bUseVariants = sal_True; - sal_Bool bCommonTerms = sal_True; + bool bToSimplified = true; + bool bUseVariants = true; + bool bCommonTerms = true; Reference< beans::XPropertySet > xProp( xDialog, UNO_QUERY ); if( xProp.is() ) { @@ -2020,7 +2020,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case SID_UPDATECHART: { - sal_Bool bAll = false; + bool bAll = false; if( pReqArgs ) { @@ -2444,7 +2444,7 @@ void ScCellShell::ExecuteExternalSource( if ( !_rFile.isEmpty() && !_rSource.isEmpty() ) // filter may be empty { ScRange aLinkRange; - sal_Bool bMove = false; + bool bMove = false; ScViewData* pData = GetViewData(); ScMarkData& rMark = pData->GetMarkData(); @@ -2452,7 +2452,7 @@ void ScCellShell::ExecuteExternalSource( if ( rMark.IsMarked() ) { rMark.GetMarkArea( aLinkRange ); - bMove = sal_True; // insert/delete cells to fit range + bMove = true; // insert/delete cells to fit range } else aLinkRange = ScRange( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() ); diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 44fdbed9e6fb..42b6316ad0ce 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -106,14 +106,14 @@ static bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange& rRange return bRet; } -static sal_Bool lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam ) +static bool lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam ) { ScTabViewShell* pTabViewShell = pData->GetViewShell(); ScDBData* pDBData = pTabViewShell->GetDBData(); ScDocument* pDoc = pData->GetDocument(); SCTAB nTab = pData->GetTabNo(); ScDirection eFillDir = DIR_TOP; - sal_Bool bSort = sal_True; + bool bSort = true; ScRange aExternalRange; if( rSortParam.nCol1 != rSortParam.nCol2 ) @@ -213,14 +213,14 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) // check if database beamer is open SfxViewFrame* pViewFrame = pTabViewShell->GetViewFrame(); - sal_Bool bWasOpen = false; + bool bWasOpen = false; { uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame().GetFrameInterface(); uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame( OUString("_beamer"), frame::FrameSearchFlag::CHILDREN); if ( xBeamerFrame.is() ) - bWasOpen = sal_True; + bWasOpen = true; } if ( bWasOpen ) @@ -250,7 +250,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) case SID_REIMPORT_DATA: { - sal_Bool bOk = false; + bool bOk = false; ScDBData* pDBData = pTabViewShell->GetDBData(true,SC_DB_OLD); if (pDBData) { @@ -260,7 +260,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { pTabViewShell->ImportData( aImportParam ); pDBData->SetImportParam( aImportParam ); //! Undo ?? - bOk = sal_True; + bOk = true; } } @@ -279,7 +279,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { // repeat import like SID_REIMPORT_DATA - sal_Bool bContinue = sal_True; + bool bContinue = true; ScImportParam aImportParam; pDBData->GetImportParam( aImportParam ); if (aImportParam.bImport && !pDBData->HasImportSelection()) @@ -356,7 +356,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ScDocument* pDoc = GetViewData()->GetDocument(); pDBData->GetSortParam( aSortParam ); - sal_Bool bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, nTab ); + bool bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, nTab ); if( nCol < aSortParam.nCol1 ) nCol = aSortParam.nCol1; @@ -405,7 +405,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ScDocument* pDoc = GetViewData()->GetDocument(); pDBData->GetSortParam( aSortParam ); - sal_Bool bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() ); + bool bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() ); if( bHasHeader ) aSortParam.bHasHeader = bHasHeader; @@ -472,7 +472,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) SfxItemSet aArgSet( GetPool(), SCITEM_SORTDATA, SCITEM_SORTDATA ); pDBData->GetSortParam( aSortParam ); - sal_Bool bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() ); + bool bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() ); if( bHasHeader ) aSortParam.bHasHeader = bHasHeader; @@ -792,11 +792,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ScValidationMode eMode = SC_VALID_ANY; ScConditionMode eOper = SC_COND_EQUAL; OUString aExpr1, aExpr2; - sal_Bool bBlank = sal_True; + bool bBlank = true; sal_Int16 nListType = ValidListType::UNSORTED; - sal_Bool bShowHelp = false; + bool bShowHelp = false; OUString aHelpTitle, aHelpText; - sal_Bool bShowError = false; + bool bShowError = false; ScValidErrorStyle eErrStyle = SC_VALERR_STOP; OUString aErrTitle, aErrText; @@ -1004,8 +1004,8 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) SCROW nPosY = pData->GetCurY(); SCTAB nTab = pData->GetTabNo(); - sal_Bool bAutoFilter = false; - sal_Bool bAutoFilterTested = false; + bool bAutoFilter = false; + bool bAutoFilterTested = false; SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); @@ -1017,7 +1017,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) { // imported data without selection // or filter,sort,subtotal (also without import) - sal_Bool bOk = false; + bool bOk = false; ScDBData* pDBData = pTabViewShell->GetDBData(false,SC_DB_OLD); if (pDBData && pDoc->GetChangeTrack() == NULL) { @@ -1090,7 +1090,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) { // SBA wants a sal_Bool-item, enabled - sal_Bool bEnable = sal_True; + bool bEnable = true; rSet.Put(SfxBoolItem(nWhich, bEnable)); } break; @@ -1101,7 +1101,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) if (!bAutoFilterTested) { bAutoFilter = pDoc->HasAutoFilter( nPosX, nPosY, nTab ); - bAutoFilterTested = sal_True; + bAutoFilterTested = true; } if ( nWhich == SID_AUTO_FILTER ) { @@ -1129,9 +1129,9 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) SCCOL nStartCol, nEndCol; SCROW nStartRow, nEndRow; SCTAB nStartTab, nEndTab; - sal_Bool bAnyQuery = false; + bool bAnyQuery = false; - sal_Bool bSelected = (GetViewData()->GetSimpleArea( + bool bSelected = (GetViewData()->GetSimpleArea( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ) == SC_MARK_SIMPLE); @@ -1156,7 +1156,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) ScQueryParam aParam; pDBData->GetQueryParam( aParam ); if ( aParam.GetEntry(0).bDoQuery ) - bAnyQuery = sal_True; + bAnyQuery = true; } if ( !bAnyQuery ) diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 36025b4119df..69c6d29cc9a4 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -449,13 +449,13 @@ void ScCellShell::Execute( SfxRequest& rReq ) // first test, if the prefix is recognised as valid, // else avoid only doubles - sal_Bool bPrefix = pDoc->ValidTabName( aBaseName ); + bool bPrefix = pDoc->ValidTabName( aBaseName ); OSL_ENSURE(bPrefix, "ungueltiger Tabellenname"); while ( pDoc->IsScenario(nTab+i) ) i++; - sal_Bool bValid; + bool bValid; SCTAB nDummy; do { @@ -487,7 +487,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) } else { - sal_Bool bSheetProtected = pDoc->IsTabProtected(nTab); + bool bSheetProtected = pDoc->IsTabProtected(nTab); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); @@ -726,7 +726,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) { // test whether to merge or to split bool bMerge = false; - sal_Bool bCenter = false; + bool bCenter = false; switch( nSlot ) { case FID_MERGE_ON: @@ -751,7 +751,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) { // merge - check if to move contents of covered cells bool bMoveContents = false; - sal_Bool bApi = rReq.IsAPI(); + bool bApi = rReq.IsAPI(); const SfxPoolItem* pItem; if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET ) @@ -874,7 +874,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_DETECTIVE_FILLMODE: { - sal_Bool bOldMode = pTabViewShell->IsAuditShell(); + bool bOldMode = pTabViewShell->IsAuditShell(); pTabViewShell->SetAuditShell( !bOldMode ); pTabViewShell->Invalidate( nSlot ); } diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index 3d4fc2fa4e9f..3396ae5de477 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.cxx @@ -37,8 +37,8 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) const SfxItemSet* pReqArgs = rReq.GetArgs(); sal_uInt16 nSlotId = rReq.GetSlot(); SCsCOLROW nRepeat = 1; - sal_Bool bSel = false; - sal_Bool bKeep = false; + bool bSel = false; + bool bKeep = false; if ( pReqArgs != NULL ) { @@ -54,7 +54,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) sal_uInt16 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 @@ -393,8 +393,8 @@ 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; + bool bSel = false; + bool bKeep = false; if ( pReqArgs != NULL ) { @@ -408,7 +408,7 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) sal_uInt16 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 diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx index 4beee59dc28b..242a5751dd3b 100644 --- a/sc/source/ui/view/cliputil.cxx +++ b/sc/source/ui/view/cliputil.cxx @@ -45,7 +45,7 @@ void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTab nClipEndY = nClipEndY + nClipStartY; // GetClipArea returns the difference ScRange aSource( nClipStartX, nClipStartY, nSourceTab, nClipEndX, nClipEndY, nSourceTab ); - sal_Bool bDone = pTabViewShell->DataPilotMove( aSource, pViewData->GetCurPos() ); + bool bDone = pTabViewShell->DataPilotMove( aSource, pViewData->GetCurPos() ); if ( !bDone ) pTabViewShell->ErrorMessage( STR_ERR_DATAPILOT_INPUT ); } diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 82a4743a2594..704fda74ce72 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -203,7 +203,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std:: ScDocument* pDoc = pDocShell->GetDocument(); ScDBCollection* pOldColl = pDoc->GetDBCollection(); ScDBCollection* pUndoColl = NULL; - const sal_Bool bRecord (pDoc->IsUndoEnabled()); + const bool bRecord (pDoc->IsUndoEnabled()); std::vector<ScRange>::const_iterator iter; for (iter = rDelAreaList.begin(); iter != rDelAreaList.end(); ++iter) @@ -276,7 +276,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, bool bRecord, bool bPaint ) ScDocShell* pDocSh = GetViewData()->GetDocShell(); SCTAB nTab = GetViewData()->GetTabNo(); ScDBDocFunc aDBDocFunc( *pDocSh ); - sal_Bool bSuccess = aDBDocFunc.Sort( nTab, rSortParam, bRecord, bPaint, false ); + bool bSuccess = aDBDocFunc.Sort( nTab, rSortParam, bRecord, bPaint, false ); if ( bSuccess && !rSortParam.bInplace ) { // mark target @@ -297,11 +297,11 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource ScDocShell* pDocSh = GetViewData()->GetDocShell(); SCTAB nTab = GetViewData()->GetTabNo(); ScDBDocFunc aDBDocFunc( *pDocSh ); - sal_Bool bSuccess = aDBDocFunc.Query( nTab, rQueryParam, pAdvSource, bRecord, false ); + bool bSuccess = aDBDocFunc.Query( nTab, rQueryParam, pAdvSource, bRecord, false ); if (bSuccess) { - sal_Bool bCopy = !rQueryParam.bInplace; + bool bCopy = !rQueryParam.bInplace; if (bCopy) { // mark target range (data base range has been set up if applicable) @@ -346,9 +346,9 @@ void ScDBFunc::ToggleAutoFilter() SCROW nRow = aParam.nRow1; SCTAB nTab = GetViewData()->GetTabNo(); sal_Int16 nFlag; - sal_Bool bHasAuto = sal_True; - sal_Bool bHeader = pDBData->HasHeader(); - sal_Bool bPaint = false; + bool bHasAuto = true; + bool bHeader = pDBData->HasHeader(); + bool bPaint = false; //! instead retrieve from DB-range? @@ -394,7 +394,7 @@ void ScDBFunc::ToggleAutoFilter() pDocSh->GetUndoManager()->LeaveListAction(); - bPaint = sal_True; + bPaint = true; } else // show filter buttons { @@ -410,7 +410,7 @@ void ScDBFunc::ToggleAutoFilter() ).Execute() == RET_YES ) { pDBData->SetHeader( true ); //! Undo ?? - bHeader = sal_True; + bHeader = true; } } @@ -429,7 +429,7 @@ void ScDBFunc::ToggleAutoFilter() } pDocSh->PostPaint(ScRange(aParam.nCol1, nRow, nTab, aParam.nCol2, nRow, nTab), PAINT_GRID); - bPaint = sal_True; + bPaint = true; } else { diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index f3d3671b2f59..b975edf6924e 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -336,7 +336,7 @@ void ScDBFunc::ShowMarkedOutlines( bool bRecord ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScOutlineDocFunc aFunc(*pDocSh); - sal_Bool bDone = aFunc.ShowMarkedOutlines( aRange, bRecord ); + bool bDone = aFunc.ShowMarkedOutlines( aRange, bRecord ); if (bDone) UpdateScrollBars(); } @@ -368,7 +368,7 @@ void ScDBFunc::HideMarkedOutlines( bool bRecord ) void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, const ScSortParam* pForceNewSort ) { - sal_Bool bDo = !rParam.bRemoveOnly; // sal_False = nur loeschen + bool bDo = !rParam.bRemoveOnly; // sal_False = nur loeschen ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); @@ -400,7 +400,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, } WaitObject aWait( GetViewData()->GetDialogParent() ); - sal_Bool bOk = true; + bool bOk = true; if (rParam.bReplace) if (pDoc->TestRemoveSubTotals( nTab, rParam )) { @@ -423,7 +423,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, if (bRecord) // alte Daten sichern { - sal_Bool bOldFilter = bDo && rParam.bDoSort; + bool bOldFilter = bDo && rParam.bDoSort; SCTAB nTabCount = pDoc->GetTableCount(); pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab ); @@ -477,7 +477,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, if (rParam.bReplace) pDoc->RemoveSubTotals( nTab, aNewParam ); - sal_Bool bSuccess = sal_True; + bool bSuccess = true; if (bDo) { // Sortieren @@ -695,7 +695,7 @@ void ScDBFunc::GetSelectedMemberList(ScDPUniqueStringSet& rEntries, long& rDimen ScRangeListRef xRanges; GetViewData()->GetMultiArea( xRanges ); // incl. cursor if nothing is selected size_t nRangeCount = xRanges->size(); - sal_Bool bContinue = true; + bool bContinue = true; for (size_t nRangePos=0; nRangePos < nRangeCount && bContinue; nRangePos++) { @@ -767,8 +767,8 @@ bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout ); OUString aBaseDimName( aDimName ); - sal_Bool bInGroupDim = false; - sal_Bool bFoundParts = false; + bool bInGroupDim = false; + bool bFoundParts = false; ScDPDimensionSaveData* pDimData = const_cast<ScDPDimensionSaveData*>( pDPObj->GetSaveData()->GetExistingDimensionData() ); @@ -795,10 +795,10 @@ bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rOldInfo = pNumGroupDim->GetInfo(); rParts = com::sun::star::sheet::DataPilotFieldGroupBy::DAYS; // not found in CollectDateParts - bFoundParts = sal_True; + bFoundParts = true; bFound = true; } - bInGroupDim = sal_True; + bInGroupDim = true; } else if ( pGroupDim ) { @@ -813,7 +813,7 @@ bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& aBaseDimName = pGroupDim->GetSourceDimName(); bFound = true; } - bInGroupDim = sal_True; + bInGroupDim = true; } } if ( bFound && !bFoundParts ) @@ -879,7 +879,7 @@ bool ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo ) bool bIsDataLayout; OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout ); - sal_Bool bInGroupDim = false; + bool bInGroupDim = false; ScDPDimensionSaveData* pDimData = const_cast<ScDPDimensionSaveData*>( pDPObj->GetSaveData()->GetExistingDimensionData() ); @@ -895,7 +895,7 @@ bool ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo ) bFound = true; } else if ( pDimData->GetNamedGroupDim( aDimName ) ) - bInGroupDim = sal_True; // in a group dimension + bInGroupDim = true; // in a group dimension } if ( !bFound && !bInGroupDim ) { @@ -2086,19 +2086,19 @@ void ScDBFunc::RepeatDB( bool bRecord ) ScQueryParam aQueryParam; pDBData->GetQueryParam( aQueryParam ); - sal_Bool bQuery = aQueryParam.GetEntry(0).bDoQuery; + bool bQuery = aQueryParam.GetEntry(0).bDoQuery; ScSortParam aSortParam; pDBData->GetSortParam( aSortParam ); - sal_Bool bSort = aSortParam.maKeyState[0].bDoSort; + bool bSort = aSortParam.maKeyState[0].bDoSort; ScSubTotalParam aSubTotalParam; pDBData->GetSubTotalParam( aSubTotalParam ); - sal_Bool bSubTotal = aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly; + bool bSubTotal = aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly; if ( bQuery || bSort || bSubTotal ) { - sal_Bool bQuerySize = false; + bool bQuerySize = false; ScRange aOldQuery; ScRange aNewQuery; if (bQuery && !aQueryParam.bInplace) @@ -2108,7 +2108,7 @@ void ScDBFunc::RepeatDB( bool bRecord ) if (pDest && pDest->IsDoSize()) { pDest->GetArea( aOldQuery ); - bQuerySize = sal_True; + bQuerySize = true; } } diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index d3f127cf98ae..abbb48c92bd2 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -101,8 +101,8 @@ void ScDrawView::SetCellAnchored() ScAnchorType ScDrawView::GetAnchorType() const { - sal_Bool bPage = false; - sal_Bool bCell = false; + bool bPage = false; + bool bCell = false; if( AreObjectsMarked() ) { const SdrMarkList* pMark = &GetMarkedObjectList(); @@ -114,7 +114,7 @@ ScAnchorType ScDrawView::GetAnchorType() const if( ScDrawLayer::GetAnchorType( *pObj ) == SCA_CELL ) bCell =true; else - bPage = sal_True; + bPage = true; } } if( bPage && !bCell ) diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 138b94842984..ad38c2cbaebc 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -469,7 +469,7 @@ void ScDrawView::SetMarkedOriginalSize() { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); sal_uInt16 nIdent = pObj->GetObjIdentifier(); - sal_Bool bDo = false; + bool bDo = false; Size aOriginalSize; if (nIdent == OBJ_OLE2) { @@ -483,7 +483,7 @@ void ScDrawView::SetMarkedOriginalSize() { MapMode aMapMode( MAP_100TH_MM ); aOriginalSize = ((SdrOle2Obj*)pObj)->GetOrigObjSize( &aMapMode ); - bDo = sal_True; + bDo = true; } else { @@ -495,7 +495,7 @@ void ScDrawView::SetMarkedOriginalSize() aOriginalSize = OutputDevice::LogicToLogic( Size( aSz.Width, aSz.Height ), aUnit, MAP_100TH_MM ); - bDo = sal_True; + bDo = true; } catch( embed::NoVisualAreaSizeException& ) { OSL_ENSURE( false, "Can't get the original size of the object!" ); @@ -525,7 +525,7 @@ void ScDrawView::SetMarkedOriginalSize() { aOriginalSize = pActWin->LogicToLogic( rGraphic.GetPrefSize(), &aSourceMap, &aDestMap ); - bDo = sal_True; + bDo = true; } } } diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 022cc3f92a93..63048af413b4 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -76,8 +76,8 @@ void ScDrawView::Construct() SCTAB nViewTab = pViewData->GetTabNo(); ShowSdrPage(GetModel()->GetPage(nViewTab)); - sal_Bool bEx = pViewData->GetViewShell()->IsDrawSelMode(); - sal_Bool bProt = pDoc->IsTabProtected( nViewTab ) || + bool bEx = pViewData->GetViewShell()->IsDrawSelMode(); + bool bProt = pDoc->IsTabProtected( nViewTab ) || pViewData->GetSfxDocShell()->IsReadOnly(); SdrLayer* pLayer; @@ -392,7 +392,7 @@ void ScDrawView::MarkListHasChanged() LockInternalLayer(); } - sal_Bool bSubShellSet = false; + bool bSubShellSet = false; if (nMarkCount == 1) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); @@ -403,13 +403,13 @@ void ScDrawView::MarkListHasChanged() pViewSh->SetOleObjectShell(true); else pViewSh->SetChartShell(true); - bSubShellSet = sal_True; + bSubShellSet = true; } else if (pObj->GetObjIdentifier() == OBJ_GRAF) { pGrafObj = (SdrGrafObj*) pObj; pViewSh->SetGraphicShell(true); - bSubShellSet = sal_True; + bSubShellSet = true; } else if (pObj->GetObjIdentifier() == OBJ_MEDIA) { @@ -425,8 +425,8 @@ void ScDrawView::MarkListHasChanged() if ( nMarkCount && !bSubShellSet ) { - sal_Bool bOnlyControls = sal_True; - sal_Bool bOnlyGraf = sal_True; + bool bOnlyControls = true; + bool bOnlyGraf = true; for (sal_uLong i=0; i<nMarkCount; i++) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); @@ -481,7 +481,7 @@ void ScDrawView::MarkListHasChanged() // Verben anpassen SfxViewFrame* pViewFrame = pViewSh->GetViewFrame(); - sal_Bool bOle = pViewSh->GetViewFrame()->GetFrame().IsInPlace(); + bool bOle = pViewSh->GetViewFrame()->GetFrame().IsInPlace(); uno::Sequence< embed::VerbDescriptor > aVerbs; if ( pOle2Obj && !bOle ) { @@ -545,7 +545,7 @@ bool ScDrawView::SdrBeginTextEdit( bool bOnlyOneView, bool bGrabFocus ) { - const sal_Bool bRet = FmFormView::SdrBeginTextEdit( + const bool bRet = FmFormView::SdrBeginTextEdit( pObj, pPV, pWinL, bIsNewObj, pGivenOutliner, pGivenOutlinerView, bDontDeleteOutliner, bOnlyOneView, bGrabFocus ); @@ -869,7 +869,7 @@ void ScDrawView::DeleteMarked() SdrEndTextEditKind ScDrawView::ScEndTextEdit() { - sal_Bool bIsTextEdit = IsTextEdit(); + bool bIsTextEdit = IsTextEdit(); SdrEndTextEditKind eKind = SdrEndTextEdit(); if ( bIsTextEdit && pViewData ) diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 14bfab8e2737..542e6cad9e6d 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -132,7 +132,7 @@ static void lcl_RemoveAttribs( EditView& rEditView ) { ScEditEngineDefaulter* pEngine = static_cast<ScEditEngineDefaulter*>(rEditView.GetEditEngine()); - sal_Bool bOld = pEngine->GetUpdateMode(); + bool bOld = pEngine->GetUpdateMode(); pEngine->SetUpdateMode(false); OUString aName = ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); @@ -180,7 +180,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) EditEngine* pEngine = pTableView->GetEditEngine(); pHdl->DataChanging(); - sal_Bool bSetSelIsRef = false; + bool bSetSelIsRef = false; bool bSetModified = true; switch ( nSlot ) @@ -507,7 +507,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) } // Referenz wird selektiert -> beim Tippen nicht ueberschreiben - bSetSelIsRef = sal_True; + bSetSelIsRef = true; } } } @@ -525,7 +525,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) const OUString& rTarget = pHyper->GetTargetFrame(); SvxLinkInsertMode eMode = pHyper->GetInsertMode(); - sal_Bool bDone = false; + bool bDone = false; if ( eMode == HLINK_DEFAULT || eMode == HLINK_FIELD ) { const SvxURLField* pURLField = GetURLField(); @@ -559,7 +559,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) pTopView->SetSelection( aSel ); // select inserted field } - bDone = sal_True; + bDone = true; } } @@ -733,7 +733,7 @@ void ScEditShell::GetState( SfxItemSet& rSet ) rSet.Put( SfxStringItem( SID_THES, aStatusVal ) ); // disable thesaurus context menu entry if there is nothing to look up - sal_Bool bCanDoThesaurus = ScModule::HasThesaurusLanguage( nLang ); + bool bCanDoThesaurus = ScModule::HasThesaurusLanguage( nLang ); if (!bIsLookUpWord || !bCanDoThesaurus) rSet.DisableItem( SID_THES ); } @@ -888,12 +888,12 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) SfxItemPool& rPool = GetPool(); - sal_Bool bOld = false; + bool bOld = false; SvxScriptSetItem aOldSetItem( nSlot, rPool ); aOldSetItem.GetItemSet().Put( pEditView->GetAttribs(), false ); const SfxPoolItem* pCore = aOldSetItem.GetItemOfScript( nScript ); if ( pCore && ((const SvxWeightItem*)pCore)->GetWeight() > WEIGHT_NORMAL ) - bOld = sal_True; + bOld = true; SvxScriptSetItem aSetItem( nSlot, rPool ); aSetItem.PutItemForScriptType( nScript, @@ -911,12 +911,12 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) SfxItemPool& rPool = GetPool(); - sal_Bool bOld = false; + bool bOld = false; SvxScriptSetItem aOldSetItem( nSlot, rPool ); aOldSetItem.GetItemSet().Put( pEditView->GetAttribs(), false ); const SfxPoolItem* pCore = aOldSetItem.GetItemOfScript( nScript ); if ( pCore && ((const SvxPostureItem*)pCore)->GetValue() != ITALIC_NONE ) - bOld = sal_True; + bOld = true; SvxScriptSetItem aSetItem( nSlot, rPool ); aSetItem.PutItemForScriptType( nScript, @@ -980,7 +980,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) case SID_ATTR_CHAR_STRIKEOUT: { - sal_Bool bOld = ((const SvxCrossedOutItem&)pEditView->GetAttribs(). + bool bOld = ((const SvxCrossedOutItem&)pEditView->GetAttribs(). Get(EE_CHAR_STRIKEOUT)).GetValue() != STRIKEOUT_NONE; aSet.Put( SvxCrossedOutItem( bOld ? STRIKEOUT_NONE : STRIKEOUT_SINGLE, EE_CHAR_STRIKEOUT ) ); rBindings.Invalidate( nSlot ); @@ -989,7 +989,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) case SID_ATTR_CHAR_SHADOWED: { - sal_Bool bOld = ((const SvxShadowedItem&)pEditView->GetAttribs(). + bool bOld = ((const SvxShadowedItem&)pEditView->GetAttribs(). Get(EE_CHAR_SHADOW)).GetValue(); aSet.Put( SvxShadowedItem( !bOld, EE_CHAR_SHADOW ) ); rBindings.Invalidate( nSlot ); @@ -998,7 +998,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) case SID_ATTR_CHAR_CONTOUR: { - sal_Bool bOld = ((const SvxContourItem&)pEditView->GetAttribs(). + bool bOld = ((const SvxContourItem&)pEditView->GetAttribs(). Get(EE_CHAR_OUTLINE)).GetValue(); aSet.Put( SvxContourItem( !bOld, EE_CHAR_OUTLINE ) ); rBindings.Invalidate( nSlot ); @@ -1041,7 +1041,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) EditEngine* pEngine = pEditView->GetEditEngine(); - sal_Bool bOld = pEngine->GetUpdateMode(); + bool bOld = pEngine->GetUpdateMode(); pEngine->SetUpdateMode(false); pEditView->SetAttribs( aSet ); @@ -1187,7 +1187,7 @@ void ScEditShell::ExecuteUndo(SfxRequest& rReq) case SID_UNDO: case SID_REDO: { - sal_Bool bIsUndo = ( nSlot == SID_UNDO ); + bool bIsUndo = ( nSlot == SID_UNDO ); sal_uInt16 nCount = 1; const SfxPoolItem* pItem; diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index a0e7e55c5c59..429bc2175302 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -1156,8 +1156,8 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) break; } - const sal_Bool bThousand = (sal_Bool)sFormat[0].toInt32(); - const sal_Bool bNegRed = (sal_Bool)sFormat[1].toInt32(); + const bool bThousand = (bool)sFormat[0].toInt32(); + const bool bNegRed = (bool)sFormat[1].toInt32(); const sal_uInt16 nPrecision = (sal_uInt16)sFormat[2].toInt32(); const sal_uInt16 nLeadZeroes = (sal_uInt16)sFormat[3].toInt32(); @@ -2578,7 +2578,7 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest& rReq ) case SID_TEXTDIRECTION_LEFT_TO_RIGHT: case SID_TEXTDIRECTION_TOP_TO_BOTTOM: { - sal_Bool bVert = (nSlot == SID_TEXTDIRECTION_TOP_TO_BOTTOM); + bool bVert = (nSlot == SID_TEXTDIRECTION_TOP_TO_BOTTOM); ScPatternAttr aAttr( GetViewData()->GetDocument()->GetPool() ); SfxItemSet& rItemSet = aAttr.GetItemSet(); rItemSet.Put( SfxBoolItem( ATTR_STACKED, bVert ) ); @@ -2606,15 +2606,15 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet ) ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); - sal_Bool bVertDontCare = + bool bVertDontCare = (rAttrSet.GetItemState( ATTR_VERTICAL_ASIAN ) == SFX_ITEM_DONTCARE) || (rAttrSet.GetItemState( ATTR_STACKED ) == SFX_ITEM_DONTCARE); - sal_Bool bLeftRight = !bVertDontCare && + bool bLeftRight = !bVertDontCare && !((const SfxBoolItem&) rAttrSet.Get( ATTR_STACKED )).GetValue(); - sal_Bool bTopBottom = !bVertDontCare && !bLeftRight && + bool bTopBottom = !bVertDontCare && !bLeftRight && ((const SfxBoolItem&) rAttrSet.Get( ATTR_VERTICAL_ASIAN )).GetValue(); - sal_Bool bBidiDontCare = (rAttrSet.GetItemState( ATTR_WRITINGDIR ) == SFX_ITEM_DONTCARE); + bool bBidiDontCare = (rAttrSet.GetItemState( ATTR_WRITINGDIR ) == SFX_ITEM_DONTCARE); EEHorizontalTextDirection eBidiDir = EE_HTEXTDIR_DEFAULT; if ( !bBidiDontCare ) { @@ -2630,8 +2630,8 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet ) } SvtLanguageOptions aLangOpt; - sal_Bool bDisableCTLFont = !aLangOpt.IsCTLFontEnabled(); - sal_Bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); + bool bDisableCTLFont = !aLangOpt.IsCTLFontEnabled(); + bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); SfxWhichIter aIter( rSet ); sal_uInt16 nWhich = aIter.FirstWhich(); @@ -2684,7 +2684,7 @@ void ScFormatShell::ExecFormatPaintbrush( SfxRequest& rReq ) } else { - sal_Bool bLock = false; + bool bLock = false; const SfxItemSet *pArgs = rReq.GetArgs(); if( pArgs && pArgs->Count() >= 1 ) bLock = static_cast<const SfxBoolItem&>(pArgs->Get(SID_FORMATPAINTBRUSH)).GetValue(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 06b54bb8dff5..69202b56d800 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -202,10 +202,10 @@ private: ScGridWindow* pGridWin; SCCOL nCol; SCROW nRow; - sal_Bool bButtonDown; - sal_Bool bInit; - sal_Bool bCancelled; - sal_Bool bInSelect; + bool bButtonDown; + bool bInit; + bool bCancelled; + bool bInSelect; bool mbListHasDates; sal_uLong nSel; ScFilterBoxMode eMode; @@ -226,9 +226,9 @@ public: SCROW GetRow() const { return nRow; } ScFilterBoxMode GetMode() const { return eMode; } void EndInit(); - sal_Bool IsInInit() const { return bInit; } - void SetCancelled() { bCancelled = sal_True; } - sal_Bool IsInSelect() const { return bInSelect; } + bool IsInInit() const { return bInit; } + void SetCancelled() { bCancelled = true; } + bool IsInSelect() const { return bInSelect; } void SetListHasDates(bool b) { mbListHasDates = b; } bool HasDates() const { return mbListHasDates; } }; @@ -241,7 +241,7 @@ ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid, nCol( nNewCol ), nRow( nNewRow ), bButtonDown( false ), - bInit( sal_True ), + bInit( true ), bCancelled( false ), bInSelect( false ), mbListHasDates(false), @@ -317,7 +317,7 @@ void ScFilterListBox::SelectHdl() if (!bButtonDown) { // #i81298# set bInSelect flag, so the box isn't deleted from modifications within FilterSelect - bInSelect = sal_True; + bInSelect = true; pGridWin->FilterSelect( nSel ); bInSelect = false; } @@ -350,7 +350,7 @@ Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() return GetWindow(WINDOW_FIRSTCHILD) ? GetWindow(WINDOW_FIRSTCHILD)->GetPreferredKeyInputWindow() : NULL; // will be the FilterBox } -static sal_Bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) +static bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) { // wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle // mit Origin links oben liegt, enthaelt der Bereich genau die Matrix. @@ -944,7 +944,7 @@ void ScGridWindow::DoScenarioMenu( const ScRange& rScenRange ) ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); long nSizeX = 0; long nSizeY = 0; @@ -1210,7 +1210,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec ScQueryParam aParam; pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben - sal_Bool bValid = sal_True; + bool bValid = true; SCSIZE nCount = aParam.GetEntryCount(); for (SCSIZE j = 0; j < nCount && bValid; ++j) // bisherige Filter-Einstellungen if (aParam.GetEntry(j).bDoQuery) @@ -1396,13 +1396,13 @@ void ScGridWindow::ExecFilter( sal_uLong nSel, } else { - sal_Bool bDeleteOld = false; + bool bDeleteOld = false; SCSIZE nQueryPos = 0; - sal_Bool bFound = false; + bool bFound = false; if (!aParam.bInplace) - bDeleteOld = sal_True; + bDeleteOld = true; if (aParam.bRegExp) - bDeleteOld = sal_True; + bDeleteOld = true; SCSIZE nCount = aParam.GetEntryCount(); for (SCSIZE i = 0; i < nCount && !bDeleteOld; ++i) // bisherige Filter-Einstellungen if (aParam.GetEntry(i).bDoQuery) @@ -1412,14 +1412,14 @@ void ScGridWindow::ExecFilter( sal_uLong nSel, ScQueryEntry& rEntry = aParam.GetEntry(i); if (i>0) if (rEntry.eConnect != SC_AND) - bDeleteOld = sal_True; + bDeleteOld = true; if (rEntry.nField == nCol) { if (bFound) // diese Spalte zweimal? - bDeleteOld = sal_True; + bDeleteOld = true; nQueryPos = i; - bFound = sal_True; + bFound = true; } if (!bFound) nQueryPos = i + 1; @@ -1680,11 +1680,11 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta pScActiveViewShell = pViewData->GetViewShell(); // falls auf Link geklickt wird nScClickMouseModifier = rMEvt.GetModifier(); // um Control-Klick immer zu erkennen - sal_Bool bDetective = pViewData->GetViewShell()->IsAuditShell(); - sal_Bool bRefMode = pViewData->IsRefMode(); // Referenz angefangen - sal_Bool bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz - sal_Bool bEditMode = pViewData->HasEditView(eWhich); // auch bei Mode==SC_INPUT_TYPE - sal_Bool bDouble = (rMEvt.GetClicks() == 2); + bool bDetective = pViewData->GetViewShell()->IsAuditShell(); + bool bRefMode = pViewData->IsRefMode(); // Referenz angefangen + bool bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz + bool bEditMode = pViewData->HasEditView(eWhich); // auch bei Mode==SC_INPUT_TYPE + bool bDouble = (rMEvt.GetClicks() == 2); // DeactivateIP passiert nur noch bei MarkListHasChanged @@ -1794,7 +1794,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - sal_Bool bCrossPointer = TestMouse( rMEvt, true ); + bool bCrossPointer = TestMouse( rMEvt, true ); if ( bCrossPointer ) { if ( bDouble ) @@ -1917,7 +1917,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta // Links in Edit-Zellen - sal_Bool bAlt = rMEvt.IsMod2(); + bool bAlt = rMEvt.IsMod2(); if ( !bAlt && rMEvt.IsLeft() && GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link: Cursor nicht bewegen { @@ -2084,7 +2084,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) SCROW nEndRow; pViewData->GetFillData( nStartCol, nStartRow, nEndCol, nEndRow ); ScRange aDelRange; - sal_Bool bIsDel = pViewData->GetDelMark( aDelRange ); + bool bIsDel = pViewData->GetDelMark( aDelRange ); ScViewFunc* pView = pViewData->GetView(); pView->StopRefMode(); @@ -2143,7 +2143,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pViewData->GetDocShell()->UpdateOle(pViewData); } - sal_Bool bRefMode = pViewData->IsRefMode(); + bool bRefMode = pViewData->IsRefMode(); if (bRefMode) pScMod->EndReference(); @@ -2205,7 +2205,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) // double click (only left button) - sal_Bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() ); + bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() ); if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() ) { // data pilot table @@ -2290,7 +2290,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) // Links in edit cells - sal_Bool bAlt = rMEvt.IsMod2(); + bool bAlt = rMEvt.IsMod2(); if ( !bAlt && !bRefMode && !bDouble && nMouseStatus == SC_GM_URLDOWN ) { // beim ButtonUp nur ausfuehren, wenn ButtonDown auch ueber einer URL war @@ -2383,7 +2383,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pViewData->GetView()->SelectionChanged(); SfxDispatcher* pDisp = pViewData->GetViewShell()->GetDispatcher(); - sal_Bool bFormulaMode = pScMod->IsFormulaMode(); + bool bFormulaMode = pScMod->IsFormulaMode(); OSL_ENSURE( pDisp || bFormulaMode, "Cursor auf nicht aktiver View bewegen ?" ); // #i14927# execute SID_CURRENTCELL (for macro recording) only if there is no @@ -2485,7 +2485,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) } } - sal_Bool bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz + bool bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz if (bEEMouse && pViewData->HasEditView( eWhich )) { @@ -2517,7 +2517,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) // anderen Mauszeiger anzeigen? - sal_Bool bEditMode = pViewData->HasEditView(eWhich); + bool bEditMode = pViewData->HasEditView(eWhich); //! Testen ob RefMode-Dragging !!! if ( bEditMode && (pViewData->GetRefTabNo() == pViewData->GetTabNo()) ) @@ -2538,7 +2538,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) nPosY >= (SCsROW) nEditRow && nPosY <= (SCsROW) nEndRow ) { // Field can only be URL field - sal_Bool bAlt = rMEvt.IsMod2(); + bool bAlt = rMEvt.IsMod2(); if ( !bAlt && !nButtonDown && pEditView && pEditView->GetFieldUnderMousePointer() ) SetPointer( Pointer( POINTER_REFHAND ) ); else if ( pEditView && pEditView->GetEditEngine()->IsVertical() ) @@ -2549,13 +2549,13 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) } } - sal_Bool bWater = SC_MOD()->GetIsWaterCan() || pViewData->GetView()->HasPaintBrush(); + bool bWater = SC_MOD()->GetIsWaterCan() || pViewData->GetView()->HasPaintBrush(); if (bWater) SetPointer( Pointer(POINTER_FILL) ); if (!bWater) { - sal_Bool bCross = false; + bool bCross = false; // Range-Finder @@ -2566,7 +2566,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) SetPointer( Pointer( POINTER_CROSS ) ); else SetPointer( Pointer( POINTER_HAND ) ); - bCross = sal_True; + bCross = true; } // Page-Break-Modus @@ -2598,25 +2598,25 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) break; } SetPointer( Pointer( eNew ) ); - bCross = sal_True; + bCross = true; } // Fill-Cursor anzeigen ? if ( !bFormulaMode && !nButtonDown ) if (TestMouse( rMEvt, false )) - bCross = sal_True; + bCross = true; if ( nButtonDown && pViewData->IsAnyFillMode() ) { SetPointer( Pointer( POINTER_CROSS ) ); - bCross = sal_True; + bCross = true; nScFillModeMouseModifier = rMEvt.GetModifier(); // ausgewertet bei AutoFill und Matrix } if (!bCross) { - sal_Bool bAlt = rMEvt.IsMod2(); + bool bAlt = rMEvt.IsMod2(); if (bEditMode) // Edit-Mode muss zuerst kommen! SetPointer( Pointer( POINTER_ARROW ) ); @@ -2746,7 +2746,7 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt ) StopMarking(); MouseButtonUp( rMEvt ); // mit Status SC_GM_IGNORE aus StopMarking - sal_Bool bRefMode = pViewData->IsRefMode(); + bool bRefMode = pViewData->IsRefMode(); if (bRefMode) SC_MOD()->EndReference(); // Dialog nicht verkleinert lassen } @@ -2843,7 +2843,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt ) nCmd == COMMAND_CURSORPOS || nCmd == COMMAND_QUERYCHARPOSITION ) { - sal_Bool bEditView = pViewData->HasEditView( eWhich ); + bool bEditView = pViewData->HasEditView( eWhich ); if (!bEditView) { // only if no cell editview is active, look at drawview @@ -2908,20 +2908,20 @@ void ScGridWindow::Command( const CommandEvent& rCEvt ) if ( nCmd == COMMAND_WHEEL || nCmd == COMMAND_STARTAUTOSCROLL || nCmd == COMMAND_AUTOSCROLL ) { - sal_Bool bDone = pViewData->GetView()->ScrollCommand( rCEvt, eWhich ); + bool bDone = pViewData->GetView()->ScrollCommand( rCEvt, eWhich ); if (!bDone) Window::Command(rCEvt); return; } // #i7560# FormulaMode check is below scrolling - scrolling is allowed during formula input - sal_Bool bDisable = pScMod->IsFormulaMode() || + bool bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode(pViewData->GetSfxDocShell()); if (bDisable) return; if ( nCmd == COMMAND_CONTEXTMENU && !SC_MOD()->GetIsWaterCan() ) { - sal_Bool bMouse = rCEvt.IsMouseEvent(); + bool bMouse = rCEvt.IsMouseEvent(); if ( bMouse && nMouseStatus == SC_GM_IGNORE ) return; @@ -3057,7 +3057,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt ) // non-edit menu by keyboard -> use lower right of cell cursor position ScDocument* aDoc = pViewData->GetDocument(); SCTAB nTabNo = pViewData->GetTabNo(); - sal_Bool bLayoutIsRTL = aDoc->IsLayoutRTL(nTabNo); + bool bLayoutIsRTL = aDoc->IsLayoutRTL(nTabNo); SCCOL nCurX = pViewData->GetCurX(); SCROW nCurY = pViewData->GetCurY(); @@ -3207,24 +3207,24 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, // look for existing selection - sal_Bool bHitSelected = false; + bool bHitSelected = false; if ( pDrawView && pDrawView->IsMarkedObjHit( aLogicPos ) ) { // clicked on selected object -> don't change anything - bHitSelected = sal_True; + bHitSelected = true; } else if ( pViewData->GetMarkData().IsCellMarked(nCellX, nCellY) ) { // clicked on selected cell -> don't change anything - bHitSelected = sal_True; + bHitSelected = true; } // select drawing object or move cell cursor if ( !bHitSelected ) { - sal_Bool bWasDraw = ( pDrawView && pDrawView->AreObjectsMarked() ); - sal_Bool bHitDraw = false; + bool bWasDraw = ( pDrawView && pDrawView->AreObjectsMarked() ); + bool bHitDraw = false; if ( pDrawView ) { pDrawView->UnmarkAllObj(); @@ -3296,7 +3296,7 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt) } // query for existing note marker before calling ViewShell's keyboard handling // which may remove the marker - sal_Bool bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() ); + bool bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() ); ScTabViewShell* pViewSh = pViewData->GetViewShell(); if (pViewData->GetDocShell()->GetProgress()) @@ -3376,7 +3376,7 @@ void ScGridWindow::StopMarking() void ScGridWindow::UpdateInputContext() { - sal_Bool bReadOnly = pViewData->GetDocShell()->IsReadOnly(); + bool bReadOnly = pViewData->GetDocShell()->IsReadOnly(); sal_uLong nOptions = bReadOnly ? 0 : ( INPUTCONTEXT_TEXT | INPUTCONTEXT_EXTTEXTINPUT ); // when font from InputContext is used, @@ -3424,12 +3424,12 @@ bool ScGridWindow::DropScroll( const Point& rMousePos ) return false; } -static sal_Bool lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange) +static bool lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange) { // Testet, ob bei eingeschalteten RedLining, // bei einem Drop ein Scenario betroffen ist. - sal_Bool bReturn = false; + bool bReturn = false; SCTAB nTab = aDragRange.aStart.Tab(); SCTAB nTabCount = pDoc->GetTableCount(); @@ -3437,7 +3437,7 @@ static sal_Bool lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& { if( pDoc->IsScenario(nTab) && pDoc->HasScenarioRange(nTab, aDragRange)) { - bReturn = sal_True; + bReturn = true; } else { @@ -3445,7 +3445,7 @@ static sal_Bool lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& { if(pDoc->HasScenarioRange(i, aDragRange)) { - bReturn = sal_True; + bReturn = true; break; } } @@ -3524,7 +3524,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) if ( rData.pCellTransfer->GetDragSourceFlags() & SC_DROP_TABLE ) // whole sheet? { - sal_Bool bOk = pThisDoc->IsDocEditable(); + bool bOk = pThisDoc->IsDocEditable(); return bOk ? rEvt.mnAction : 0; // don't draw selection frame } @@ -3781,7 +3781,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) case DND_ACTION_MOVE: case DND_ACTION_COPYMOVE: { - sal_Bool bMove = ( nMyAction == DND_ACTION_MOVE ); + bool bMove = ( nMyAction == DND_ACTION_MOVE ); if ( IsDropFormatSupported( SOT_FORMATSTR_ID_EMBED_SOURCE ) || IsDropFormatSupported( SOT_FORMATSTR_ID_LINK_SOURCE ) || IsDropFormatSupported( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE ) || @@ -3886,7 +3886,7 @@ static sal_uLong lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransf { // If it's a Writer object, insert RTF instead of OLE - sal_Bool bDoRtf = false; + bool bDoRtf = false; SotStorageStreamRef xStm; TransferableObjectDescriptor aObjDesc; if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) && @@ -4000,8 +4000,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos SCTAB nThisTab = pViewData->GetTabNo(); sal_uInt16 nFlags = pTransObj->GetDragSourceFlags(); - sal_Bool bIsNavi = ( nFlags & SC_DROP_NAVIGATOR ) != 0; - sal_Bool bIsMove = ( nDndAction == DND_ACTION_MOVE && !bIsNavi ); + bool bIsNavi = ( nFlags & SC_DROP_NAVIGATOR ) != 0; + bool bIsMove = ( nDndAction == DND_ACTION_MOVE && !bIsNavi ); // workaround for wrong nDndAction on Windows when pressing solely // the Alt key during drag and drop; @@ -4011,7 +4011,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos bIsMove = ( nDndAction & DND_ACTION_MOVE && !bIsNavi ); } - sal_Bool bIsLink = ( nDndAction == DND_ACTION_LINK ); + bool bIsLink = ( nDndAction == DND_ACTION_LINK ); ScRange aSource = pTransObj->GetRange(); @@ -4052,7 +4052,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos bFiltered = ScViewUtil::HasFiltered( aDest, pThisDoc); } - sal_Bool bDone = false; + bool bDone = false; if (!bFiltered && pSourceDoc == pThisDoc) { @@ -4063,7 +4063,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos SCTAB nSrcTab = aSource.aStart.Tab(); pViewData->GetDocShell()->MoveTable( nSrcTab, nThisTab, !bIsMove, true ); // with Undo pView->SetTabNo( nThisTab, true ); - bDone = sal_True; + bDone = true; } } else // move/copy block @@ -4077,7 +4077,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos sal_uInt16 nId = bIsMove ? SID_CHART_SOURCE : SID_CHART_ADDSOURCE; pViewData->GetDispatcher().Execute( nId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aRangeItem, &aNameItem, (void*) NULL ); - bDone = sal_True; + bDone = true; } else if ( pThisDoc->GetDPAtCursor( nDestPosX, nDestPosY, nThisTab ) ) { @@ -4087,7 +4087,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos if ( aDestPos != aSource.aStart ) bDone = pViewData->GetView()->DataPilotMove( aSource, aDestPos ); else - bDone = sal_True; // same position: nothing + bDone = true; // same position: nothing } else if ( nDestPosX != aSource.aStart.Col() || nDestPosY != aSource.aStart.Row() || nSourceTab != nThisTab ) @@ -4098,7 +4098,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos SCsCOL nCorrectCursorPosCol = 0; SCsROW nCorrectCursorPosRow = 0; - bDone = sal_True; + bDone = true; if ( meDragInsertMode != INS_NONE ) { // call with bApi = sal_True to avoid error messages in drop handler @@ -4185,7 +4185,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos } else - bDone = sal_True; // nothing to do + bDone = true; // nothing to do } if (bDone) @@ -4222,7 +4222,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos } pView->ImportTables( pSrcShell,static_cast<SCTAB>(nTabs.size()), &nTabs[0], bIsLink, nThisTab ); - bDone = sal_True; + bDone = true; } } else if ( bIsLink ) @@ -4237,7 +4237,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos OUString aUndo = ScGlobal::GetRscString( STR_UNDO_COPY ); pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo ); - bDone = sal_True; + bDone = true; if ( meDragInsertMode != INS_NONE ) { // call with bApi = sal_True to avoid error messages in drop handler @@ -4297,7 +4297,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos OUString aUndo = ScGlobal::GetRscString( bIsMove ? STR_UNDO_MOVE : STR_UNDO_COPY ); pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo ); - bDone = sal_True; + bDone = true; if ( meDragInsertMode != INS_NONE ) { // call with bApi = sal_True to avoid error messages in drop handler @@ -4382,14 +4382,14 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) } Point aLogicPos = PixelToLogic(aPos); - sal_Bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK ); + bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK ); if (!bIsLink && rData.pDrawTransfer) { sal_uInt16 nFlags = rData.pDrawTransfer->GetDragSourceFlags(); - sal_Bool bIsNavi = ( nFlags & SC_DROP_NAVIGATOR ) != 0; - sal_Bool bIsMove = ( rEvt.mnAction == DND_ACTION_MOVE && !bIsNavi ); + bool bIsNavi = ( nFlags & SC_DROP_NAVIGATOR ) != 0; + bool bIsMove = ( rEvt.mnAction == DND_ACTION_MOVE && !bIsNavi ); bPasteIsMove = bIsMove; @@ -4430,7 +4430,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) return rEvt.mnAction; } - sal_Bool bDone = false; + bool bDone = false; sal_uLong nFormatId = bIsLink ? lcl_GetDropLinkId( rEvt.maDropEvent.Transferable ) : @@ -4533,10 +4533,10 @@ void ScGridWindow::UpdateEditViewPos() // hide EditView? - sal_Bool bHide = ( nEndCol<pViewData->GetPosX(eHWhich) || nEndRow<pViewData->GetPosY(eVWhich) ); + bool bHide = ( nEndCol<pViewData->GetPosX(eHWhich) || nEndRow<pViewData->GetPosY(eVWhich) ); if ( SC_MOD()->IsFormulaMode() ) if ( pViewData->GetTabNo() != pViewData->GetRefTabNo() ) - bHide = sal_True; + bHide = true; if (bHide) { @@ -4618,7 +4618,7 @@ void ScGridWindow::UpdateFormulas() Point aScrPos = pViewData->GetScrPos( nX1, nY1, eWhich ); long nMirrorWidth = GetSizePixel().Width(); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); if ( bLayoutRTL ) { long nEndPixel = pViewData->GetScrPos( nX2+1, nPosY, eWhich ).X(); @@ -4752,7 +4752,7 @@ bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner, { ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); long nLayoutSign = bLayoutRTL ? -1 : 1; SCsCOL nPosX; @@ -4853,19 +4853,19 @@ static void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, sal_uI SCCOL nCol2 = rRange.aEnd.Col(); SCROW nRow2 = rRange.aEnd.Row(); SCTAB nTab2 = rRange.aEnd.Tab(); - sal_Bool bHiddenEdge = false; + bool bHiddenEdge = false; SCROW nTmp; ScDocument* pDoc = pDocSh->GetDocument(); while ( nCol1 > 0 && pDoc->ColHidden(nCol1, nTab1) ) { --nCol1; - bHiddenEdge = sal_True; + bHiddenEdge = true; } while ( nCol2 < MAXCOL && pDoc->ColHidden(nCol2, nTab1) ) { ++nCol2; - bHiddenEdge = sal_True; + bHiddenEdge = true; } nTmp = pDoc->FirstVisibleRow(0, nRow1, nTab1); if (!ValidRow(nTmp)) @@ -4873,7 +4873,7 @@ static void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, sal_uI if (nTmp < nRow1) { nRow1 = nTmp; - bHiddenEdge = sal_True; + bHiddenEdge = true; } nTmp = pDoc->FirstVisibleRow(nRow2, MAXROW, nTab1); if (!ValidRow(nTmp)) @@ -4881,7 +4881,7 @@ static void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, sal_uI if (nTmp > nRow2) { nRow2 = nTmp; - bHiddenEdge = sal_True; + bHiddenEdge = true; } if ( nCol2 > nCol1 + 1 && nRow2 > nRow1 + 1 && !bHiddenEdge ) @@ -4996,7 +4996,7 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, bool bUp ) // Scrolling - sal_Bool bTimer = false; + bool bTimer = false; Point aPos = rMEvt.GetPosPixel(); SCsCOL nDx = 0; SCsROW nDy = 0; @@ -5011,7 +5011,7 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, bool bUp ) { if ( nDx != 0) pViewData->GetView()->ScrollX( nDx, WhichH(eWhich) ); if ( nDy != 0 ) pViewData->GetView()->ScrollY( nDy, WhichV(eWhich) ); - bTimer = sal_True; + bTimer = true; } // Umschalten bei Fixierung (damit Scrolling funktioniert) @@ -5196,7 +5196,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, if (pPattern->GetCellOrientation() != SVX_ORIENTATION_STANDARD) return false; - sal_Bool bBreak = ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue() || + bool bBreak = ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue() || ((SvxCellHorJustify)((const SvxHorJustifyItem&)pPattern-> GetItem( ATTR_HOR_JUSTIFY )).GetValue() == SVX_HOR_JUSTIFY_BLOCK); SvxCellHorJustify eHorJust = (SvxCellHorJustify)((SvxHorJustifyItem&)pPattern-> @@ -5276,7 +5276,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, EditView aTempView(pEngine.get(), this); aTempView.SetOutputArea( aLogicEdit ); - sal_Bool bRet = false; + bool bRet = false; MapMode aOld = GetMapMode(); SetMapMode(aEditMode); // kein return mehr @@ -5296,7 +5296,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, if (pTarget) *pTarget = pURLField->GetTargetFrame(); } - bRet = sal_True; + bRet = true; } } @@ -5758,11 +5758,11 @@ void ScGridWindow::UpdateCursorOverlay() ScDocument* pDoc = pViewData->GetDocument(); const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab); const ScMergeFlagAttr& rMergeFlag = (const ScMergeFlagAttr&) pPattern->GetItem(ATTR_MERGE_FLAG); - sal_Bool bOverlapped = rMergeFlag.IsOverlapped(); + bool bOverlapped = rMergeFlag.IsOverlapped(); // left or above of the screen? - sal_Bool bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) ); + bool bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) ); if (!bVis) { SCCOL nEndX = nX; @@ -5778,11 +5778,11 @@ void ScGridWindow::UpdateCursorOverlay() if ( bVis && !bOverlapped && !pViewData->HasEditView(eWhich) && pViewData->IsActive() ) { Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, true ); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); // completely right of/below the screen? // (test with logical start position in aScrPos) - sal_Bool bMaybeVisible; + bool bMaybeVisible; if ( bLayoutRTL ) bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 ); else @@ -5935,7 +5935,7 @@ void ScGridWindow::UpdateAutoFillOverlay() SCTAB nTab = pViewData->GetTabNo(); ScDocument* pDoc = pViewData->GetDocument(); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, true ); long nSizeXPix; @@ -6027,7 +6027,7 @@ void ScGridWindow::UpdateDragRectOverlay() double nPPTY = pViewData->GetPPTY(); SCCOLROW i; - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); long nLayoutSign = bLayoutRTL ? -1 : 1; if (ValidCol(nX2) && nX2>=nX1) diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index a07f268c2f69..6ea8c8906977 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -117,7 +117,7 @@ bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& Point aDiffPix = rMEvt.GetPosPixel(); aDiffPix -= aScrPos; - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); if ( bLayoutRTL ) aDiffPix.X() = -aDiffPix.X(); @@ -247,7 +247,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) // scroll window if at edges //! move this to separate method - sal_Bool bTimer = false; + bool bTimer = false; Point aPixel = rMEvt.GetPosPixel(); SCsCOL nDx = 0; @@ -270,7 +270,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) if ( nDy != 0 ) pViewData->GetView()->ScrollY( nDy, WhichV(eWhich) ); - bTimer = sal_True; + bTimer = true; } SCsCOL nPosX; @@ -285,7 +285,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) Rectangle aPosRect; sal_uInt16 nOrient; long nDimPos; - sal_Bool bHasRange = pDragDPObj->GetHeaderDrag( aPos, bMouseLeft, bMouseTop, nDPField, + bool bHasRange = pDragDPObj->GetHeaderDrag( aPos, bMouseLeft, bMouseTop, nDPField, aPosRect, nOrient, nDimPos ); UpdateDragRect( bHasRange && bMove, aPosRect ); @@ -352,7 +352,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) bool ScGridWindow::DPTestFieldPopupArrow( const MouseEvent& rMEvt, const ScAddress& rPos, const ScAddress& rDimPos, ScDPObject* pDPObj) { - sal_Bool bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); + bool bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); // Get the geometry of the cell. Point aScrPos = pViewData->GetScrPos(rPos.Col(), rPos.Row(), eWhich); @@ -660,8 +660,8 @@ sal_uInt16 ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, ScPageBreakData* pPageData = pViewData->GetView()->GetPageBreakData(); if ( pPageData ) { - sal_Bool bHori = false; - sal_Bool bVert = false; + bool bHori = false; + bool bVert = false; SCCOL nHitX = 0; SCROW nHitY = 0; @@ -676,22 +676,22 @@ sal_uInt16 ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, // Horizontal mehr Toleranz als vertikal, weil mehr Platz ist if ( nMouseX <= aTL.X() + 4 ) { - bHori = sal_True; + bHori = true; nHitX = nPosX; } else if ( nMouseX >= aBR.X() - 6 ) { - bHori = sal_True; + bHori = true; nHitX = nPosX+1; // linker Rand der naechsten Zelle } if ( nMouseY <= aTL.Y() + 2 ) { - bVert = sal_True; + bVert = true; nHitY = nPosY; } else if ( nMouseY >= aBR.Y() - 4 ) { - bVert = sal_True; + bVert = true; nHitY = nPosY+1; // oberer Rand der naechsten Zelle } @@ -702,12 +702,12 @@ sal_uInt16 ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, { ScPrintRangeData& rData = pPageData->GetData(nPos); ScRange aRange = rData.GetPrintRange(); - sal_Bool bLHit = ( bHori && nHitX == aRange.aStart.Col() ); - sal_Bool bRHit = ( bHori && nHitX == aRange.aEnd.Col() + 1 ); - sal_Bool bTHit = ( bVert && nHitY == aRange.aStart.Row() ); - sal_Bool bBHit = ( bVert && nHitY == aRange.aEnd.Row() + 1 ); - sal_Bool bInsideH = ( nPosX >= aRange.aStart.Col() && nPosX <= aRange.aEnd.Col() ); - sal_Bool bInsideV = ( nPosY >= aRange.aStart.Row() && nPosY <= aRange.aEnd.Row() ); + bool bLHit = ( bHori && nHitX == aRange.aStart.Col() ); + bool bRHit = ( bHori && nHitX == aRange.aEnd.Col() + 1 ); + bool bTHit = ( bVert && nHitY == aRange.aStart.Row() ); + bool bBHit = ( bVert && nHitY == aRange.aEnd.Row() + 1 ); + bool bInsideH = ( nPosX >= aRange.aStart.Col() && nPosX <= aRange.aEnd.Col() ); + bool bInsideV = ( nPosY >= aRange.aStart.Row() && nPosY <= aRange.aEnd.Row() ); if ( bLHit ) { @@ -788,7 +788,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) // Scrolling - sal_Bool bTimer = false; + bool bTimer = false; Point aPos = rMEvt.GetPosPixel(); SCsCOL nDx = 0; SCsROW nDy = 0; @@ -809,7 +809,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) if ( nDx != 0 ) pViewData->GetView()->ScrollX( nDx, WhichH(eWhich) ); if ( nDy != 0 ) pViewData->GetView()->ScrollY( nDy, WhichV(eWhich) ); - bTimer = sal_True; + bTimer = true; } // Umschalten bei Fixierung (damit Scrolling funktioniert) @@ -846,9 +846,9 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) if ( !bLeft ) ++nPosX; if ( !bTop ) ++nPosY; - sal_Bool bBreak = ( nPagebreakMouse == SC_PD_BREAK_H || nPagebreakMouse == SC_PD_BREAK_V ); - sal_Bool bHide = false; - sal_Bool bToEnd = false; + bool bBreak = ( nPagebreakMouse == SC_PD_BREAK_H || nPagebreakMouse == SC_PD_BREAK_V ); + bool bHide = false; + bool bToEnd = false; ScRange aDrawRange = aPagebreakSource; if ( bBreak ) { @@ -862,7 +862,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) aDrawRange.aEnd.SetCol( nPosX - 1 ); } else - bHide = sal_True; + bHide = true; } else { @@ -874,7 +874,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) aDrawRange.aEnd.SetRow( nPosY - 1 ); } else - bHide = sal_True; + bHide = true; } } else @@ -888,18 +888,18 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) if ( nPosX > 0 ) aDrawRange.aEnd.SetCol( nPosX-1 ); else - bHide = sal_True; + bHide = true; } if ( nPagebreakMouse & SC_PD_RANGE_B ) { if ( nPosY > 0 ) aDrawRange.aEnd.SetRow( nPosY-1 ); else - bHide = sal_True; + bHide = true; } if ( aDrawRange.aStart.Col() > aDrawRange.aEnd.Col() || aDrawRange.aStart.Row() > aDrawRange.aEnd.Row() ) - bHide = sal_True; + bHide = true; } if ( !bPagebreakDrawn || bUp || aDrawRange != aPagebreakDrag ) @@ -928,11 +928,11 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) ScDocShell* pDocSh = pViewData->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); - sal_Bool bUndo (pDoc->IsUndoEnabled()); + bool bUndo (pDoc->IsUndoEnabled()); if ( bBreak ) { - sal_Bool bColumn = ( nPagebreakMouse == SC_PD_BREAK_H ); + bool bColumn = ( nPagebreakMouse == SC_PD_BREAK_H ); SCCOLROW nNew = bColumn ? static_cast<SCCOLROW>(nPosX) : static_cast<SCCOLROW>(nPosY); if ( nNew != nPagebreakBreak ) { @@ -942,7 +942,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo ); } - sal_Bool bGrow = !bHide && nNew > nPagebreakBreak; + bool bGrow = !bHide && nNew > nPagebreakBreak; if ( bColumn ) { if (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakBreak), nTab) & BREAK_MANUAL) diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 5a7f6662fc40..3dd7df2ca2b6 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -242,7 +242,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce ) { ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); - sal_Bool bNegativePage = pDoc->IsNegativePage( nTab ); + bool bNegativePage = pDoc->IsNegativePage( nTab ); MapMode aDrawMode = pViewData->GetLogicMode(); @@ -301,7 +301,7 @@ void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddres const ScViewOptions& rOpts = pViewData->GetOptions(); if(rOpts.GetOption( VOPT_ANCHOR )) { - sal_Bool bNegativePage = pViewData->GetDocument()->IsNegativePage( pViewData->GetTabNo() ); + bool bNegativePage = pViewData->GetDocument()->IsNegativePage( pViewData->GetTabNo() ); Point aPos = pViewData->GetScrPos( rAddress.Col(), rAddress.Row(), eWhich, true ); aPos = PixelToLogic(aPos); rHdl.AddHdl(new SdrHdl(aPos, bNegativePage ? HDL_ANCHOR_TR : HDL_ANCHOR)); @@ -339,7 +339,7 @@ void ScGridWindow::UpdateStatusPosSize() // position and size of selected object(s) if something is selected, // mouse position otherwise - sal_Bool bActionItem = false; + bool bActionItem = false; if ( pDrView->IsAction() ) // action rectangle { Rectangle aRect; @@ -354,7 +354,7 @@ void ScGridWindow::UpdateStatusPosSize() aSet.Put( SfxPointItem( SID_ATTR_POSITION, aRect.TopLeft() ) ); aSet.Put( SvxSizeItem( SID_ATTR_SIZE, Size( aRect.Right() - aRect.Left(), aRect.Bottom() - aRect.Top() ) ) ); - bActionItem = sal_True; + bActionItem = true; } } if ( !bActionItem ) diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index b965c573a0fe..5405b898023e 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -76,9 +76,9 @@ static void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) } static void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, - const OUString& rTitle, const Color& rColor, sal_Bool bTextBelow, + const OUString& rTitle, const Color& rColor, bool bTextBelow, double nPPTX, double nPPTY, const Fraction& rZoomY, - ScDocument* pDoc, ScViewData* pButtonViewData, sal_Bool bLayoutRTL ) + ScDocument* pDoc, ScViewData* pButtonViewData, bool bLayoutRTL ) { // pButtonViewData wird nur benutzt, um die Button-Groesse zu setzen, // darf ansonsten NULL sein! @@ -143,14 +143,14 @@ static void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, long nTextStart = bLayoutRTL ? aInner.Right() - aTextSize.Width() + 1 : aInner.Left(); - sal_Bool bWasClip = false; + bool bWasClip = false; Region aOldClip; - sal_Bool bClip = ( aTextSize.Width() > aOuter.Right() - nBWidth - aInner.Left() ); + bool bClip = ( aTextSize.Width() > aOuter.Right() - nBWidth - aInner.Left() ); if ( bClip ) { if (pDev->IsClipRegion()) { - bWasClip = sal_True; + bWasClip = true; aOldClip = pDev->GetActiveClipRegion(); } long nClipStartX = bLayoutRTL ? aOuter.Left() + nBWidth : aInner.Left(); @@ -199,7 +199,7 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S ScRangeListRef xRanges = new ScRangeList; aMarks.FillRangeListWithMarks( xRanges, false ); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); long nLayoutSign = bLayoutRTL ? -1 : 1; for (size_t j = 0, n = xRanges->size(); j < n; ++j) @@ -223,7 +223,7 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S aEndPos.X() -= nLayoutSign; aEndPos.Y() -= 1; - sal_Bool bTextBelow = ( aRange.aStart.Row() == 0 ); + bool bTextBelow = ( aRange.aStart.Row() == 0 ); OUString aCurrent; Color aColor( COL_LIGHTGRAY ); @@ -382,7 +382,7 @@ void ScGridWindow::Paint( const Rectangle& rRect ) void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode ) { ScModule* pScMod = SC_MOD(); - sal_Bool bTextWysiwyg = pScMod->GetInputOptions().GetTextWysiwyg(); + bool bTextWysiwyg = pScMod->GetInputOptions().GetTextWysiwyg(); if (pViewData->IsMinimized()) return; @@ -423,7 +423,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod Point aScrPos = pViewData->GetScrPos( nX1, nY1, eWhich ); long nMirrorWidth = GetSizePixel().Width(); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); long nLayoutSign = bLayoutRTL ? -1 : 1; if ( bLayoutRTL ) { @@ -440,7 +440,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod SCCOL nCurEndX = nCurX; SCROW nCurEndY = nCurY; pDoc->ExtendMerge( nCurX, nCurY, nCurEndX, nCurEndY, nTab ); - sal_Bool bCurVis = nCursorHideCount==0 && + bool bCurVis = nCursorHideCount==0 && ( nCurEndX+1 >= nX1 && nCurX <= nX2+1 && nCurEndY+1 >= nY1 && nCurY <= nY2+1 ); // AutoFill-Anfasser @@ -460,8 +460,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod double nPPTY = pViewData->GetPPTY(); const ScViewOptions& rOpts = pViewData->GetOptions(); - sal_Bool bFormulaMode = rOpts.GetOption( VOPT_FORMULAS ); - sal_Bool bMarkClipped = rOpts.GetOption( VOPT_CLIPMARKS ); + bool bFormulaMode = rOpts.GetOption( VOPT_FORMULAS ); + bool bMarkClipped = rOpts.GetOption( VOPT_CLIPMARKS ); // Datenblock @@ -480,7 +480,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod aOutputData.SetSpellCheckContext(mpSpellCheckCxt.get()); boost::scoped_ptr< VirtualDevice > xFmtVirtDev; - sal_Bool bLogicText = bTextWysiwyg; // call DrawStrings in logic MapMode? + bool bLogicText = bTextWysiwyg; // call DrawStrings in logic MapMode? if ( bTextWysiwyg ) { @@ -499,7 +499,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod xFmtVirtDev->SetMapMode( MAP_100TH_MM ); aOutputData.SetFmtDevice( xFmtVirtDev.get() ); - bLogicText = sal_True; // use logic MapMode + bLogicText = true; // use logic MapMode } const svtools::ColorConfig& rColorCfg = pScMod->GetColorConfig(); @@ -522,10 +522,10 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod aOutputData.SetEditObject( GetEditObject() ); aOutputData.SetViewShell( pViewData->GetViewShell() ); - sal_Bool bGrid = rOpts.GetOption( VOPT_GRID ) && pViewData->GetShowGrid(); - sal_Bool bGridFirst = !rOpts.GetOption( VOPT_GRID_ONTOP ); + bool bGrid = rOpts.GetOption( VOPT_GRID ) && pViewData->GetShowGrid(); + bool bGridFirst = !rOpts.GetOption( VOPT_GRID_ONTOP ); - sal_Bool bPage = rOpts.GetOption( VOPT_PAGEBREAKS ); + bool bPage = rOpts.GetOption( VOPT_PAGEBREAKS ); if ( eMode == SC_UPDATE_CHANGED ) { @@ -533,7 +533,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod aOutputData.SetSingleGrid(true); } - sal_Bool bPageMode = pViewData->IsPagebreakMode(); + bool bPageMode = pViewData->IsPagebreakMode(); if (bPageMode) // nach FindChanged { // SetPagebreakMode initialisiert auch bPrinted Flags @@ -541,7 +541,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod } EditView* pEditView = NULL; - sal_Bool bEditMode = pViewData->HasEditView(eWhich); + bool bEditMode = pViewData->HasEditView(eWhich); if ( bEditMode && pViewData->GetRefTabNo() == nTab ) { SCCOL nEditCol; @@ -723,15 +723,15 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod SCTAB nTabCount = pDoc->GetTableCount(); const std::vector<ScHighlightEntry> &rHigh = pViewData->GetView()->GetHighlightRanges(); - sal_Bool bHasScenario = ( nTab+1<nTabCount && pDoc->IsScenario(nTab+1) && !pDoc->IsScenario(nTab) ); - sal_Bool bHasChange = ( pDoc->GetChangeTrack() != NULL ); + bool bHasScenario = ( nTab+1<nTabCount && pDoc->IsScenario(nTab+1) && !pDoc->IsScenario(nTab) ); + bool bHasChange = ( pDoc->GetChangeTrack() != NULL ); if ( bHasChange || bHasScenario || !rHigh.empty() ) { //! SetChangedClip() mit DrawMarks() zusammenfassen?? (anderer MapMode!) - sal_Bool bAny = sal_True; + bool bAny = true; if (eMode == SC_UPDATE_CHANGED) bAny = aOutputData.SetChangedClip(); if (bAny) @@ -1116,7 +1116,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, Out RowInfo* pRowInfo = rTabInfo.mpRowInfo; sal_uInt16 nArrCount = rTabInfo.mnArrCount; - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); Point aOldPos = aComboButton.GetPosPixel(); // Zustand fuer MouseDown/Up Size aOldSize = aComboButton.GetSizePixel(); // merken @@ -1140,7 +1140,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, Out if (!pQueryParam) pQueryParam = new ScQueryParam; - sal_Bool bNewData = sal_True; + bool bNewData = true; if (pDBData) { SCCOL nStartCol; @@ -1167,8 +1167,8 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, Out // pQueryParam kann nur MAXQUERY Eintraege enthalten - sal_Bool bSimpleQuery = sal_True; - sal_Bool bColumnFound = false; + bool bSimpleQuery = true; + bool bColumnFound = false; if (!pQueryParam->bInplace) bSimpleQuery = false; SCSIZE nCount = pQueryParam->GetEntryCount(); @@ -1179,7 +1179,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, Out // (auch bei ">1" soll der Spaltenkopf blau werden) if (pQueryParam->GetEntry(nQuery).nField == nCol) - bColumnFound = sal_True; + bColumnFound = true; if (nQuery > 0) if (pQueryParam->GetEntry(nQuery).eConnect != SC_AND) bSimpleQuery = false; @@ -1257,7 +1257,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos ) { ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); long nLayoutSign = bLayoutRTL ? -1 : 1; ScDDComboBoxButton aButton( this ); // for optimal size @@ -1281,7 +1281,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos ) nNextCol = nCol + pMerge->GetColMerge(); // next cell after the merged area while ( nNextCol <= MAXCOL && pDoc->ColHidden(nNextCol, nTab) ) ++nNextCol; - sal_Bool bNextCell = ( nNextCol <= MAXCOL ); + bool bNextCell = ( nNextCol <= MAXCOL ); if ( bNextCell ) nAvailable = ScViewData::ToPixel( pDoc->GetColWidth( nNextCol, nTab ), pViewData->GetPPTX() ); @@ -1348,7 +1348,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); long nLayoutSign = bLayoutRTL ? -1 : 1; if ( !aMultiMark.IsMultiMarked() ) return; @@ -1362,7 +1362,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) PutInOrder( nX1, nX2 ); PutInOrder( nY1, nY2 ); - sal_Bool bTestMerge = sal_True; + bool bTestMerge = true; bool bRepeat = true; SCCOL nTestX2 = nX2; @@ -1397,30 +1397,30 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) Point aScrPos = pViewData->GetScrPos( nX1, nY1, eWhich ); long nScrY = aScrPos.Y(); - sal_Bool bWasHidden = false; + bool bWasHidden = false; for (SCROW nY=nY1; nY<=nY2; nY++) { - sal_Bool bFirstRow = ( nY == nPosY ); // first visible row? - sal_Bool bDoHidden = false; // versteckte nachholen ? + bool bFirstRow = ( nY == nPosY ); // first visible row? + bool bDoHidden = false; // versteckte nachholen ? sal_uInt16 nHeightTwips = pDoc->GetRowHeight( nY,nTab ); - sal_Bool bDoRow = ( nHeightTwips != 0 ); + bool bDoRow = ( nHeightTwips != 0 ); if (bDoRow) { if (bTestMerge) if (bWasHidden) // auf versteckte zusammengefasste testen { - bDoHidden = sal_True; - bDoRow = sal_True; + bDoHidden = true; + bDoRow = true; } bWasHidden = false; } else { - bWasHidden = sal_True; + bWasHidden = true; if (bTestMerge) if (nY==nY2) - bDoRow = sal_True; // letzte Zeile aus Block + bDoRow = true; // letzte Zeile aus Block } if ( bDoRow ) diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index fba79cc17e2a..404ca59652d8 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -247,10 +247,10 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) OUString aCtrlClickHlinkStr = ScGlobal::GetRscString( STR_CTRLCLICKHYPERLINK ); //Global string STR_CLICKHYPERLINK i.e, "click to open hyperlink" OUString aClickHlinkStr = ScGlobal::GetRscString( STR_CLICKHYPERLINK ); - sal_Bool bDone = false; - sal_Bool bHelpEnabled = ( rHEvt.GetMode() & ( HELPMODE_BALLOON | HELPMODE_QUICK ) ) != 0; + bool bDone = false; + bool bHelpEnabled = ( rHEvt.GetMode() & ( HELPMODE_BALLOON | HELPMODE_QUICK ) ) != 0; SdrView* pDrView = pViewData->GetScDrawView(); - sal_Bool bDrawTextEdit = false; + bool bDrawTextEdit = false; if (pDrView) bDrawTextEdit = pDrView->IsTextEdit(); // notes or change tracking @@ -264,7 +264,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) if ( ShowNoteMarker( nPosX, nPosY, false ) ) { Window::RequestHelp( rHEvt ); // alte Tip/Balloon ausschalten - bDone = sal_True; + bDone = true; } } @@ -406,7 +406,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) else if ( rHEvt.GetMode() & HELPMODE_QUICK ) Help::ShowQuickHelp(this,aScreenRect, aHelpText); - bDone = sal_True; + bDone = true; } } @@ -424,7 +424,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) if ( nMouseStatus == SC_GM_TABDOWN && pViewData->GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() ) - bDone = sal_True; + bDone = true; if (!bDone) Window::RequestHelp( rHEvt ); diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index 432c2382fbfe..01f960010ac2 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -137,7 +137,7 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) } else { - sal_Bool bDone = false; + bool bDone = false; if ( aJustified.Top() == aLineRect.Top() && aJustified.Bottom() == aLineRect.Bottom() ) { @@ -145,12 +145,12 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) if ( aJustified.Left() == aLineRect.Right() + 1 ) { aLineRect.Right() = aJustified.Right(); - bDone = sal_True; + bDone = true; } else if ( aJustified.Right() + 1 == aLineRect.Left() ) // for RTL layout { aLineRect.Left() = aJustified.Left(); - bDone = sal_True; + bDone = true; } } if (!bDone) diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index d65234babe83..162271b7d738 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -79,7 +79,7 @@ ScOutlineWindow::~ScOutlineWindow() void ScOutlineWindow::SetHeaderSize( long nNewSize ) { - sal_Bool bLayoutRTL = GetDoc().IsLayoutRTL( GetTab() ); + bool bLayoutRTL = GetDoc().IsLayoutRTL( GetTab() ); mbMirrorEntries = bLayoutRTL && mbHoriz; mbMirrorLevels = bLayoutRTL && !mbHoriz; diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index 67ce197b3eb2..f949c9dd90c1 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -223,7 +223,7 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer) // #109985# void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) { - sal_Bool bHad = false; + bool bHad = false; SCSIZE nArrY; for (nArrY=1; nArrY+1<nArrCount; nArrY++) { @@ -233,7 +233,7 @@ void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) { if (!bHad) { - bHad = sal_True; + bHad = true; } } else if (bHad) diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index a094cffe620b..ee9fede3da41 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -137,7 +137,7 @@ void ScPivotShell::GetState( SfxItemSet& rSet ) { ScDocShell* pDocSh = pViewShell->GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); - sal_Bool bDisable = pDocSh->IsReadOnly() || pDoc->GetChangeTrack(); + bool bDisable = pDocSh->IsReadOnly() || pDoc->GetChangeTrack(); SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index e1a83495b307..64af102876be 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -420,7 +420,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) long nTotalPages = pPreview->GetTotalPages(); long nPageNo = 0; long nPerPageLength = 0; - sal_Bool bIsDivide = sal_True; + bool bIsDivide = true; if( nTotalPages ) nPerPageLength = nMaxRange / nTotalPages; @@ -435,7 +435,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) } } - sal_Bool bHoriz = ( pScroll == pHorScroll ); + bool bHoriz = ( pScroll == pHorScroll ); if( bHoriz ) pPreview->SetXOffset( nPos ); @@ -464,7 +464,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) } else if( nDelta > 0 ) { - sal_Bool bAllTested = pPreview->AllTested(); + bool bAllTested = pPreview->AllTested(); if ( nTotalPages && ( nPageNo < nTotalPages || !bAllTested ) ) pPreview->SetPageNo( nPageNo ); @@ -597,7 +597,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) case SID_NEXT_TABLE: // Accelerator case SID_PREVIEW_NEXT: { - sal_Bool bAllTested = pPreview->AllTested(); + bool bAllTested = pPreview->AllTested(); long nPage = pPreview->GetPageNo(); long nTotal = pPreview->GetTotalPages(); if (nTotal && (nPage+1 < nTotal || !bAllTested)) @@ -629,7 +629,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) case FID_SCALE: { sal_uInt16 nZoom = 100; - sal_Bool bCancel = false; + bool bCancel = false; eZoom = SVX_ZOOM_PERCENT; @@ -713,7 +713,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) break; case SID_PREVIEW_MARGIN: { - sal_Bool bMargin = pPreview->GetPageMargins(); + bool bMargin = pPreview->GetPageMargins(); pPreview->SetPageMargins( !bMargin ); pPreview->Invalidate(); rReq.Done(); @@ -791,7 +791,7 @@ void ScPreviewShell::GetState( SfxItemSet& rSet ) long nPage = pPreview->GetPageNo(); long nTotal = pPreview->GetTotalPages(); sal_uInt16 nZoom = pPreview->GetZoom(); - sal_Bool bAllTested = pPreview->AllTested(); + bool bAllTested = pPreview->AllTested(); SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); @@ -913,7 +913,7 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData ) rData.aShortDocName = rData.aLongDocName = rData.aTitle; rData.nPageNo = pPreview->GetPageNo() + 1; - sal_Bool bAllTested = pPreview->AllTested(); + bool bAllTested = pPreview->AllTested(); if (bAllTested) rData.nTotalPages = pPreview->GetTotalPages(); else diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index 5478ec25bfb6..bc8b5f2fc43b 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -30,7 +30,7 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - sal_Bool bDataChanged = false; + bool bDataChanged = false; if (rHint.ISA(SfxSimpleHint)) { @@ -39,7 +39,7 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { case FID_DATACHANGED: case SID_SCPRINTOPTIONS: - bDataChanged = sal_True; + bDataChanged = true; break; case SC_HINT_DRWLAYER_NEW: { @@ -56,14 +56,14 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { sal_uInt16 nParts = ((const ScPaintHint&)rHint).GetParts(); if (nParts & ( PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE )) - bDataChanged = sal_True; + bDataChanged = true; } } else if (rHint.ISA(SdrHint)) { // SdrHints are no longer used for invalidating, thus react on objectchange instead if(HINT_OBJCHG == ((const SdrHint&)rHint).GetKind()) - bDataChanged = sal_True; + bDataChanged = true; } if (bDataChanged) diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 8875b360a452..b02984496df5 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -265,7 +265,7 @@ void ScTabControl::Select() // InputEnterHandler nur wenn nicht Referenzeingabe - sal_Bool bRefMode = pScMod->IsFormulaMode(); + bool bRefMode = pScMod->IsFormulaMode(); if (!bRefMode) pScMod->InputEnterHandler(); @@ -326,7 +326,7 @@ void ScTabControl::UpdateStatus() { ScDocument* pDoc = pViewData->GetDocument(); ScMarkData& rMark = pViewData->GetMarkData(); - sal_Bool bActive = pViewData->IsActive(); + bool bActive = pViewData->IsActive(); SCTAB nCount = pDoc->GetTableCount(); SCTAB i; @@ -334,7 +334,7 @@ void ScTabControl::UpdateStatus() SCTAB nMaxCnt = std::max( nCount, static_cast<SCTAB>(GetMaxId()) ); Color aTabBgColor; - sal_Bool bModified = false; // Tabellen-Namen + bool bModified = false; // Tabellen-Namen for (i=0; i<nMaxCnt && !bModified; i++) { if (pDoc->IsVisible(i)) @@ -348,7 +348,7 @@ void ScTabControl::UpdateStatus() } if ( !aString.equals(GetPageText(static_cast<sal_uInt16>(i)+1)) || (GetTabBgColor(static_cast<sal_uInt16>(i)+1) != aTabBgColor) ) - bModified = sal_True; + bModified = true; } if (bModified) @@ -380,7 +380,7 @@ void ScTabControl::UpdateStatus() bModified = false; // Selektion for (i=0; i<nMaxCnt && !bModified; i++) if ( rMark.GetTableSelect(i) != (bool) IsPageSelected(static_cast<sal_uInt16>(i)+1) ) - bModified = sal_True; + bModified = true; // #i99576# the following loop is mis-optimized on unxsoli4 and the reason // why this file is in NOOPTFILES. @@ -403,7 +403,7 @@ void ScTabControl::SwitchToPageId(sal_uInt16 nId) { if (nId) { - sal_Bool bAlreadySelected = IsPageSelected( nId ); + bool bAlreadySelected = IsPageSelected( nId ); //make the clicked page the current one SetCurPageId( nId ); //change the selection when the current one is not already @@ -423,7 +423,7 @@ void ScTabControl::Command( const CommandEvent& rCEvt ) { ScModule* pScMod = SC_MOD(); ScTabViewShell* pViewSh = pViewData->GetViewShell(); - sal_Bool bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode(); + bool bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode(); // ViewFrame erstmal aktivieren (Bug 19493): pViewSh->SetActive(); @@ -452,7 +452,7 @@ void ScTabControl::Command( const CommandEvent& rCEvt ) void ScTabControl::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) { ScModule* pScMod = SC_MOD(); - sal_Bool bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode(); + bool bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode(); if (!bDisable) { @@ -598,7 +598,7 @@ long ScTabControl::AllowRenaming() { SCTAB nTab = nId - 1; OUString aNewName = GetEditText(); - sal_Bool bDone = pViewSh->RenameTable( aNewName, nTab ); + bool bDone = pViewSh->RenameTable( aNewName, nTab ); if ( bDone ) nRet = TABBAR_RENAMING_YES; else if ( bErrorShown ) diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 578d859dd0a3..0541d05e46e0 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -764,12 +764,12 @@ void ScTabView::RepeatResize( bool bUpdateFix ) void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ ) { - sal_Bool bScrollBars = aViewData.IsVScrollMode(); - sal_Bool bHeaders = aViewData.IsHeaderMode(); - sal_Bool bOutlMode = aViewData.IsOutlineMode(); - sal_Bool bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - sal_Bool bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); - sal_Bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); + bool bScrollBars = aViewData.IsVScrollMode(); + bool bHeaders = aViewData.IsHeaderMode(); + bool bOutlMode = aViewData.IsOutlineMode(); + bool bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + bool bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); rBorder = SvBorder(); @@ -907,10 +907,10 @@ Point ScTabView::GetGridOffset() const // Groessen hier wie in DoResize - sal_Bool bHeaders = aViewData.IsHeaderMode(); - sal_Bool bOutlMode = aViewData.IsOutlineMode(); - sal_Bool bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - sal_Bool bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + bool bHeaders = aViewData.IsHeaderMode(); + bool bOutlMode = aViewData.IsOutlineMode(); + bool bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + bool bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); // Outline-Controls if (bVOutline && pRowOutline[SC_SPLIT_BOTTOM]) @@ -1135,7 +1135,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) if (nDelta) { - sal_Bool bUpdate = ( eType != SCROLL_DRAG ); // bei Drag die Ranges nicht aendern + bool bUpdate = ( eType != SCROLL_DRAG ); // bei Drag die Ranges nicht aendern if ( bHoriz ) ScrollX( nDelta, (pScroll == &aHScrollLeft) ? SC_SPLIT_LEFT : SC_SPLIT_RIGHT, bUpdate ); else @@ -1403,7 +1403,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY } } -inline void ShowHide( Window* pWin, sal_Bool bShow ) +inline void ShowHide( Window* pWin, bool bShow ) { OSL_ENSURE(pWin || !bShow, "Fenster ist nicht da"); if (pWin) @@ -1412,16 +1412,16 @@ inline void ShowHide( Window* pWin, sal_Bool bShow ) void ScTabView::UpdateShow() { - sal_Bool bHScrollMode = aViewData.IsHScrollMode(); - sal_Bool bVScrollMode = aViewData.IsVScrollMode(); - sal_Bool bTabMode = aViewData.IsTabMode(); - sal_Bool bOutlMode = aViewData.IsOutlineMode(); - sal_Bool bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - sal_Bool bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); - sal_Bool bHeader = aViewData.IsHeaderMode(); + bool bHScrollMode = aViewData.IsHScrollMode(); + bool bVScrollMode = aViewData.IsVScrollMode(); + bool bTabMode = aViewData.IsTabMode(); + bool bOutlMode = aViewData.IsOutlineMode(); + bool bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + bool bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + bool bHeader = aViewData.IsHeaderMode(); - sal_Bool bShowH = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ); - sal_Bool bShowV = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ); + bool bShowH = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ); + bool bShowV = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ); if ( aViewData.GetDocShell()->IsPreview() ) bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = false; @@ -1533,7 +1533,7 @@ void ScTabView::DoHSplit(long nSplitPos) // nSplitPos is the real pixel position on the frame window, // mirroring for RTL has to be done here. - sal_Bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); + bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); if ( bLayoutRTL ) nSplitPos = pFrameWin->GetOutputSizePixel().Width() - nSplitPos - 1; @@ -1715,7 +1715,7 @@ Point ScTabView::GetChartInsertPos( const Size& rSize, const ScRange& rCellRange ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); long nLayoutSign = bLayoutRTL ? -1 : 1; long nDocX = (long)( (double) pDoc->GetColOffset( MAXCOL + 1, nTab ) * HMM_PER_TWIPS ) * nLayoutSign; @@ -1833,7 +1833,7 @@ Point ScTabView::GetChartDialogPos( const Size& rDialogSize, const Rectangle& rL ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); bool bCenterHor = false; @@ -1914,7 +1914,7 @@ Point ScTabView::GetMousePosPixel() return aPos; } -static sal_Bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin ) +static bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin ) { if (pWin) { @@ -1925,18 +1925,18 @@ static sal_Bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin ) Size aWinSize = pWin->GetOutputSizePixel(); if ( aRel.X() >= 0 && aRel.X() < aWinSize.Width() + SPLIT_HANDLE_SIZE && aRel.Y() >= 0 && aRel.Y() < aWinSize.Height() + SPLIT_HANDLE_SIZE ) - return sal_True; + return true; } return false; } void ScTabView::SnapSplitPos( Point& rScreenPosPixel ) { - sal_Bool bOverWin = false; + bool bOverWin = false; sal_uInt16 i; for (i=0; i<4; i++) if (lcl_MouseIsOverWin(rScreenPosPixel,pGridWin[i])) - bOverWin = sal_True; + bOverWin = true; if (!bOverWin) return; diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 4f1ae9f74dbf..e5370806c354 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -48,7 +48,7 @@ void ScTabView::HideTip() void ScTabView::ShowRefTip() { - sal_Bool bDone = false; + bool bDone = false; if ( aViewData.GetRefType() == SC_REFTYPE_REF && Help::IsQuickHelpEnabled() ) { SCCOL nStartX = aViewData.GetRefStartX(); @@ -57,8 +57,8 @@ void ScTabView::ShowRefTip() SCROW nEndY = aViewData.GetRefEndY(); if ( nEndX != nStartX || nEndY != nStartY ) // nicht fuer einzelne Zelle { - sal_Bool bLeft = ( nEndX < nStartX ); - sal_Bool bTop = ( nEndY < nStartY ); + bool bLeft = ( nEndX < nStartX ); + bool bTop = ( nEndY < nStartY ); PutInOrder( nStartX, nEndX ); PutInOrder( nStartY, nEndY ); SCCOL nCols = nEndX+1-nStartX; @@ -95,7 +95,7 @@ void ScTabView::ShowRefTip() HideTip(); nTipVisible = Help::ShowTip( pWin, aRect, aHelp, nFlags ); - bDone = sal_True; + bDone = true; } } } @@ -156,7 +156,7 @@ void ScTabView::DoneRefMode( bool bContinue ) if ( aViewData.GetRefType() == SC_REFTYPE_REF && bContinue ) SC_MOD()->AddRefEntry(); - sal_Bool bWasRef = aViewData.IsRefMode(); + bool bWasRef = aViewData.IsRefMode(); aViewData.SetRefMode( false, SC_REFTYPE_NONE ); HideTip(); @@ -361,8 +361,8 @@ static long lcl_GetScrollRange( SCCOLROW nDocEnd, SCCOLROW nPos, SCCOLROW nVis, void ScTabView::UpdateScrollBars() { long nDiff; - sal_Bool bTop = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ); - sal_Bool bRight = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ); + bool bTop = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ); + bool bRight = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ); ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 551497636af7..4fea5a32da98 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -304,10 +304,10 @@ void ScTabView::UpdateLayerLocks() if (pDrawView) { SCTAB nTab = aViewData.GetTabNo(); - sal_Bool bEx = aViewData.GetViewShell()->IsDrawSelMode(); - sal_Bool bProt = aViewData.GetDocument()->IsTabProtected( nTab ) || + bool bEx = aViewData.GetViewShell()->IsDrawSelMode(); + bool bProt = aViewData.GetDocument()->IsTabProtected( nTab ) || aViewData.GetSfxDocShell()->IsReadOnly(); - sal_Bool bShared = aViewData.GetDocShell()->IsDocShared(); + bool bShared = aViewData.GetDocShell()->IsDocShared(); SdrLayer* pLayer; SdrLayerAdmin& rAdmin = pDrawView->GetModel()->GetLayerAdmin(); @@ -462,9 +462,9 @@ void ScTabView::DrawMarkRect( const Rectangle& rRect ) if ( pGridWin[i] && pGridWin[i]->IsVisible() ) { RasterOp aROp = pGridWin[i]->GetRasterOp(); - sal_Bool bHasLine = pGridWin[i]->IsLineColor(); + bool bHasLine = pGridWin[i]->IsLineColor(); Color aLine = pGridWin[i]->GetLineColor(); - sal_Bool bHasFill = pGridWin[i]->IsFillColor(); + bool bHasFill = pGridWin[i]->IsFillColor(); Color aFill = pGridWin[i]->GetFillColor(); pGridWin[i]->SetRasterOp( ROP_INVERT ); diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 0718edd0f795..712520ff0360 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -179,15 +179,15 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet ) { // Disabled wird nicht mehr... - sal_Bool bThere = false; + bool bThere = false; SfxViewFrame* pThisFrame = GetViewFrame(); sal_uInt16 nId = ScIMapChildWindowId(); if ( pThisFrame->KnowsChildWindow(nId) ) if ( pThisFrame->HasChildWindow(nId) ) - bThere = sal_True; + bThere = true; ObjectSelectionType eType=GetCurObjectSelectionType(); - sal_Bool bEnable=(eType==OST_OleObject) ||(eType==OST_Graphic); + bool bEnable=(eType==OST_OleObject) ||(eType==OST_Graphic); if(!bThere && !bEnable) { rSet.DisableItem( nWhich ); @@ -201,7 +201,7 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet ) case SID_IMAP_EXEC: { - sal_Bool bDisable = sal_True; + bool bDisable = true; SdrView* pDrView = GetSdrView(); if ( pDrView ) diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 7072292e1142..545db9f8d965 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -120,7 +120,7 @@ void ScTabViewShell::InsertURL( const OUString& rName, const OUString& rURL, con sal_uInt16 nMode ) { SvxLinkInsertMode eMode = (SvxLinkInsertMode) nMode; - sal_Bool bAsText = ( eMode != HLINK_BUTTON ); // Default ist jetzt Text + bool bAsText = ( eMode != HLINK_BUTTON ); // Default ist jetzt Text if ( bAsText ) { @@ -171,7 +171,7 @@ void ScTabViewShell::InsertURLField( const OUString& rName, const OUString& rURL ScModule* pScMod = SC_MOD(); ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); - sal_Bool bSelectFirst = false; + bool bSelectFirst = false; if ( !pScMod->IsEditMode() ) { if ( !SelectionEditable() ) diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 84c77e5c4af8..bf9de042ca02 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -74,7 +74,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) OUString aName; pDoc->GetName( nCurrentTab, aName ); - sal_Bool bVisible=sal_True; + bool bVisible=true; if( pReqArgs != NULL ) { const SfxPoolItem* pItem; @@ -135,7 +135,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) OSL_ENSURE(pDlg, "Dialog create fail!"); OUString aTabName; - sal_Bool bFirst = sal_True; + bool bFirst = true; for ( SCTAB i=0; i != nTabCount; i++ ) { if (!pDoc->IsVisible(i)) @@ -175,7 +175,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if ( pReqArgs != NULL ) // von Basic { - sal_Bool bOk = false; + bool bOk = false; const SfxPoolItem* pTabItem; const SfxPoolItem* pNameItem; OUString aName; @@ -215,7 +215,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) nTabs.push_back( static_cast<SCTAB>(n) ); pStr = pDlg->GetNextTable( &n ); } - sal_Bool bLink = pDlg->GetTablesAsLink(); + bool bLink = pDlg->GetTablesAsLink(); if (!nTabs.empty()) { if(pDlg->IsTableBefore()) @@ -322,7 +322,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if( pReqArgs != NULL ) { - sal_Bool bDone = false; + bool bDone = false; const SfxPoolItem* pItem; OUString aName; @@ -350,7 +350,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) else { sal_uInt16 nRet = RET_OK; - sal_Bool bDone = false; + bool bDone = false; OUString aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); OUString aName; OUString aDlgTitle; @@ -433,10 +433,10 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if ( pDoc->GetChangeTrack() != NULL ) break; // bei aktiviertem ChangeTracking kein TabMove - sal_Bool bDoIt = false; + bool bDoIt = false; sal_uInt16 nDoc = 0; SCTAB nTab = pViewData->GetTabNo(); - sal_Bool bCpy = false; + bool bCpy = false; OUString aDocName; OUString aTabName; @@ -488,7 +488,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) else // Kein Dokumentname -> neues Dokument { nDoc = SC_DOC_NEW; - bDoIt = sal_True; + bDoIt = true; } if ( bDoIt && nTab >= nTableCount ) // ggf. anhaengen @@ -569,7 +569,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { // Parameter war ueberfluessig, weil die Methode an der Table haengt - sal_Bool bDoIt = rReq.IsAPI(); + bool bDoIt = rReq.IsAPI(); if( !bDoIt ) { // wenn's nicht von Basic kommt, nochmal nachfragen: @@ -611,7 +611,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { ScDocShell* pDocSh = pViewData->GetDocShell(); ScDocFunc &rFunc = pDocSh->GetDocFunc(); - sal_Bool bSet = !pDoc->IsLayoutRTL( nCurrentTab ); + bool bSet = !pDoc->IsLayoutRTL( nCurrentTab ); const ScMarkData& rMark = pViewData->GetMarkData(); if ( rMark.GetSelectCount() != 0 ) @@ -660,7 +660,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if( pReqArgs != NULL ) { - sal_Bool bDone = false; + bool bDone = false; const SfxPoolItem* pItem; Color aColor; if( pReqArgs->HasItem( FN_PARAM_1, &pItem ) ) @@ -697,7 +697,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) else { sal_uInt16 nRet = RET_OK; /// temp - sal_Bool bDone = false; /// temp + bool bDone = false; /// temp Color aTabBgColor; aTabBgColor = pDoc->GetTabBgColor( nCurrentTab ); @@ -818,10 +818,10 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_TABLE_SHOW: { - sal_Bool bHasHidden = false; + bool bHasHidden = false; for ( SCTAB i=0; i < nTabCount && !bHasHidden; i++ ) if (!pDoc->IsVisible(i)) - bHasHidden = sal_True; + bHasHidden = true; if ( !bHasHidden || pDoc->IsDocProtected() || nTabSelCount > 1 ) rSet.DisableItem( nWhich ); } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index dbb9bc2c800d..7df4869a0f2a 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -153,7 +153,7 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue> pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue; pSettings[SC_TABLE_SHOWGRID].Name = OUString(SC_UNO_SHOWGRID); - pSettings[SC_TABLE_SHOWGRID].Value <<= static_cast<sal_Bool>(bShowGrid); + pSettings[SC_TABLE_SHOWGRID].Value <<= bShowGrid; } } diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 41a2109d328e..b1c3fc408217 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -264,7 +264,7 @@ bool ScViewFunc::SelectionEditable( bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) #define LRU_MAX 10 #endif -static sal_Bool lcl_FunctionKnown( sal_uInt16 nOpCode ) +static bool lcl_FunctionKnown( sal_uInt16 nOpCode ) { const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) @@ -272,12 +272,12 @@ static sal_Bool lcl_FunctionKnown( sal_uInt16 nOpCode ) sal_uLong nCount = pFuncList->GetCount(); for (sal_uLong i=0; i<nCount; i++) if ( pFuncList->GetFunction(i)->nFIndex == nOpCode ) - return sal_True; + return true; } return false; } -static sal_Bool lcl_AddFunction( ScAppOptions& rAppOpt, sal_uInt16 nOpCode ) +static bool lcl_AddFunction( ScAppOptions& rAppOpt, sal_uInt16 nOpCode ) { sal_uInt16 nOldCount = rAppOpt.GetLRUFuncListCount(); sal_uInt16* pOldList = rAppOpt.GetLRUFuncList(); @@ -294,7 +294,7 @@ static sal_Bool lcl_AddFunction( ScAppOptions& rAppOpt, sal_uInt16 nOpCode ) pOldList[nCopy] = pOldList[nCopy-1]; pOldList[0] = nOpCode; - return sal_True; // list has changed + return true; // list has changed } if ( !lcl_FunctionKnown( nOpCode ) ) @@ -307,7 +307,7 @@ static sal_Bool lcl_AddFunction( ScAppOptions& rAppOpt, sal_uInt16 nOpCode ) nNewList[nPos] = pOldList[nPos-1]; rAppOpt.SetLRUFuncList( nNewList, nNewCount ); - return sal_True; // list has changed + return true; // list has changed } namespace HelperNotifyChanges |