diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:00:32 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:23 +0100 |
commit | cc2606a785bf1a57623b8c58e7388112279f6b9e (patch) | |
tree | 044470773656db0b31ae1381672fa27f6811dd50 /sc/source/ui/view | |
parent | dbac5ccaf8fd106ea424d362c0f9b32b7d043543 (diff) |
bool improvements
Change-Id: I740c0e18eefc64cb5f1da5b88ceb77289790ec37
Diffstat (limited to 'sc/source/ui/view')
40 files changed, 188 insertions, 188 deletions
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 136f15523203..52d31fa6569b 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -136,7 +136,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) void ScAuditingShell::GetState( SfxItemSet& rSet ) { - rSet.Put( SfxBoolItem( nFunction, sal_True ) ); // aktive Funktion markieren + rSet.Put( SfxBoolItem( nFunction, true ) ); // aktive Funktion markieren } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index cf9d13b8c313..73bdddd39279 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -185,7 +185,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) case FID_FILL_SERIES: // fill block case SID_OPENDLG_TABOP: // multiple-cell operations, are at least 2 cells marked? if (pDoc->GetChangeTrack()!=NULL &&nWhich ==SID_OPENDLG_TABOP) - bDisable = sal_True; + bDisable = true; else bDisable = (!bSimpleArea) || (nCol1 == nCol2 && nRow1 == nRow2); @@ -243,7 +243,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) { if ( pDocShell && pDocShell->IsDocShared() ) { - bDisable = sal_True; + bDisable = true; } } break; @@ -256,7 +256,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) break; } if (!bDisable && bNeedEdit && !bEditable) - bDisable = sal_True; + bDisable = true; if (bDisable) rSet.DisableItem(nWhich); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index acd1980438a3..1c4450dec9f9 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1348,7 +1348,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SCROW nStartY, nEndY, nClipStartY, nClipSizeY, nRangeSizeY; SCTAB nStartTab, nEndTab; pOwnClip->GetDocument()->GetClipStart( nClipStartX, nClipStartY ); - pOwnClip->GetDocument()->GetClipArea( nClipSizeX, nClipSizeY, sal_True ); + pOwnClip->GetDocument()->GetClipArea( nClipSizeX, nClipSizeY, true ); if ( !( pData->GetSimpleArea( nStartX, nStartY, nStartTab, nEndX, nEndY, nEndTab ) == SC_MARK_SIMPLE && @@ -1423,7 +1423,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { pTabViewShell->PasteFromClip( nFlags, pOwnClip->GetDocument(), nFunction, bSkipEmpty, bTranspose, bAsLink, - eMoveMode, IDF_NONE, sal_True ); // allow warning dialog + eMoveMode, IDF_NONE, true ); // allow warning dialog } } @@ -1757,7 +1757,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pTabViewShell->ChangeIndent( false ); break; case SID_INC_INDENT: - pTabViewShell->ChangeIndent( sal_True ); + pTabViewShell->ChangeIndent( true ); break; case FID_USE_NAME: @@ -2751,8 +2751,8 @@ void ScCellShell::ExecuteSubtotals(SfxRequest& rReq) else // if (bResult == SCRET_REMOVE) { pOutSet = &aArgSet; - aSubTotalParam.bRemoveOnly = sal_True; - aSubTotalParam.bReplace = sal_True; + aSubTotalParam.bRemoveOnly = true; + aSubTotalParam.bReplace = true; aArgSet.Put( ScSubTotalItem( SCITEM_SUBTDATA, GetViewData(), &aSubTotalParam ) ); diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index d4170f679f57..d2f92d4301c6 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -239,7 +239,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) // select current database in database beamer ScImportParam aImportParam; - ScDBData* pDBData = pTabViewShell->GetDBData(sal_True,SC_DB_OLD); // don't create if none found + ScDBData* pDBData = pTabViewShell->GetDBData(true,SC_DB_OLD); // don't create if none found if (pDBData) pDBData->GetImportParam( aImportParam ); @@ -252,7 +252,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) case SID_REIMPORT_DATA: { sal_Bool bOk = false; - ScDBData* pDBData = pTabViewShell->GetDBData(sal_True,SC_DB_OLD); + ScDBData* pDBData = pTabViewShell->GetDBData(true,SC_DB_OLD); if (pDBData) { ScImportParam aImportParam; @@ -275,7 +275,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) case SID_REFRESH_DBAREA: { - ScDBData* pDBData = pTabViewShell->GetDBData(sal_True,SC_DB_OLD); + ScDBData* pDBData = pTabViewShell->GetDBData(true,SC_DB_OLD); if (pDBData) { // repeat import like SID_REIMPORT_DATA @@ -410,7 +410,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if( bHasHeader ) aSortParam.bHasHeader = bHasHeader; - aSortParam.bInplace = sal_True; // from Basic always + aSortParam.bInplace = true; // from Basic always const SfxPoolItem* pItem; if ( pArgs->GetItemState( SID_SORT_BYROW, sal_True, &pItem ) == SFX_ITEM_SET ) @@ -625,7 +625,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) SCSIZE nEC = aParam.GetEntryCount(); for (SCSIZE i=0; i<nEC; i++) aParam.GetEntry(i).bDoQuery = false; - aParam.bDuplicate = sal_True; + aParam.bDuplicate = true; pTabViewShell->Query( aParam, NULL, sal_True ); rReq.Done(); } @@ -872,7 +872,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if (pDoc->GetFormatTable()->IsNumberFormat(aTemp1, nNumIndex, nVal)) aExpr1 = OUString( ::rtl::math::doubleToUString( nVal, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, - ScGlobal::pLocaleData->getNumDecimalSep()[0], sal_True)); + ScGlobal::pLocaleData->getNumDecimalSep()[0], true)); else aExpr1 = aTemp1; } @@ -889,7 +889,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if (pDoc->GetFormatTable()->IsNumberFormat(aTemp2, nNumIndex, nVal)) aExpr2 = OUString( ::rtl::math::doubleToUString( nVal, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, - ScGlobal::pLocaleData->getNumDecimalSep()[0], sal_True)); + ScGlobal::pLocaleData->getNumDecimalSep()[0], true)); else aExpr2 = aTemp2; } diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 0387e727b902..a3c7893ad0cc 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -617,7 +617,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) const SfxUInt16Item& rUInt16Item = (const SfxUInt16Item&)pReqArgs->Get( FID_COL_WIDTH ); // #101390#; the value of the macro is in HMM so use HMMToTwips to convert - pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_DIRECT, + pTabViewShell->SetMarkedWidthOrHeight( true, SC_SIZE_DIRECT, sal::static_int_cast<sal_uInt16>( HMMToTwips(rUInt16Item.GetValue()) ) ); if( ! rReq.IsAPI() ) rReq.Done(); @@ -640,7 +640,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) if ( pDlg->Execute() == RET_OK ) { long nVal = pDlg->GetInputValue(); - pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_DIRECT, (sal_uInt16)nVal ); + pTabViewShell->SetMarkedWidthOrHeight( true, SC_SIZE_DIRECT, (sal_uInt16)nVal ); // #101390#; the value of the macro should be in HMM so use TwipsToEvenHMM to convert rReq.AppendItem( SfxUInt16Item( FID_COL_WIDTH, (sal_uInt16)TwipsToEvenHMM(nVal)) ); @@ -659,7 +659,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) const SfxUInt16Item& rUInt16Item = (const SfxUInt16Item&)pReqArgs->Get( FID_COL_OPT_WIDTH ); // #101390#; the value of the macro is in HMM so use HMMToTwips to convert - pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_OPTIMAL, + pTabViewShell->SetMarkedWidthOrHeight( true, SC_SIZE_OPTIMAL, sal::static_int_cast<sal_uInt16>( HMMToTwips(rUInt16Item.GetValue()) ) ); ScGlobal::nLastColWidthExtra = rUInt16Item.GetValue(); @@ -680,7 +680,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) if ( pDlg->Execute() == RET_OK ) { long nVal = pDlg->GetInputValue(); - pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_OPTIMAL, (sal_uInt16)nVal ); + pTabViewShell->SetMarkedWidthOrHeight( true, SC_SIZE_OPTIMAL, (sal_uInt16)nVal ); ScGlobal::nLastColWidthExtra = nVal; // #101390#; the value of the macro should be in HMM so use TwipsToEvenHMM to convert @@ -693,7 +693,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) break; case FID_COL_OPT_DIRECT: - pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_OPTIMAL, STD_EXTRA_WIDTH ); + pTabViewShell->SetMarkedWidthOrHeight( true, SC_SIZE_OPTIMAL, STD_EXTRA_WIDTH ); rReq.Done(); break; @@ -706,11 +706,11 @@ void ScCellShell::Execute( SfxRequest& rReq ) rReq.Done(); break; case FID_COL_HIDE: - pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_DIRECT, 0 ); + pTabViewShell->SetMarkedWidthOrHeight( true, SC_SIZE_DIRECT, 0 ); rReq.Done(); break; case FID_COL_SHOW: - pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_SHOW, 0 ); + pTabViewShell->SetMarkedWidthOrHeight( true, SC_SIZE_SHOW, 0 ); rReq.Done(); break; @@ -800,7 +800,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) const ScMarkData& rMark = GetViewData()->GetMarkData(); if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) - pTabViewShell->MarkDataArea( sal_True ); + pTabViewShell->MarkDataArea( true ); GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab, nEndCol,nEndRow,nEndTab ); diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index ffeaad0d72d8..410b4d4302db 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.cxx @@ -298,14 +298,14 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) break; case SID_PREV_UNPROTECT: - pTabViewShell->FindNextUnprot( sal_True, !rReq.IsAPI() ); + pTabViewShell->FindNextUnprot( true, !rReq.IsAPI() ); break; case SID_CURSORENTERUP: if (rReq.IsAPI()) pTabViewShell->MoveCursorRel( 0, -1, SC_FOLLOW_LINE, false ); else - pTabViewShell->MoveCursorEnter( sal_True ); + pTabViewShell->MoveCursorEnter( true ); break; case SID_CURSORENTERDOWN: @@ -384,7 +384,7 @@ void ScCellShell::ExecutePageSel( SfxRequest& rReq ) OSL_FAIL("Unknown message in ViewShell (ExecutePageSel)"); return; } - rReq.AppendItem( SfxBoolItem(FN_PARAM_2, sal_True) ); + rReq.AppendItem( SfxBoolItem(FN_PARAM_2, true) ); ExecuteSlot( rReq, GetInterface() ); } diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx index b3075ad81524..4beee59dc28b 100644 --- a/sc/source/ui/view/cliputil.cxx +++ b/sc/source/ui/view/cliputil.cxx @@ -40,7 +40,7 @@ void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTab SCCOL nClipEndX; SCROW nClipEndY; pClipDoc->GetClipStart( nClipStartX, nClipStartY ); - pClipDoc->GetClipArea( nClipEndX, nClipEndY, sal_True ); + pClipDoc->GetClipArea( nClipEndX, nClipEndY, true ); nClipEndX = nClipEndX + nClipStartX; nClipEndY = nClipEndY + nClipStartY; // GetClipArea returns the difference diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index e207d6f945f8..137d7350cd8b 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -144,7 +144,7 @@ void ScColBar::SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ) nRangeCnt = 1; } - pViewData->GetView()->SetWidthOrHeight( sal_True, nRangeCnt, pRanges, eMode, nSizeTwips ); + pViewData->GetView()->SetWidthOrHeight( true, nRangeCnt, pRanges, eMode, nSizeTwips ); delete[] pRanges; } @@ -153,7 +153,7 @@ void ScColBar::HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) SCCOLROW nRange[2]; nRange[0] = nStart; nRange[1] = nEnd; - pViewData->GetView()->SetWidthOrHeight( sal_True, 1, nRange, SC_SIZE_DIRECT, 0 ); + pViewData->GetView()->SetWidthOrHeight( true, 1, nRange, SC_SIZE_DIRECT, 0 ); } void ScColBar::SetMarking( bool bSet ) diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index e5ebd37a6e9c..bf34b8040db1 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -224,7 +224,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std:: // register target in SBA no longer necessary - pDoc->CompileDBFormula( sal_True ); // CreateFormulaString + pDoc->CompileDBFormula( true ); // CreateFormulaString pDoc->SetDBCollection( new ScDBCollection( rNewColl ) ); pDoc->CompileDBFormula( false ); // CompileFormulaString pOldColl = NULL; @@ -310,7 +310,7 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource ScDocument* pDoc = pDocSh->GetDocument(); ScDBData* pDestData = pDoc->GetDBAtCursor( rQueryParam.nDestCol, rQueryParam.nDestRow, - rQueryParam.nDestTab, sal_True ); + rQueryParam.nDestTab, true ); if (pDestData) { ScRange aDestRange; @@ -340,7 +340,7 @@ void ScDBFunc::ToggleAutoFilter() ScDocument* pDoc = GetViewData()->GetDocument(); ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, SC_DBSEL_ROW_DOWN); - pDBData->SetByRow( sal_True ); //! undo, retrieve beforehand ?? + pDBData->SetByRow( true ); //! undo, retrieve beforehand ?? pDBData->GetQueryParam( aParam ); @@ -391,7 +391,7 @@ void ScDBFunc::ToggleAutoFilter() SCSIZE nEC = aParam.GetEntryCount(); for (SCSIZE i=0; i<nEC; i++) aParam.GetEntry(i).bDoQuery = false; - aParam.bDuplicate = sal_True; + aParam.bDuplicate = true; Query( aParam, NULL, sal_True ); pDocSh->GetUndoManager()->LeaveListAction(); @@ -411,7 +411,7 @@ void ScDBFunc::ToggleAutoFilter() ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // header from first row? ).Execute() == RET_YES ) { - pDBData->SetHeader( sal_True ); //! Undo ?? + pDBData->SetHeader( true ); //! Undo ?? bHeader = sal_True; } } @@ -419,9 +419,9 @@ void ScDBFunc::ToggleAutoFilter() ScRange aRange; pDBData->GetArea( aRange ); pDocSh->GetUndoManager()->AddUndoAction( - new ScUndoAutoFilter( pDocSh, aRange, pDBData->GetName(), sal_True ) ); + new ScUndoAutoFilter( pDocSh, aRange, pDBData->GetName(), true ) ); - pDBData->SetAutoFilter(sal_True); + pDBData->SetAutoFilter(true); for (nCol=aParam.nCol1; nCol<=aParam.nCol2; nCol++) { diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 69e0ed89ecf8..8c9ae202319e 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -443,7 +443,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, sal_Bool bRecord, pTable->GetColArray()->GetRange( nOutStartCol, nOutEndCol ); pTable->GetRowArray()->GetRange( nOutStartRow, nOutEndRow ); - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, true ); pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, false, pUndoDoc ); pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, false, pUndoDoc ); } @@ -548,7 +548,7 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord ) { ScDocShell* pDocShell = GetViewData()->GetDocShell(); pDocShell->DoConsolidate( rParam, bRecord ); - SetTabNo( rParam.nTab, sal_True ); + SetTabNo( rParam.nTab, true ); } // @@ -791,7 +791,7 @@ bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& // (parts are collected below) rOldInfo = pNumGroupDim->GetDateInfo(); - bFound = sal_True; + bFound = true; } else if ( pNumGroupDim->GetInfo().mbDateValues ) { @@ -801,7 +801,7 @@ bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rOldInfo = pNumGroupDim->GetInfo(); rParts = com::sun::star::sheet::DataPilotFieldGroupBy::DAYS; // not found in CollectDateParts bFoundParts = sal_True; - bFound = sal_True; + bFound = true; } bInGroupDim = sal_True; } @@ -816,7 +816,7 @@ bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rOldInfo = pGroupDim->GetDateInfo(); aBaseDimName = pGroupDim->GetSourceDimName(); - bFound = sal_True; + bFound = true; } bInGroupDim = sal_True; } @@ -845,7 +845,7 @@ bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& short nType = pDoc->GetFormatTable()->GetType(nIndex); if ( nType == NUMBERFORMAT_DATE || nType == NUMBERFORMAT_TIME || nType == NUMBERFORMAT_DATETIME ) { - bFound = sal_True; + bFound = true; // use currently selected value for automatic limits if( rOldInfo.mbAutoStart ) rOldInfo.mfStart = pDoc->GetValue( aSelRange.aStart ); @@ -897,7 +897,7 @@ bool ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo ) // -> edit settings of this dimension rOldInfo = pNumGroupDim->GetInfo(); - bFound = sal_True; + bFound = true; } else if ( pDimData->GetNamedGroupDim( aDimName ) ) bInGroupDim = sal_True; // in a group dimension @@ -914,7 +914,7 @@ bool ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo ) if ( pDoc->HasValueData( aSelRange.aStart.Col(), aSelRange.aStart.Row(), aSelRange.aStart.Tab() ) ) { - bFound = sal_True; + bFound = true; // use currently selected value for automatic limits if( rOldInfo.mbAutoStart ) rOldInfo.mfStart = pDoc->GetValue( aSelRange.aStart ); @@ -1853,7 +1853,7 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest ScDBDocFunc aFunc( *GetViewData()->GetDocShell() ); ScDPObject* pNewObj = new ScDPObject( *pDPObj ); pNewObj->SetSaveData( aData ); - aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, false ); //! bApi for drag&drop? + aFunc.DataPilotUpdate( pDPObj, pNewObj, true, false ); //! bApi for drag&drop? delete pNewObj; Unmark(); // entry was moved - no use in leaving the old cell selected @@ -1982,7 +1982,7 @@ void ScDBFunc::SetDataPilotDetails(bool bShow, const OUString* pNewDimensionName ScDBDocFunc aFunc( *GetViewData()->GetDocShell() ); ScDPObject* pNewObj = new ScDPObject( *pDPObj ); pNewObj->SetSaveData( aData ); - aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, false ); + aFunc.DataPilotUpdate( pDPObj, pNewObj, true, false ); delete pNewObj; // unmark cell selection @@ -2109,7 +2109,7 @@ void ScDBFunc::RepeatDB( sal_Bool bRecord ) if (bQuery && !aQueryParam.bInplace) { ScDBData* pDest = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow, - aQueryParam.nDestTab, sal_True ); + aQueryParam.nDestTab, true ); if (pDest && pDest->IsDoSize()) { pDest->GetArea( aOldQuery ); @@ -2147,12 +2147,12 @@ void ScDBFunc::RepeatDB( sal_Bool bRecord ) pTable->GetColArray()->GetRange( nOutStartCol, nOutEndCol ); pTable->GetRowArray()->GetRange( nOutStartRow, nOutEndRow ); - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, true ); pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, false, pUndoDoc ); pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, false, pUndoDoc ); } else - pUndoDoc->InitUndo( pDoc, nTab, nTab, false, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, false, true ); // Datenbereich sichern - incl. Filter-Ergebnis pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, false, pUndoDoc ); @@ -2173,7 +2173,7 @@ void ScDBFunc::RepeatDB( sal_Bool bRecord ) { // Sortieren ohne SubTotals - aSubTotalParam.bRemoveOnly = sal_True; // wird unten wieder zurueckgesetzt + aSubTotalParam.bRemoveOnly = true; // wird unten wieder zurueckgesetzt DoSubTotals( aSubTotalParam, false ); } @@ -2220,7 +2220,7 @@ void ScDBFunc::RepeatDB( sal_Bool bRecord ) if (bQuerySize) { ScDBData* pDest = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow, - aQueryParam.nDestTab, sal_True ); + aQueryParam.nDestTab, true ); if (pDest) { pDest->GetArea( aNewQuery ); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 52e603cb32c7..16398a2aeabb 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -325,7 +325,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) rBindings.Invalidate( SID_SET_SUPER_SCRIPT ); rBindings.Invalidate( SID_SET_SUB_SCRIPT ); } - bSetModified = sal_False; + bSetModified = false; } return; @@ -629,9 +629,9 @@ void ScEditShell::Execute( SfxRequest& rReq ) break; } - pHdl->DataChanged(sal_False, bSetModified); + pHdl->DataChanged(false, bSetModified); if (bSetSelIsRef) - pHdl->SetSelIsRef(sal_True); + pHdl->SetSelIsRef(true); } static void lcl_DisableAll( SfxItemSet& rSet ) // disable all slots @@ -1111,7 +1111,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) default: break; } - rSet.Put( SfxBoolItem( nId, sal_True ) ); + rSet.Put( SfxBoolItem( nId, true ) ); } //! Testen, ob Klammer-Hervorhebung aktiv ist !!!! @@ -1123,11 +1123,11 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) aAttribs.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) { - rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); } else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) { - rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); } pViewData->GetBindings().Invalidate( SID_SET_SUPER_SCRIPT ); pViewData->GetBindings().Invalidate( SID_SET_SUB_SCRIPT ); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 16412c4e7e3d..1fb5941df403 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -1193,7 +1193,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) SfxItemPool* pDocPool = GetViewData()->GetDocument()->GetPool(); SfxItemSet aNewSet( *pDocPool, ATTR_PATTERN_START, ATTR_PATTERN_END ); aNewSet.Put( *pItem ); - pTabViewShell->ApplyAttributes( &aNewSet, &rOldSet, sal_True ); + pTabViewShell->ApplyAttributes( &aNewSet, &rOldSet, true ); } } break; @@ -1977,7 +1977,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) // handled together because both need the cell border information for decisions // rSet.Put( SvxColorItem( pLine ? pLine->GetColor() : Color(), SID_FRAME_LINECOLOR ) ); Color aCol = 0; - editeng::SvxBorderLine aLine(0,0,0,0); + editeng::SvxBorderLine aLine(0,0,0,false); bool bCol = false; bool bColDisable = false, bStyleDisable = false; SvxBoxItem aBoxItem(ATTR_BORDER); @@ -2200,7 +2200,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) default: break; } - rSet.Put( SfxBoolItem( nId, sal_True ) ); + rSet.Put( SfxBoolItem( nId, true ) ); } //------------------------ @@ -2212,7 +2212,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) SvxCellVerJustify eVerJustify = SVX_VER_JUSTIFY_STANDARD; sal_uInt16 nWhich = 0; bool bJustifyStd = false; - SfxBoolItem aBoolItem ( 0, sal_True ); + SfxBoolItem aBoolItem ( 0, true ); eState = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, sal_True, (const SfxPoolItem**)&pHorJustify ); @@ -2243,7 +2243,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) case SVX_HOR_JUSTIFY_REPEAT: default: - bJustifyStd = sal_True; + bJustifyStd = true; break; } } @@ -2257,7 +2257,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) break; default: - bJustifyStd = sal_True; + bJustifyStd = true; break; } @@ -2281,7 +2281,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) //------------------------ nWhich = 0; - aBoolItem.SetValue( sal_True ); + aBoolItem.SetValue( true ); eState = rAttrSet.GetItemState( ATTR_VER_JUSTIFY, sal_True, (const SfxPoolItem**)&pVerJustify ); @@ -2308,7 +2308,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) case SVX_VER_JUSTIFY_STANDARD: default: - bJustifyStd = sal_True; + bJustifyStd = true; break; } } @@ -2321,7 +2321,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) break; default: - bJustifyStd = sal_True; + bJustifyStd = true; break; } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index e6ec4cb8674d..5b8a95d781c9 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -603,7 +603,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSel ScDPObject aNewObj( *pDPObj ); aNewObj.SetSaveData( aSaveData ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); - aFunc.DataPilotUpdate( pDPObj, &aNewObj, sal_True, false ); + aFunc.DataPilotUpdate( pDPObj, &aNewObj, true, false ); pViewData->GetView()->CursorPosChanged(); // shells may be switched } } @@ -1080,9 +1080,9 @@ bool ScGridWindow::HasScenarioRange( sal_uInt16 nCol, sal_Int32 nRow, ScRange& r SCTAB i; ScMarkData aMarks; for (i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++) - pDoc->MarkScenario( i, nTab, aMarks, sal_False, SC_SCENARIO_SHOWFRAME ); + pDoc->MarkScenario( i, nTab, aMarks, false, SC_SCENARIO_SHOWFRAME ); ScRangeList aRanges; - aMarks.FillRangeListWithMarks( &aRanges, sal_False ); + aMarks.FillRangeListWithMarks( &aRanges, false ); SCTAB nRangeCount = aRanges.size(); for (i=0; i<nRangeCount; i++) { @@ -1480,7 +1480,7 @@ void ScGridWindow::ExecFilter( sal_uLong nSel, for (SCSIZE i=0; i<nEC; i++) aParam.GetEntry(i).Clear(); nQueryPos = 0; - aParam.bInplace = sal_True; + aParam.bInplace = true; aParam.bRegExp = false; } @@ -1843,7 +1843,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - sal_Bool bCrossPointer = TestMouse( rMEvt, sal_True ); + sal_Bool bCrossPointer = TestMouse( rMEvt, true ); if ( bCrossPointer ) { if ( bDouble ) @@ -1996,7 +1996,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta ReleaseMouse(); StartTracking(); } - pViewData->GetMarkData().SetMarking(sal_True); + pViewData->GetMarkData().SetMarking(true); return; } } @@ -2287,7 +2287,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) ScDPObject aNewObj( *pDPObj ); pDPObj->ToggleDetails( aData, &aNewObj ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); - aFunc.DataPilotUpdate( pDPObj, &aNewObj, sal_True, false ); + aFunc.DataPilotUpdate( pDPObj, &aNewObj, true, false ); pViewData->GetView()->CursorPosChanged(); // shells may be switched } } @@ -2821,7 +2821,7 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) HideNoteMarker(); - CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, sal_True ); + CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, true ); if (bEEMouse && pViewData->HasEditView( eWhich )) { @@ -2832,7 +2832,7 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) // don't remove the edit view while switching views ScModule* pScMod = SC_MOD(); - pScMod->SetInEditCommand( sal_True ); + pScMod->SetInEditCommand( true ); pEditView->Command( aDragEvent ); @@ -2922,7 +2922,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt ) ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); if ( pHdl ) { - pHdl->InputCommand( rCEvt, sal_True ); + pHdl->InputCommand( rCEvt, true ); return; // done } @@ -3365,7 +3365,7 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt) if ( bHadKeyMarker ) HideNoteMarker(); // hide when previously visible else - ShowNoteMarker( pViewData->GetCurX(), pViewData->GetCurY(), sal_True ); + ShowNoteMarker( pViewData->GetCurX(), pViewData->GetCurY(), true ); return; } if (aCode.GetCode() == KEY_BRACKETLEFT && aCode.GetModifier() == KEY_MOD1) @@ -4085,7 +4085,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos { SCTAB nSrcTab = aSource.aStart.Tab(); pViewData->GetDocShell()->MoveTable( nSrcTab, nThisTab, !bIsMove, sal_True ); // with Undo - pView->SetTabNo( nThisTab, sal_True ); + pView->SetTabNo( nThisTab, true ); bDone = sal_True; } } @@ -4125,7 +4125,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos if ( meDragInsertMode != INS_NONE ) { // call with bApi = sal_True to avoid error messages in drop handler - bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, sal_True /*bRecord*/, sal_True /*bApi*/, sal_True /*bPartOfPaste*/ ); + bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, true /*bRecord*/, true /*bApi*/, true /*bPartOfPaste*/ ); if ( bDone ) { if ( nThisTab == nSourceTab ) @@ -4178,7 +4178,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos ( eCmd == DEL_CELLSLEFT && nDestPosY == aSource.aStart.Row() ) ) { // call with bApi = sal_True to avoid error messages in drop handler - bDone = pDocSh->GetDocFunc().DeleteCells( aSource, NULL, eCmd, sal_True /*bRecord*/, sal_True /*bApi*/ ); + bDone = pDocSh->GetDocFunc().DeleteCells( aSource, NULL, eCmd, true /*bRecord*/, true /*bApi*/ ); if ( bDone ) { if ( eCmd == DEL_CELLSUP && nDestPosY > aSource.aEnd.Row() ) @@ -4264,7 +4264,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos if ( meDragInsertMode != INS_NONE ) { // call with bApi = sal_True to avoid error messages in drop handler - bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, sal_True /*bRecord*/, sal_True /*bApi*/, sal_True /*bPartOfPaste*/ ); + bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, true /*bRecord*/, true /*bApi*/, true /*bPartOfPaste*/ ); if ( bDone ) { pDocSh->UpdateOle( pViewData ); @@ -4324,7 +4324,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos if ( meDragInsertMode != INS_NONE ) { // call with bApi = sal_True to avoid error messages in drop handler - bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, sal_True /*bRecord*/, sal_True /*bApi*/, sal_True /*bPartOfPaste*/ ); + bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, true /*bRecord*/, true /*bApi*/, true /*bPartOfPaste*/ ); if ( bDone ) { pDocSh->UpdateOle( pViewData ); @@ -4460,7 +4460,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) lcl_GetDropFormatId( rEvt.maDropEvent.Transferable ); if ( nFormatId ) { - pScMod->SetInExecuteDrop( sal_True ); // #i28468# prevent error messages from PasteDataFormat + pScMod->SetInExecuteDrop( true ); // #i28468# prevent error messages from PasteDataFormat bPasteIsDrop = sal_True; bDone = pViewData->GetView()->PasteDataFormat( nFormatId, rEvt.maDropEvent.Transferable, nPosX, nPosY, &aLogicPos, bIsLink ); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 1d9c9ed944fa..89dc8dd63445 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -227,7 +227,7 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& ScDPObject aNewObj( *pDPObj ); aNewObj.SetSheetDesc( aNewDesc ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); - aFunc.DataPilotUpdate( pDPObj, &aNewObj, sal_True, false ); + aFunc.DataPilotUpdate( pDPObj, &aNewObj, true, false ); pViewData->GetView()->CursorPosChanged(); // shells may be switched } delete pDlg; @@ -344,7 +344,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, sal_Bool bMove ) aNewObj.SetSaveData( aSaveData ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); // when dragging fields, allow re-positioning (bAllowMove) - aFunc.DataPilotUpdate( pDragDPObj, &aNewObj, sal_True, false, sal_True ); + aFunc.DataPilotUpdate( pDragDPObj, &aNewObj, true, false, true ); pViewData->GetView()->CursorPosChanged(); // shells may be switched } } @@ -1015,7 +1015,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, sal_Bool bUp ) if (!bGrow) // sonst in AdjustPrintZoom schon passiert { - pViewFunc->UpdatePageBreakData( sal_True ); + pViewFunc->UpdatePageBreakData( true ); pDocSh->SetDocumentModified(); } } diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 3786fad7d4fc..6390f8b9b9f5 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1341,7 +1341,7 @@ bool ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ) if ( aQueryParam.GetEntry(nQuery).bDoQuery ) { if (aQueryParam.GetEntry(nQuery).nField == nCol) - bColumnFound = sal_True; + bColumnFound = true; if (nQuery > 0) if (aQueryParam.GetEntry(nQuery).eConnect != SC_AND) @@ -1484,7 +1484,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) } } - if ( aMultiMark.IsCellMarked( nThisX, nThisY, sal_True ) == bRepeat ) + if ( aMultiMark.IsCellMarked( nThisX, nThisY, true ) == bRepeat ) { if ( !pMergeFlag->IsOverlapped() ) { @@ -1509,7 +1509,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) } else // !bTestMerge { - if ( aMultiMark.IsCellMarked( nX, nY, sal_True ) == bRepeat && + if ( aMultiMark.IsCellMarked( nX, nY, true ) == bRepeat && nEndX * nLayoutSign >= nScrX * nLayoutSign && nEndY >= nScrY ) { aInvert.AddRect( Rectangle( nScrX,nScrY,nEndX,nEndY ) ); diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index eaa660d14b96..2459b2ed0ad0 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -182,7 +182,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, pTextColor( NULL ), pFormulaColor( NULL ), aGridColor( COL_BLACK ), - mbShowNullValues( sal_True ), + mbShowNullValues( true ), mbShowFormulas( false ), bShowSpellErrors( false ), bMarkClipped( false ), // sal_False fuer Drucker/Metafile etc. @@ -586,7 +586,7 @@ void ScOutputData::SetPagebreakMode( ScPageBreakData* pPageData ) pThisRowInfo->nRowNo <= nEndY ) { for (SCCOL nX=nStartX; nX<=nEndX; nX++) - pThisRowInfo->pCellInfo[nX+1].bPrinted = sal_True; + pThisRowInfo->pCellInfo[nX+1].bPrinted = true; } } } @@ -627,7 +627,7 @@ void ScOutputData::FindRotated() if (nDir != SC_ROTDIR_NONE) { pInfo->nRotateDir = nDir; - bAnyRotated = sal_True; + bAnyRotated = true; } } } diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 9c09b5c9212b..8d55bb9a8e19 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -1147,7 +1147,7 @@ bool ScOutputData::IsAvailable( SCCOL nX, SCROW nY ) return false; } - return sal_True; + return true; } // nX, nArrY: loop variables from DrawStrings / DrawEdit @@ -1304,13 +1304,13 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY rParam.maClipRect.Right() += nAdd * nLayoutSign; if ( rThisRowInfo.nRowNo == nCellY && nRightX >= nX1 && nRightX <= nX2 ) - rThisRowInfo.pCellInfo[nRightX].bHideGrid = sal_True; + rThisRowInfo.pCellInfo[nRightX].bHideGrid = true; } while ( nLeftMissing > 0 && nLeftX > 0 && ( bOverwrite || IsAvailable( nLeftX-1, nCellY ) ) ) { if ( rThisRowInfo.nRowNo == nCellY && nLeftX >= nX1 && nLeftX <= nX2 ) - rThisRowInfo.pCellInfo[nLeftX].bHideGrid = sal_True; + rThisRowInfo.pCellInfo[nLeftX].bHideGrid = true; --nLeftX; long nAdd = (long) ( mpDoc->GetColWidth( nLeftX, nTab ) * mnPPTX ); @@ -1324,14 +1324,14 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY if ( nRightMissing > 0 && bMarkClipped && nRightX >= nX1 && nRightX <= nX2 && !bBreak && !bCellIsValue ) { rThisRowInfo.pCellInfo[nRightX+1].nClipMark |= SC_CLIPMARK_RIGHT; - bAnyClipped = sal_True; + bAnyClipped = true; long nMarkPixel = (long)( SC_CLIPMARK_SIZE * mnPPTX ); rParam.maClipRect.Right() -= nMarkPixel * nLayoutSign; } if ( nLeftMissing > 0 && bMarkClipped && nLeftX >= nX1 && nLeftX <= nX2 && !bBreak && !bCellIsValue ) { rThisRowInfo.pCellInfo[nLeftX+1].nClipMark |= SC_CLIPMARK_LEFT; - bAnyClipped = sal_True; + bAnyClipped = true; long nMarkPixel = (long)( SC_CLIPMARK_SIZE * mnPPTX ); rParam.maClipRect.Left() += nMarkPixel * nLayoutSign; } @@ -1365,7 +1365,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY // -> set clip flags, so "###" replacement is used (but also within the smaller area) if ( !bFit ) - rParam.mbLeftClip = rParam.mbRightClip = sal_True; + rParam.mbLeftClip = rParam.mbRightClip = true; } } } @@ -1519,7 +1519,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) { nCellX = nOverX; nCellY = nOverY; - bDoCell = sal_True; + bDoCell = true; } else bMergeEmpty = true; @@ -1561,7 +1561,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) !mpDoc->HasAttrib( nTempX,nY,nTab, nX,nY,nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) ) { nCellX = nTempX; - bDoCell = sal_True; + bDoCell = true; } } @@ -1691,7 +1691,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) // use edit engine for rotated, stacked or mixed-script text if ( aVars.GetOrient() == SVX_ORIENTATION_STACKED || aVars.IsRotated() || IsAmbiguousScript(nScript) ) - bNeedEdit = sal_True; + bNeedEdit = true; } if (bDoCell && !bNeedEdit) { @@ -1744,7 +1744,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) { // Only horizontal scaling is handled here. // DrawEdit is used to vertically scale 90 deg rotated text. - bNeedEdit = sal_True; + bNeedEdit = true; } else if ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) // horizontal { @@ -1828,7 +1828,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) // right are handled by the flag for nX2 SCCOL nMarkX = ( nCellX <= nX2 ) ? nCellX : nX2; RowInfo* pMarkRowInfo = ( nCellY == nY ) ? pThisRowInfo : &pRowInfo[0]; - pMarkRowInfo->pCellInfo[nMarkX+1].bEditEngine = sal_True; + pMarkRowInfo->pCellInfo[nMarkX+1].bEditEngine = true; bDoCell = false; // don't draw here } if ( bDoCell ) @@ -1861,12 +1861,12 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) if ( aAreaParam.maClipRect.Left() < nScrX ) { aAreaParam.maClipRect.Left() = nScrX; - aAreaParam.mbLeftClip = sal_True; + aAreaParam.mbLeftClip = true; } if ( aAreaParam.maClipRect.Right() > nScrX + nScrW ) { aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? - aAreaParam.mbRightClip = sal_True; + aAreaParam.mbRightClip = true; } sal_Bool bHClip = aAreaParam.mbLeftClip || aAreaParam.mbRightClip; @@ -5109,7 +5109,7 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic) GetOutputArea( nX, nArrY, nCellStartX, nPosY, nCellX, nCellY, nNeededWidth, *pPattern, sal::static_int_cast<sal_uInt16>(eOutHorJust), - false, false, sal_True, aAreaParam ); + false, false, true, aAreaParam ); if ( bShrink ) { @@ -5117,7 +5117,7 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic) mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width() : nEngineWidth; long nNeededPixel = nPixelWidth + nLeftM + nRightM; - aAreaParam.mbLeftClip = aAreaParam.mbRightClip = sal_True; + aAreaParam.mbLeftClip = aAreaParam.mbRightClip = true; // always do height ShrinkEditEngine( *pEngine, aAreaParam.maAlignRect, nLeftM, nTopM, nRightM, nBottomM, diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index 40f278699022..d9d3602664cc 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -130,7 +130,7 @@ void ScPivotShell::Execute( SfxRequest& rReq ) ScDPObject aNewObj( *pDPObj ); aNewObj.SetSheetDesc( aNewDesc ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); - aFunc.DataPilotUpdate( pDPObj, &aNewObj, sal_True, false ); + aFunc.DataPilotUpdate( pDPObj, &aNewObj, true, false ); pViewData->GetView()->CursorPosChanged(); // shells may be switched } delete pDlg; diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 4e7fb50951bd..5ab2a6ece5c5 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -680,7 +680,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) nZoom = pPreview->GetOptimalZoom(false); break; case SVX_ZOOM_PAGEWIDTH: - nZoom = pPreview->GetOptimalZoom(sal_True); + nZoom = pPreview->GetOptimalZoom(true); break; default: { @@ -785,7 +785,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) void ScPreviewShell::GetState( SfxItemSet& rSet ) { - pPreview->SetInGetState(sal_True); + pPreview->SetInGetState(true); SCTAB nTab = pPreview->GetTab(); long nPage = pPreview->GetPageNo(); @@ -877,7 +877,7 @@ void ScPreviewShell::GetState( SfxItemSet& rSet ) rSet.Put( SfxStringItem( nWhich, pPreview->GetPosString() ) ); break; case SID_PRINTPREVIEW: - rSet.Put( SfxBoolItem( nWhich, sal_True ) ); + rSet.Put( SfxBoolItem( nWhich, true ) ); break; case SID_FORMATPAGE: case SID_PREVIEW_MARGIN: diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index c8e408418605..b63fe5368d5c 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -69,7 +69,7 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } if (bDataChanged) - pPreview->DataChanged(sal_True); + pPreview->DataChanged(true); } diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 87c508bf8e26..0c37a182597a 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -514,7 +514,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr { pDrawView = new FmFormView( pModel, pDev ); pDrawView->ShowSdrPage(pDrawView->GetModel()->GetPage(nTab)); - pDrawView->SetPrintPreview( sal_True ); + pDrawView->SetPrintPreview( true ); aOutputData.SetDrawView( pDrawView ); } @@ -1325,7 +1325,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, if (pBorderData) { ScDocument* pBorderDoc = new ScDocument( SCDOCMODE_UNDO ); - pBorderDoc->InitUndo( pDoc, 0,0, sal_True,sal_True ); + pBorderDoc->InitUndo( pDoc, 0,0, true,true ); if (pBorderData) pBorderDoc->ApplyAttr( 0,0,0, *pBorderData ); @@ -1549,7 +1549,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScTableInfo aTabInfo; pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nPrintTab, - nScaleX, nScaleY, sal_True, aTableParam.bFormulas ); + nScaleX, nScaleY, true, aTableParam.bFormulas ); lcl_HidePrint( aTabInfo, nX1, nX2 ); if (bEmbed) @@ -2578,7 +2578,7 @@ void ScPrintFunc::ApplyPrintSettings() aEnumSize.Width() = aEnumSize.Height(); aEnumSize.Height() = nTemp; } - Paper ePaper = SvxPaperInfo::GetSvxPaper( aEnumSize, MAP_TWIP, sal_True ); + Paper ePaper = SvxPaperInfo::GetSvxPaper( aEnumSize, MAP_TWIP, true ); sal_uInt16 nPaperBin = ((const SvxPaperBinItem&)pParamSet->Get(ATTR_PAGE_PAPERBIN)).GetValue(); pPrinter->SetPaper( ePaper ); diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index c796cfbc8b40..fbb007fc4bde 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -264,13 +264,13 @@ void ScViewFunctionSet::SetAnchor( SCCOL nPosX, SCROW nPosY ) } else { - pView->DoneBlockMode( sal_True ); + pView->DoneBlockMode( true ); aAnchorPos.Set( nPosX, nPosY, nTab ); ScMarkData& rMark = pViewData->GetMarkData(); if ( rMark.IsMarked() || rMark.IsMultiMarked() ) { pView->InitBlockMode( aAnchorPos.Col(), aAnchorPos.Row(), - aAnchorPos.Tab(), sal_True ); + aAnchorPos.Tab(), true ); bStarted = sal_True; } else @@ -284,9 +284,9 @@ void ScViewFunctionSet::DestroyAnchor() { sal_Bool bRefMode = SC_MOD()->IsFormulaMode(); if (bRefMode) - pViewData->GetView()->DoneRefMode( sal_True ); + pViewData->GetView()->DoneRefMode( true ); else - pViewData->GetView()->DoneBlockMode( sal_True ); + pViewData->GetView()->DoneBlockMode( true ); bAnchor = false; } @@ -446,7 +446,7 @@ sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Boo { if (!bAnchor) { - pView->DoneRefMode( sal_True ); + pView->DoneRefMode( true ); pView->InitRefMode( nPosX, nPosY, pViewData->GetTabNo(), SC_REFTYPE_REF ); } @@ -634,7 +634,7 @@ sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Boo if ( bMove || ( pEngine && pEngine->GetMouseEvent().IsShift() ) ) { pView->InitBlockMode( aAnchorPos.Col(), aAnchorPos.Row(), - aAnchorPos.Tab(), sal_True ); + aAnchorPos.Tab(), true ); bStarted = sal_True; } } @@ -649,8 +649,8 @@ sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Boo ScMarkData& rMark = pViewData->GetMarkData(); if (rMark.IsMarked() || rMark.IsMultiMarked()) { - pView->DoneBlockMode(sal_True); - pView->InitBlockMode( nPosX, nPosY, nTab, sal_True ); + pView->DoneBlockMode(true); + pView->InitBlockMode( nPosX, nPosY, nTab, true ); pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab ); aAnchorPos.Set( nPosX, nPosY, nTab ); @@ -665,13 +665,13 @@ sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Boo SCCOL nOldX = pViewData->GetCurX(); SCROW nOldY = pViewData->GetCurY(); - pView->InitBlockMode( nOldX, nOldY, nTab, sal_True ); + pView->InitBlockMode( nOldX, nOldY, nTab, true ); pView->MarkCursor( (SCCOL) nOldX, (SCROW) nOldY, nTab ); if ( nOldX != nPosX || nOldY != nPosY ) { - pView->DoneBlockMode( sal_True ); - pView->InitBlockMode( nPosX, nPosY, nTab, sal_True ); + pView->DoneBlockMode( true ); + pView->InitBlockMode( nPosX, nPosY, nTab, true ); pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab ); aAnchorPos.Set( nPosX, nPosY, nTab ); } @@ -786,15 +786,15 @@ void ScHeaderFunctionSet::CreateAnchor() return; ScTabView* pView = pViewData->GetView(); - pView->DoneBlockMode( sal_True ); + pView->DoneBlockMode( true ); if (bColumn) { - pView->InitBlockMode( static_cast<SCCOL>(nCursorPos), 0, pViewData->GetTabNo(), sal_True, sal_True, false ); + pView->InitBlockMode( static_cast<SCCOL>(nCursorPos), 0, pViewData->GetTabNo(), true, true, false ); pView->MarkCursor( static_cast<SCCOL>(nCursorPos), MAXROW, pViewData->GetTabNo() ); } else { - pView->InitBlockMode( 0, nCursorPos, pViewData->GetTabNo(), sal_True, false, sal_True ); + pView->InitBlockMode( 0, nCursorPos, pViewData->GetTabNo(), true, false, true ); pView->MarkCursor( MAXCOL, nCursorPos, pViewData->GetTabNo() ); } bAnchor = sal_True; @@ -802,7 +802,7 @@ void ScHeaderFunctionSet::CreateAnchor() void ScHeaderFunctionSet::DestroyAnchor() { - pViewData->GetView()->DoneBlockMode( sal_True ); + pViewData->GetView()->DoneBlockMode( true ); bAnchor = false; } @@ -889,9 +889,9 @@ sal_Bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bo if ( !bAnchor || !pView->IsBlockMode() ) { - pView->DoneBlockMode( sal_True ); + pView->DoneBlockMode( true ); pViewData->GetMarkData().MarkToMulti(); //! who changes this? - pView->InitBlockMode( nPosX, nPosY, pViewData->GetTabNo(), sal_True, bColumn, !bColumn ); + pView->InitBlockMode( nPosX, nPosY, pViewData->GetTabNo(), true, bColumn, !bColumn ); bAnchor = sal_True; } diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index eec312cd9971..35a0aa135e56 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -138,7 +138,7 @@ void ScSpellDialogChildWindow::Reset() } mpViewData->SetSpellingView( 0 ); - mpViewShell->KillEditView( sal_True ); + mpViewShell->KillEditView( true ); mpDocShell->PostPaintGridAll(); mpViewShell->UpdateInputHandler(); mpDoc->EnableIdle(mbOldIdleEnabled); diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index bc1f0fd78006..fad6d6f2a087 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -212,7 +212,7 @@ bool ScConversionEngineBase::FindNextConversionCell() if( bFound ) { pViewShell->AlignToCursor( nNewCol, nNewRow, SC_FOLLOW_JUMP ); - pViewShell->SetCursor( nNewCol, nNewRow, sal_True ); + pViewShell->SetCursor( nNewCol, nNewRow, true ); mrViewData.GetView()->MakeEditView( this, nNewCol, nNewRow ); EditView* pEditView = mrViewData.GetSpellingView(); // maSelState.GetEditSelection() returns (0,0) if not in edit mode -> ok diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index b4fca9100183..66d232f46f50 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -459,7 +459,7 @@ void ScTabControl::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) if (!bDisable) { Region aRegion( Rectangle(0,0,0,0) ); - CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, sal_True ); // needed for StartDrag + CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, true ); // needed for StartDrag if (TabBar::StartDrag( aCEvt, aRegion )) DoDrag( aRegion ); } diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 3ae890f4629d..e4c7ae714461 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -200,7 +200,7 @@ ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pView aHScrollLeft( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), aHScrollRight( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), aCornerButton( pFrameWin, &aViewData, false ), - aTopButton( pFrameWin, &aViewData, sal_True ), + aTopButton( pFrameWin, &aViewData, true ), aScrollBarBox( pFrameWin, WB_SIZEABLE ), mpInputHintWindow( NULL ), pPageBreakData( NULL ), @@ -1540,7 +1540,7 @@ IMPL_LINK( ScTabView, SplitHdl, Splitter*, pSplitter ) DoVSplit( pVSplitter->GetSplitPosPixel() ); if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX || aViewData.GetVSplitMode() == SC_SPLIT_FIX ) - FreezeSplitters( sal_True ); + FreezeSplitters( true ); DoResize( aBorderPos, aFrameSize ); diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 4d8906f6daa2..22b5e175cf76 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -365,7 +365,7 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, // Teil von Markierung aufheben? if (bForceNeg) - bBlockNeg = sal_True; + bBlockNeg = true; else if (bTestNeg) { if ( bCols ) @@ -527,7 +527,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, nBlockStartXOrig - nCurX + nColSpan - 1 : 0; nCurYOffset = (nCurY >= nBlockStartYOrig && nCurY < nBlockStartYOrig + nRowSpan - 1) ? nBlockStartYOrig - nCurY + nRowSpan - 1 : 0; - bBlockStartMerged = sal_True; + bBlockStartMerged = true; } } diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index ab0208129438..580bbba98ac4 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -290,7 +290,7 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT ScMarkData& rMark = aViewData.GetMarkData(); if (!aViewData.IsRefMode()) { - aViewData.SetRefMode( sal_True, eType ); + aViewData.SetRefMode( true, eType ); aViewData.SetRefStart( nCurX, nCurY, nCurZ ); aViewData.SetRefEnd( nCurX, nCurY, nCurZ ); diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 87933b426ba3..34984ff71021 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -412,7 +412,7 @@ void ScTabView::ViewOptionsHasChanged( bool bHScrollChanged, bool bGraphicsChang pDrawView->UpdateUserViewOptions(); if (bGraphicsChanged) - DrawEnableAnim(sal_True); // DrawEnableAnim checks the options state + DrawEnableAnim(true); // DrawEnableAnim checks the options state // if TabBar is set to visible, make sure its size is not 0 bool bGrow = ( aViewData.IsTabMode() && pTabControl->GetSizePixel().Width() <= 0 ); diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index c1f533963065..c1b3e50e74e8 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -538,7 +538,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) PaintTop(); PaintLeft(); rBindings.Invalidate( nSlot ); - rReq.AppendItem( SfxBoolItem( nSlot, sal_True ) ); + rReq.AppendItem( SfxBoolItem( nSlot, true ) ); rReq.Done(); } } @@ -843,12 +843,12 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rMark.SelectTable( nTab, false ); for( nSelIx = 0; nSelIx < nSelCount; ++nSelIx ) - rMark.SelectTable( static_cast<SCTAB>(aIndexList[nSelIx]), sal_True ); + rMark.SelectTable( static_cast<SCTAB>(aIndexList[nSelIx]), true ); // activate another table, if current is deselected if( !rMark.GetTableSelect( rViewData.GetTabNo() ) ) { - rMark.SelectTable( nFirstVisTab, sal_True ); + rMark.SelectTable( nFirstVisTab, true ); SetTabNo( nFirstVisTab ); } @@ -898,7 +898,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // aufheben RemoveSplit(); else - FreezeSplitters( sal_True ); // erzeugen oder fixieren + FreezeSplitters( true ); // erzeugen oder fixieren rReq.Done(); InvalidateSplit(); @@ -1028,7 +1028,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { OUString aPassword = pDlg->GetPassword(); Protect( TABLEID_DOC, aPassword ); - rReq.AppendItem( SfxBoolItem( FID_PROTECT_DOC, sal_True ) ); + rReq.AppendItem( SfxBoolItem( FID_PROTECT_DOC, true ) ); rReq.Done(); } diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 150e4b3f7a38..9b1ee2a8e716 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -115,7 +115,7 @@ void ScTabViewShell::Activate(sal_Bool bMDI) ScModule* pScMod = SC_MOD(); pScMod->ViewShellChanged(); - ActivateView( sal_True, bFirstActivate ); + ActivateView( true, bFirstActivate ); ActivateOlk( GetViewData() ); // AutoCorrect umsetzen, falls der Writer seins neu angelegt hat @@ -173,7 +173,7 @@ void ScTabViewShell::Activate(sal_Bool bMDI) if ( pExtOpt && pExtOpt->IsChanged() ) { GetViewData()->ReadExtOptions(*pExtOpt); // Excel view settings - SetTabNo( GetViewData()->GetTabNo(), sal_True ); + SetTabNo( GetViewData()->GetTabNo(), true ); pExtOpt->SetChanged( false ); } } @@ -253,7 +253,7 @@ void ScTabViewShell::Deactivate(sal_Bool bMDI) GetViewData()->GetDocShell()->UpdateOle(GetViewData(),sal_True); if ( pHdl ) - pHdl->NotifyChange( NULL, sal_True ); // Timer-verzoegert wg. Dokumentwechsel + pHdl->NotifyChange( NULL, true ); // Timer-verzoegert wg. Dokumentwechsel if (pScActiveViewShell == this) pScActiveViewShell = NULL; @@ -373,7 +373,7 @@ void ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &rSize ) aNewSize.Height() += aBorder.Top() + aBorder.Bottom(); } - DoResize( rOfs, aNewSize, sal_True ); // rSize = Groesse von gridwin + DoResize( rOfs, aNewSize, true ); // rSize = Groesse von gridwin UpdateOleZoom(); // Zoom fuer In-Place berechnen @@ -508,7 +508,7 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper sal_Bool bFocus = pOldWin && pOldWin->HasFocus(); GetViewData()->ReadUserDataSequence(rSettings); - SetTabNo( GetViewData()->GetTabNo(), sal_True ); + SetTabNo( GetViewData()->GetTabNo(), true ); if ( GetViewData()->IsPagebreakMode() ) SetCurSubShell( GetCurObjectSelectionType(), sal_True ); @@ -543,7 +543,7 @@ void ScTabViewShell::DoReadUserData( const OUString& rData ) sal_Bool bFocus = pOldWin && pOldWin->HasFocus(); GetViewData()->ReadUserData(rData); - SetTabNo( GetViewData()->GetTabNo(), sal_True ); + SetTabNo( GetViewData()->GetTabNo(), true ); if ( GetViewData()->IsPagebreakMode() ) SetCurSubShell( GetCurObjectSelectionType(), sal_True ); @@ -651,7 +651,7 @@ void ScTabViewShell::SetDrawShell( sal_Bool bActive ) { // Aktiven Teil an Cursor anpassen, etc. MoveCursorAbs( GetViewData()->GetCurX(), GetViewData()->GetCurY(), - SC_FOLLOW_NONE, false, false, sal_True ); + SC_FOLLOW_NONE, false, false, true ); } } } @@ -1562,7 +1562,7 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace { - pDocSh->SetInplace( sal_True ); // schon so initialisiert + pDocSh->SetInplace( true ); // schon so initialisiert if (pDoc->IsEmbedded()) pDoc->ResetEmbedded(); // keine blaue Markierung } @@ -1616,7 +1616,7 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) if ( bFirstView ) // first view? { - pDoc->SetDocVisible( sal_True ); // used when creating new sheets + pDoc->SetDocVisible( true ); // used when creating new sheets if ( pDocSh->IsEmpty() ) { // set first sheet's RTL flag (following will already be initialized because of SetDocVisible) diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 52a2262ffbed..73cb022ad665 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -126,7 +126,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) break; case SC_HINT_FORCESETTAB: - SetTabNo( GetViewData()->GetTabNo(), sal_True ); + SetTabNo( GetViewData()->GetTabNo(), true ); break; default: diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 22d2df68b9e6..5f2f415b12c2 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -78,7 +78,7 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); - SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, sal_False ); + SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, false ); if ( !pGalleryItem ) return; diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 108390c8310a..afdd056de325 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -236,7 +236,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_DEFINE_DBNAME: { // wenn auf einem bestehenden Bereich aufgerufen, den markieren - GetDBData( sal_True, SC_DB_OLD ); + GetDBData( true, SC_DB_OLD ); const ScMarkData& rMark = GetViewData()->GetMarkData(); if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) MarkDataArea( false ); diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index d04714771a00..edab77d92a9e 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1827,7 +1827,7 @@ sal_Bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWh pDoc->RemoveFlagsTab( 0,0, MAXCOL,MAXROW, nTabNo, SC_MF_HOR | SC_MF_VER ); SCCOL nEndCol = MAXCOL; SCROW nEndRow = MAXROW; - pDoc->ExtendMerge( 0,0, nEndCol,nEndRow, nTabNo, sal_True ); + pDoc->ExtendMerge( 0,0, nEndCol,nEndRow, nTabNo, true ); if (pDocShell) pDocShell->PostPaint( ScRange(0,0,nTabNo,MAXCOL,MAXROW,nTabNo), PAINT_GRID ); } @@ -2428,7 +2428,7 @@ void ScViewData::WriteExtOptions( ScExtDocOptions& rDocOpt ) const // sheet selection and selected ranges const ScMarkData& rMarkData = GetMarkData(); rTabSett.mbSelected = rMarkData.GetTableSelect( nTab ); - rMarkData.FillRangeListWithMarks( &rTabSett.maSelection, sal_True ); + rMarkData.FillRangeListWithMarks( &rTabSett.maSelection, true ); // grid color rTabSett.maGridColor.SetColor( COL_AUTO ); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 408b029b3c64..9415fe2f85f1 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -896,7 +896,7 @@ void ScViewFunc::RemoveManualBreaks() if (bUndo) { ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, true ); pDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, false, pUndoDoc ); pDocSh->GetUndoManager()->AddUndoAction( new ScUndoRemoveBreaks( pDocSh, nTab, pUndoDoc ) ); @@ -905,7 +905,7 @@ void ScViewFunc::RemoveManualBreaks() pDoc->RemoveManualBreaks(nTab); pDoc->UpdatePageBreaks(nTab); - UpdatePageBreakData( sal_True ); + UpdatePageBreakData( true ); pDocSh->SetDocumentModified(); pDocSh->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); } @@ -1923,7 +1923,7 @@ void ScViewFunc::ExtendScenario() ScDocument* pDoc = GetViewData()->GetDocument(); ScPatternAttr aPattern( pDoc->GetPool() ); aPattern.GetItemSet().Put( ScMergeFlagAttr( SC_MF_SCENARIO ) ); - aPattern.GetItemSet().Put( ScProtectionAttr( sal_True ) ); + aPattern.GetItemSet().Put( ScProtectionAttr( true ) ); ApplySelectionPattern(aPattern); } @@ -1950,7 +1950,7 @@ sal_Bool ScViewFunc::InsertTable( const OUString& rName, SCTAB nTab, sal_Bool bR sal_Bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc(). InsertTable( nTab, rName, bRecord, false ); if (bSuccess) - SetTabNo( nTab, sal_True ); + SetTabNo( nTab, true ); return bSuccess; } @@ -2027,7 +2027,7 @@ sal_Bool ScViewFunc::AppendTable( const OUString& rName, sal_Bool bRecord ) pDocSh->GetUndoManager()->AddUndoAction( new ScUndoInsertTab( pDocSh, nTab, sal_True, rName)); GetViewData()->InsertTab( nTab ); - SetTabNo( nTab, sal_True ); + SetTabNo( nTab, true ); pDocSh->PostPaintExtras(); pDocSh->SetDocumentModified(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); @@ -2053,7 +2053,7 @@ sal_Bool ScViewFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord ) SCTAB nNewTab = nTab; if ( nNewTab >= pDoc->GetTableCount() ) --nNewTab; - SetTabNo( nNewTab, sal_True ); + SetTabNo( nNewTab, true ); } return bSuccess; } @@ -2087,7 +2087,7 @@ bool ScViewFunc::DeleteTables( const SCTAB nTab, SCTAB nSheets ) pDocSh->Broadcast( ScTablesHint( SC_TABS_DELETED, nTab, nSheets ) ); if ( nNewTab >= pDoc->GetTableCount() ) nNewTab = pDoc->GetTableCount() - 1; - SetTabNo( nNewTab, sal_True ); + SetTabNo( nNewTab, true ); pDocSh->PostPaintExtras(); pDocSh->SetDocumentModified(); @@ -2146,7 +2146,7 @@ sal_Bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, sal_Bool bRecord } if ( pDoc->IsScenario(nTab) ) { - pUndoDoc->SetScenario( nTab, sal_True ); + pUndoDoc->SetScenario( nTab, true ); OUString aComment; Color aColor; sal_uInt16 nScenFlags; @@ -2206,7 +2206,7 @@ sal_Bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, sal_Bool bRecord if ( nNewTab >= pDoc->GetTableCount() ) nNewTab = pDoc->GetTableCount() - 1; - SetTabNo( nNewTab, sal_True ); + SetTabNo( nNewTab, true ); if (bWasLinked) { @@ -2252,7 +2252,7 @@ sal_Bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab ) { - bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, sal_True, false ); + bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, true, false ); if (bSuccess) { GetViewData()->GetViewShell()->UpdateInputHandler(); @@ -2262,7 +2262,7 @@ bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab ) bool ScViewFunc::SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfoList ) { - bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( rUndoSetTabBgColorInfoList, sal_True, false ); + bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( rUndoSetTabBgColorInfoList, true, false ); if (bSuccess) { GetViewData()->GetViewShell()->UpdateInputHandler(); @@ -2408,7 +2408,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, if (!bWasThere) // Insert link only once per source document { ScTableLink* pLink = new ScTableLink( pDocSh, aFileName, aFilterName, aOptions, nRefresh ); - pLink->SetInCreate( sal_True ); + pLink->SetInCreate( true ); pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aFileName, &aFilterName ); pLink->Update(); pLink->SetInCreate( false ); @@ -2427,7 +2427,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, for (i=0; i<nInsCount; i++) GetViewData()->InsertTab(nTab); - SetTabNo(nTab,sal_True); + SetTabNo(nTab,true); pDocSh->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS ); @@ -2729,7 +2729,7 @@ void ScViewFunc::MoveTable( sal_uInt16 nFlags; pDoc->GetScenarioData(nMovTab, aComment,aColor, nFlags); - pDoc->SetScenario(nDestTab1,sal_True); + pDoc->SetScenario(nDestTab1,true); pDoc->SetScenarioData(nDestTab1,aComment,aColor,nFlags); sal_Bool bActive = pDoc->IsActiveScenario(nMovTab ); pDoc->SetActiveScenario( nDestTab1, bActive ); @@ -2793,7 +2793,7 @@ void ScViewFunc::MoveTable( else if (!bCopy && nTab<nDestTab) nNewTab--; - SetTabNo( nNewTab, sal_True ); + SetTabNo( nNewTab, true ); //#i29848# adjust references to data on the copied sheet if( bCopy ) @@ -2821,8 +2821,8 @@ void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) aName = *itr; if (pDoc->GetTable(aName, nPos)) { - pDoc->SetVisible( nPos, sal_True ); - SetTabNo( nPos, sal_True ); + pDoc->SetVisible( nPos, true ); + SetTabNo( nPos, true ); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); if (!bFound) bFound = true; diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index f96d913d73a1..6d5fa726d3ae 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -110,7 +110,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, sal_Bool bIncludeObjects ) CopyToClip( pClipDoc, sal_True, false, bIncludeObjects ); // Ab ins Clipboard ScAddress aOldEnd( aRange.aEnd ); // Zusammengefasste Zellen im Bereich? - pDoc->ExtendMerge( aRange, sal_True ); + pDoc->ExtendMerge( aRange, true ); ScDocument* pUndoDoc = NULL; if ( bRecord ) @@ -422,7 +422,7 @@ ScTransferObj* ScViewFunc::CopyToTransferable() pDoc->CopyToClip(aClipParam, pClipDoc, &rMark, false, false, true); ScDrawLayer::SetGlobalDrawPersist(NULL); - pClipDoc->ExtendMerge( aRange, sal_True ); + pClipDoc->ExtendMerge( aRange, true ); ScDocShell* pDocSh = GetViewData()->GetDocShell(); TransferableObjectDescriptor aObjDesc; @@ -467,7 +467,7 @@ void ScViewFunc::PasteFromSystem() uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip ); PasteFromClip( IDF_ALL, pOwnClip->GetDocument(), PASTE_NOFUNC, false, false, false, INS_NONE, IDF_NONE, - sal_True ); // allow warning dialog + true ); // allow warning dialog } else if (pDrawClip) PasteDraw(); @@ -577,7 +577,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran { PasteFromClip( IDF_ALL, pOwnClip->GetDocument(), PASTE_NOFUNC, false, false, false, INS_NONE, IDF_NONE, - sal_True ); // allow warning dialog + true ); // allow warning dialog } else if (pDrawClip) { @@ -1850,7 +1850,7 @@ sal_Bool ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPo // Paste - PasteFromClip( IDF_ALL, pClipDoc, PASTE_NOFUNC, false, false, sal_True ); // als Link + PasteFromClip( IDF_ALL, pClipDoc, PASTE_NOFUNC, false, false, true ); // als Link delete pClipDoc; diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index ab8d24203ea1..3269d1cb000b 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -431,7 +431,7 @@ void ScViewFunc::DoThesaurus( sal_Bool bRecord ) } delete pNewTObj; } - KillEditView(sal_True); + KillEditView(true); delete pEditDefaults; delete pThesaurusEngine; delete pOldTObj; @@ -571,7 +571,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, sal_Boo // *** final cleanup *** -------------------------------------------------- rViewData.SetSpellingView( NULL ); - KillEditView(sal_True); + KillEditView(true); delete pEngine; pDocSh->PostPaintGridAll(); rViewData.GetViewShell()->UpdateInputHandler(); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 0d4c1311d8b5..079d55624899 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -79,7 +79,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, SCCOL nPosX, SCROW nPosY, Point* pLogicPos, sal_Bool bLink, sal_Bool bAllowDialogs ) { ScDocument* pDoc = GetViewData()->GetDocument(); - pDoc->SetPastingDrawFromOtherDoc( sal_True ); + pDoc->SetPastingDrawFromOtherDoc( true ); Point aPos; // inserting position (1/100 mm) if (pLogicPos) diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 1904bcec5c77..4a7d3996ce82 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -217,7 +217,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, // #89247# Set flag for ScDocument::UpdateChartListeners() which is // called during paste. if ( !bSameDocClipboard ) - GetViewData()->GetDocument()->SetPastingDrawFromOtherDoc( sal_True ); + GetViewData()->GetDocument()->SetPastingDrawFromOtherDoc( true ); pScDrawView->Paste( *pModel, aPos, NULL, nOptions ); |