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 | |
| parent | dbac5ccaf8fd106ea424d362c0f9b32b7d043543 (diff) | |
bool improvements
Change-Id: I740c0e18eefc64cb5f1da5b88ceb77289790ec37
Diffstat (limited to 'sc/source')
149 files changed, 651 insertions, 651 deletions
diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx index 8d3288418d1c..6d4ffd3a522a 100644 --- a/sc/source/core/data/compressedarray.cxx +++ b/sc/source/core/data/compressedarray.cxx @@ -425,7 +425,7 @@ A ScBitMaskCompressedArray<A,D>::GetLastAnyBitAccess( A nStart, { A nEnd = ::std::numeric_limits<A>::max(); size_t nIndex = this->nCount-1; - while (1) + while (true) { if ((this->pData[nIndex].aValue & rBitMask) != 0) { diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 232a11407331..14aa2cc1fe1f 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -305,16 +305,16 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) ppPoolDefaults[ ATTR_PAGE_MAXSIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_MAXSIZE ); ppPoolDefaults[ ATTR_PAGE_HORCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HORCENTER ); ppPoolDefaults[ ATTR_PAGE_VERCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_VERCENTER ); - ppPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, sal_True ); - ppPoolDefaults[ ATTR_PAGE_DYNAMIC - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_DYNAMIC, sal_True ); - ppPoolDefaults[ ATTR_PAGE_SHARED - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_SHARED, sal_True ); + ppPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, true ); + ppPoolDefaults[ ATTR_PAGE_DYNAMIC - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_DYNAMIC, true ); + ppPoolDefaults[ ATTR_PAGE_SHARED - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_SHARED, true ); ppPoolDefaults[ ATTR_PAGE_NOTES - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NOTES, false ); ppPoolDefaults[ ATTR_PAGE_GRID - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_GRID, false ); ppPoolDefaults[ ATTR_PAGE_HEADERS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HEADERS, false ); ppPoolDefaults[ ATTR_PAGE_CHARTS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_CHARTS ); ppPoolDefaults[ ATTR_PAGE_OBJECTS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_OBJECTS ); ppPoolDefaults[ ATTR_PAGE_DRAWINGS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_DRAWINGS ); - ppPoolDefaults[ ATTR_PAGE_TOPDOWN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_TOPDOWN, sal_True ); + ppPoolDefaults[ ATTR_PAGE_TOPDOWN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_TOPDOWN, true ); ppPoolDefaults[ ATTR_PAGE_SCALE - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALE, 100 ); ppPoolDefaults[ ATTR_PAGE_SCALETOPAGES-ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALETOPAGES, 1 ); ppPoolDefaults[ ATTR_PAGE_FIRSTPAGENO- ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_FIRSTPAGENO, 1 ); @@ -329,9 +329,9 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) ppPoolDefaults[ ATTR_PAGE_HEADERSET - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_HEADERSET, aSetItemItemSet ); ppPoolDefaults[ ATTR_PAGE_FOOTERSET - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_FOOTERSET, aSetItemItemSet ); ppPoolDefaults[ ATTR_PAGE_FORMULAS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_FORMULAS, false ); - ppPoolDefaults[ ATTR_PAGE_NULLVALS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NULLVALS, sal_True ); + ppPoolDefaults[ ATTR_PAGE_NULLVALS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NULLVALS, true ); ppPoolDefaults[ ATTR_PAGE_SCALETO - ATTR_STARTINDEX ] = new ScPageScaleToItem( 1, 1 ); - ppPoolDefaults[ ATTR_HIDDEN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_HIDDEN, sal_False ); + ppPoolDefaults[ ATTR_HIDDEN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_HIDDEN, false ); SetDefaults( ppPoolDefaults ); diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 1226878f4c73..21599335030b 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -560,18 +560,18 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam) const bool bHasStar = false; sal_Int32 nIndex; if (( nIndex = aStr.indexOf('*') ) != -1) - bHasStar = sal_True; + bHasStar = true; if (bHasStar && (nIndex>0)) { for (sal_Int32 j=0;(j<nIndex) && (j< aCellStr.getLength()) ; j++) { if (aCellStr[j] == aStr[j]) { - bOk=1; + bOk=true; } else { - bOk=0; + bOk=false; break; } } diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 2371e4f87a5a..947bc1bf3603 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1084,7 +1084,7 @@ void ScDPSource::FillMemberResults() long nPos = 0; pColResRoot->FillMemberResults( pColResults, nPos, pResData->GetColStartMeasure(), - sal_True, NULL, NULL ); + true, NULL, NULL ); } FillLevelList( sheet::DataPilotFieldOrientation_ROW, aRowLevelList ); @@ -1098,7 +1098,7 @@ void ScDPSource::FillMemberResults() long nPos = 0; pRowResRoot->FillMemberResults( pRowResults, nPos, pResData->GetRowStartMeasure(), - sal_True, NULL, NULL ); + true, NULL, NULL ); } } } diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index d352861f21ed..b7aa8b505a2a 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -195,7 +195,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : pGlobalDrawPersist ? pGlobalDrawPersist : ( pDocument ? pDocument->GetDocumentShell() : NULL ), - sal_True ), // bUseExtColorTable (is set below) + true ), // bUseExtColorTable (is set below) aName( rName ), pDoc( pDocument ), pUndoGroup( NULL ), @@ -218,7 +218,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : } SetPropertyList( static_cast<XPropertyList *> (pXCol.get()) ); - SetSwapGraphics(sal_True); + SetSwapGraphics(true); SetScaleUnit(MAP_100TH_MM); SfxItemPool& rPool = GetItemPool(); @@ -1518,7 +1518,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const SCCOL nClipEndX; SCROW nClipEndY; pClipDoc->GetClipStart( nClipStartX, nClipStartY ); - pClipDoc->GetClipArea( nClipEndX, nClipEndY, sal_True ); + pClipDoc->GetClipArea( nClipEndX, nClipEndY, true ); nClipEndX = nClipEndX + nClipStartX; nClipEndY += nClipStartY; // GetClipArea returns the difference @@ -2064,7 +2064,7 @@ void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) void ScDrawLayer::SetChanged( sal_Bool bFlg /* = sal_True */ ) { if ( bFlg && pDoc ) - pDoc->SetChartListenerCollectionNeedsUpdate( sal_True ); + pDoc->SetChartListenerCollectionNeedsUpdate( true ); FmFormModel::SetChanged( bFlg ); } diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 05ac79c4b639..374c032f1ea9 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -955,7 +955,7 @@ void ScGlobal::OpenURL( const OUString& rURL, const OUString& rTarget ) SfxStringItem aReferer( SID_REFERER, aReferName ); SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, false ); - SfxBoolItem aBrowsing( SID_BROWSE, sal_True ); + SfxBoolItem aBrowsing( SID_BROWSE, true ); // kein SID_SILENT mehr diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 7c8c1467b6a6..33e6fd05b477 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -261,7 +261,7 @@ bool ScStyleSheet::IsUsed() const // Always query the document to let it decide if a rescan is necessary, // and store the state. ScDocument* pDoc = ((ScStyleSheetPool*)pPool)->GetDocument(); - if ( pDoc && pDoc->IsStyleSheetUsed( *this, sal_True ) ) + if ( pDoc && pDoc->IsStyleSheetUsed( *this, true ) ) eUsage = USED; else eUsage = NOTUSED; diff --git a/sc/source/core/opencl/opencl_device_selection.h b/sc/source/core/opencl/opencl_device_selection.h index 2712adcf288d..153c9549297c 100644 --- a/sc/source/core/opencl/opencl_device_selection.h +++ b/sc/source/core/opencl/opencl_device_selection.h @@ -460,7 +460,7 @@ inline ds_status readProfileFromFile(ds_profile* profile, ds_score_deserializer currentPosition = dataEnd + strlen(DS_TAG_VERSION_END); // parse the device information - while (1) + while (true) { unsigned int i; diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index f7693d8b0bc8..c73ba39747a4 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -370,7 +370,7 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx) } if ( clStatus != CL_SUCCESS ) { - return 0; + return false; } boost::scoped_array<char> buildLog(new char[length]); diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index ff43877e1b1d..6f37a7182e8f 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -325,7 +325,7 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start, * Invalid: 1.!a1 * Invalid: 1e!a1 */ - while( 1 ) + while( true ) { const sal_Unicode uc = *p; if( rtl::isAsciiAlpha( uc ) || uc == '_' ) diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx index 3232b0e6fb0a..bd5b0b96ab17 100644 --- a/sc/source/core/tool/adiasync.cxx +++ b/sc/source/core/tool/adiasync.cxx @@ -110,7 +110,7 @@ void ScAddInAsync::CallBack( sal_uLong nHandleP, void* pData ) OSL_FAIL( "unknown AsyncType" ); return; } - p->bValid = sal_True; + p->bValid = true; p->Broadcast( ScHint(SC_HINT_DATACHANGED, ScAddress()) ); for ( ScAddInDocs::iterator it = p->pDocs->begin(); it != p->pDocs->end(); ++it ) diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index 5c3a060d5d14..a5ad954231c1 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -60,7 +60,7 @@ void ScAppOptions::SetDefaults() nZoom = 100; eZoomType = SVX_ZOOM_PERCENT; - bSynchronizeZoom = sal_True; + bSynchronizeZoom = true; nStatusFunc = SUBTOTAL_FUNC_SUM; bAutoComplete = true; bDetectiveAuto = true; diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx index 7e3d5af94922..a4f8f9f876ca 100644 --- a/sc/source/core/tool/callform.cxx +++ b/sc/source/core/tool/callform.cxx @@ -240,7 +240,7 @@ bool InitExternalFunc(const OUString& rModuleName) eAsyncType ); pFuncCol->insert(pFuncData); } - bRet = sal_True; + bRet = true; } else delete pLib; diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 7a3e48515ddf..c0031483c1a3 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -115,7 +115,7 @@ bool lcl_AdjustRanges( ScRangeList& rRanges, SCTAB nSourceTab, SCTAB nDestTab, S //static sal_uInt16 ScChartHelper::DoUpdateAllCharts( ScDocument* pDoc ) { - return lcl_DoUpdateCharts( ScAddress(), pDoc, sal_True ); + return lcl_DoUpdateCharts( ScAddress(), pDoc, true ); } void ScChartHelper::AdjustRangesOfChartsOnDestinationPage( ScDocument* pSrcDoc, ScDocument* pDestDoc, const SCTAB nSrcTab, const SCTAB nDestTab ) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index ff1cbb1cdcac..62a37a7d2949 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -907,7 +907,7 @@ struct ConventionOOO_A1 : public Convention_A1 rBuffer.append( '.'); // need at least the sheet separator in ODF makeExternalSingleRefStr( rBuffer, rFileName, aLastTabName, rRef.Ref2, rPos, bDisplayTabName, bEncodeUrl); - } while (0); + } while (false); if (bODF) rBuffer.append( ']'); @@ -2701,7 +2701,7 @@ bool ScCompiler::IsReference( const OUString& rName ) // If sheet "1" exists and the expression is 1.E+2 continue as // usual, the ScRange/ScAddress parser will take care of it. } - } while(0); + } while(false); } if (IsSingleReference( rName)) diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx index 71792e6462c1..d82134f6a7b2 100644 --- a/sc/source/core/tool/consoli.cxx +++ b/sc/source/core/tool/consoli.cxx @@ -697,8 +697,8 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, ScComplexRefData aCRef; // Daten fuer Summen-Zellen aCRef.InitFlags(); - aCRef.Ref1.SetColRel(sal_True); aCRef.Ref1.SetRowRel(sal_True); aCRef.Ref1.SetTabRel(sal_True); - aCRef.Ref2.SetColRel(sal_True); aCRef.Ref2.SetRowRel(sal_True); aCRef.Ref2.SetTabRel(sal_True); + aCRef.Ref1.SetColRel(true); aCRef.Ref1.SetRowRel(true); aCRef.Ref1.SetTabRel(true); + aCRef.Ref2.SetColRel(true); aCRef.Ref2.SetRowRel(true); aCRef.Ref2.SetTabRel(true); for (nArrY=0; nArrY<nRowCount; nArrY++) { @@ -759,7 +759,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, // Gliederung einfuegen - ScOutlineArray* pOutArr = pDestDoc->GetOutlineTable( nTab, sal_True )->GetRowArray(); + ScOutlineArray* pOutArr = pDestDoc->GetOutlineTable( nTab, true )->GetRowArray(); SCROW nOutStart = nRow+nArrY; SCROW nOutEnd = nRow+nArrY+nNeeded-1; bool bSize = false; diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index e1448a00e000..b51608020655 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -812,7 +812,7 @@ sal_uInt16 ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetective if (pFCell->GetDirty()) pFCell->Interpret(); // nach SetRunning geht's nicht mehr! - pFCell->SetRunning(sal_True); + pFCell->SetRunning(true); sal_uInt16 nResult = DET_INS_EMPTY; @@ -901,7 +901,7 @@ sal_uInt16 ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, sal_uInt16 nL if (pFCell->GetDirty()) pFCell->Interpret(); // nach SetRunning geht's nicht mehr! - pFCell->SetRunning(sal_True); + pFCell->SetRunning(true); sal_uInt16 nResult = nLevel; sal_Bool bDelete = ( nDeleteLevel && nLevel == nDeleteLevel-1 ); @@ -959,7 +959,7 @@ sal_uInt16 ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiv if (pFCell->GetDirty()) pFCell->Interpret(); // nach SetRunning geht's nicht mehr! - pFCell->SetRunning(sal_True); + pFCell->SetRunning(true); sal_uInt16 nResult = DET_INS_EMPTY; diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index e7f73ca2a83f..c9d7e29e41fd 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -181,7 +181,7 @@ void ScQueryParamBase::FillInExcelSyntax( ScQueryEntry& rEntry = GetEntry(nIndex); ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); - rEntry.bDoQuery = sal_True; + rEntry.bDoQuery = true; // Operatoren herausfiltern if (aCellStr[0] == '<') { @@ -276,7 +276,7 @@ void ScQueryParam::Clear() nRow1=nRow2 = 0; nTab = SCTAB_MAX; bHasHeader = bCaseSens = bRegExp = false; - bInplace = bByRow = bDuplicate = sal_True; + bInplace = bByRow = bDuplicate = true; boost::ptr_vector<ScQueryEntry>::iterator itr = maEntries.begin(), itrEnd = maEntries.end(); for (; itr != itrEnd; ++itr) @@ -371,7 +371,7 @@ void ScQueryParam::MoveToDest() for (size_t i=0; i<n; i++) maEntries[i].nField += nDifX; - bInplace = sal_True; + bInplace = true; } else { diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 6130c614a138..d91e69c1fba7 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -112,7 +112,7 @@ ScRangeData::ScRangeData( ScDocument* pDok, { ScSingleRefData aRefData; aRefData.InitAddress( rTarget ); - aRefData.SetFlag3D( sal_True ); + aRefData.SetFlag3D( true ); pCode->AddSingleReference( aRefData ); ScCompiler aComp( pDoc, aPos, *pCode ); aComp.SetGrammar(pDoc->GetGrammar()); diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 1c0adc9ed999..09a60c63cc94 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -80,7 +80,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, case T_TABLE: { if( aDifParser.nVector != 0 || aDifParser.nVal != 1 ) - bSyntErrWarn = sal_True; + bSyntErrWarn = true; if( bData ) pDoc->RenameTab( nBaseTab, aData ); } @@ -100,7 +100,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, case T_DATA: { if( aDifParser.nVector != 0 || aDifParser.nVal != 0 ) - bSyntErrWarn = sal_True; + bSyntErrWarn = true; } break; case T_LABEL: @@ -203,7 +203,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, } } else - bOverflowWarn = sal_True; + bOverflowWarn = true; nColCnt++; break; diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 458ebcd9eb1a..6d925fb5122e 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -559,8 +559,8 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s case 0x6A: case 0x2A: // Deleted Cell Reference [323 273] // no information which part is deleted, set both - aSRD.SetColDeleted( sal_True ); - aSRD.SetRowDeleted( sal_True ); + aSRD.SetColDeleted( true ); + aSRD.SetRowDeleted( true ); } aStack << aPool.Store( aSRD ); @@ -598,10 +598,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s case 0x6B: case 0x2B: // Deleted Area Refernce [323 273] // no information which part is deleted, set all - rSRef1.SetColDeleted( sal_True ); - rSRef1.SetRowDeleted( sal_True ); - rSRef2.SetColDeleted( sal_True ); - rSRef2.SetRowDeleted( sal_True ); + rSRef1.SetColDeleted( true ); + rSRef1.SetRowDeleted( true ); + rSRef2.SetColDeleted( true ); + rSRef2.SetRowDeleted( true ); } aStack << aPool.Store( aCRD ); @@ -758,11 +758,11 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s case 0x7C: case 0x3C: // Deleted 3-D Cell Reference [ 277] // no information which part is deleted, set both - aSRD.SetColDeleted( sal_True ); - aSRD.SetRowDeleted( sal_True ); + aSRD.SetColDeleted( true ); + aSRD.SetRowDeleted( true ); } if ( !ValidTab(static_cast<SCTAB>(nTabFirst)) ) - aSRD.SetTabDeleted( sal_True ); + aSRD.SetTabDeleted( true ); if( nTabLast != nTabFirst ) { @@ -834,15 +834,15 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s case 0x7D: case 0x3D: // Deleted 3-D Area Reference [ 277] // no information which part is deleted, set all - rR1.SetColDeleted( sal_True ); - rR1.SetRowDeleted( sal_True ); - rR2.SetColDeleted( sal_True ); - rR2.SetRowDeleted( sal_True ); + rR1.SetColDeleted( true ); + rR1.SetRowDeleted( true ); + rR2.SetColDeleted( true ); + rR2.SetRowDeleted( true ); } if ( !ValidTab(static_cast<SCTAB>(nTabFirst)) ) - rR1.SetTabDeleted( sal_True ); + rR1.SetTabDeleted( true ); if ( !ValidTab(static_cast<SCTAB>(nTabLast)) ) - rR2.SetTabDeleted( sal_True ); + rR2.SetTabDeleted( true ); aStack << aPool.Store( aCRD ); }//END in current Workbook diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 8ec49043fea3..7cf904da09c8 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -509,8 +509,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, case 0x6A: case 0x2A: // Deleted Cell Reference [323 273] // no information which part is deleted, set both - aSRD.SetColDeleted( sal_True ); - aSRD.SetRowDeleted( sal_True ); + aSRD.SetColDeleted( true ); + aSRD.SetRowDeleted( true ); } aStack << aPool.Store( aSRD ); @@ -549,10 +549,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, case 0x6B: case 0x2B: // Deleted Area Refernce [323 273] // no information which part is deleted, set all - rSRef1.SetColDeleted( sal_True ); - rSRef1.SetRowDeleted( sal_True ); - rSRef2.SetColDeleted( sal_True ); - rSRef2.SetRowDeleted( sal_True ); + rSRef1.SetColDeleted( true ); + rSRef1.SetRowDeleted( true ); + rSRef2.SetColDeleted( true ); + rSRef2.SetRowDeleted( true ); } aStack << aPool.Store( aCRD ); @@ -781,8 +781,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, case 0x7C: case 0x3C: // Deleted 3-D Cell Reference [ 277] // no information which part is deleted, set both - aSRD.SetColDeleted( sal_True ); - aSRD.SetRowDeleted( sal_True ); + aSRD.SetColDeleted( true ); + aSRD.SetRowDeleted( true ); } if (aExtInfo.mbExternal) @@ -805,7 +805,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, else { if ( !ValidTab(nTabFirst)) - aSRD.SetTabDeleted( sal_True ); + aSRD.SetTabDeleted( true ); if( nTabLast != nTabFirst ) { @@ -860,10 +860,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, case 0x7D: case 0x3D: // Deleted 3-D Area Reference [ 277] // no information which part is deleted, set all - rR1.SetColDeleted( sal_True ); - rR1.SetRowDeleted( sal_True ); - rR2.SetColDeleted( sal_True ); - rR2.SetRowDeleted( sal_True ); + rR1.SetColDeleted( true ); + rR1.SetRowDeleted( true ); + rR2.SetColDeleted( true ); + rR2.SetRowDeleted( true ); } if (aExtInfo.mbExternal) @@ -873,9 +873,9 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, else { if ( !ValidTab(nTabFirst) ) - rR1.SetTabDeleted( sal_True ); + rR1.SetTabDeleted( true ); if ( !ValidTab(nTabLast) ) - rR2.SetTabDeleted( sal_True ); + rR2.SetTabDeleted( true ); aStack << aPool.Store( aCRD ); } diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index c0b7c9f6ec56..dbdf92c6d745 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -513,7 +513,7 @@ void XclImpAutoFilterData::InsertQueryParam() pCurrDBData->SetAdvancedQuerySource( &aAdvRange ); else { - pCurrDBData->SetAutoFilter( sal_True ); + pCurrDBData->SetAutoFilter( true ); SetCellAttribs(); } } @@ -733,7 +733,7 @@ void XclImpAutoFilterData::SetExtractPos( const ScAddress& rAddr ) aParam.nDestRow = rAddr.Row(); aParam.nDestTab = rAddr.Tab(); aParam.bInplace = false; - aParam.bDestPers = sal_True; + aParam.bDestPers = true; } void XclImpAutoFilterData::Apply() diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx index 8a9731d5dd30..ef068322fcd3 100644 --- a/sc/source/filter/excel/exctools.cxx +++ b/sc/source/filter/excel/exctools.cxx @@ -255,7 +255,7 @@ void ExcScenario::Apply( const XclImpRoot& rRoot, const sal_Bool bLast ) } if( bLast ) - r.SetActiveScenario( nNewTab, sal_True ); + r.SetActiveScenario( nNewTab, true ); // modify what the Active tab is set to if the new // scenario tab occurs before the active tab. diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 913d1ba7bdfc..d2075ee5c717 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -200,7 +200,7 @@ void ImportExcel::ReadFileSharing() if( (nRecommendReadOnly != 0) || (nPasswordHash != 0) ) { if( SfxItemSet* pItemSet = GetMedium().GetItemSet() ) - pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); + pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); if( SfxObjectShell* pShell = GetDocShell() ) { @@ -832,7 +832,7 @@ void ImportExcel::Bundleheader( void ) void ImportExcel::Standardwidth( void ) { sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(), GetCharWidth() ); - pColRowBuff->SetDefWidth( nScWidth, sal_True ); + pColRowBuff->SetDefWidth( nScWidth, true ); } @@ -1391,10 +1391,10 @@ XclImpOutlineDataBuffer::~XclImpOutlineDataBuffer() void XclImpOutlineDataBuffer::Convert() { - mxColOutlineBuff->SetOutlineArray( GetDoc().GetOutlineTable( mnScTab, sal_True )->GetColArray() ); + mxColOutlineBuff->SetOutlineArray( GetDoc().GetOutlineTable( mnScTab, true )->GetColArray() ); mxColOutlineBuff->MakeScOutline(); - mxRowOutlineBuff->SetOutlineArray( GetDoc().GetOutlineTable( mnScTab, sal_True )->GetRowArray() ); + mxRowOutlineBuff->SetOutlineArray( GetDoc().GetOutlineTable( mnScTab, true )->GetRowArray() ); mxRowOutlineBuff->MakeScOutline(); mxColRowBuff->ConvertHiddenFlags( mnScTab ); diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index fb07ddb8f1a7..54127be3284f 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -163,7 +163,7 @@ static void lcl_GetFromTo( const XclExpRoot& rRoot, const Rectangle &aRect, sal_ sal_Int32 nCol = 0, nRow = 0; sal_Int32 nColOff = 0, nRowOff= 0; - while(1) + while(true) { Rectangle r = rRoot.GetDocPtr()->GetMMRect( nCol,nRow,nCol,nRow,nTab ); if( !bTo ) diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index e08b6922a57f..7f451c0d7762 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -1267,7 +1267,7 @@ void XclExpXct::Save( XclExpStream& rStrm ) ::std::pair< SCCOL, SCCOL > aColRange = mxCacheTable->getColRange( nScRow ); for( SCCOL nScCol = aColRange.first; bValid && (nScCol < aColRange.second); ++nScCol ) { - if( maUsedCells.IsCellMarked( nScCol, nScRow, sal_True ) ) + if( maUsedCells.IsCellMarked( nScCol, nScRow, true ) ) { sal_uInt32 nScNumFmt = 0; ScExternalRefCache::TokenRef xToken = mxCacheTable->getCell( nScCol, nScRow, &nScNumFmt ); diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 7e650c6a986e..a1b4d05fbc70 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -247,7 +247,7 @@ void XclExpRoot::InitializeGlobals() ScCompiler aCompiler( &rDoc, ScAddress()); aCompiler.SetGrammar( rDoc.GetGrammar()); mrExpData.mxOpCodeMap = aCompiler.CreateOpCodeMap( aOpCodeMapping, true); - } while(0); + } while(false); } GetXFBuffer().Initialize(); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 8eadc5994065..8c54263594f7 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3253,10 +3253,10 @@ bool XclImpSimpleDffConverter::GetColorFromPalette( sal_uInt16 nIndex, Color& rC ColorData nColor = GetPalette().GetColorData( static_cast< sal_uInt16 >( nIndex ) ); if( nColor == COL_AUTO ) - return 0; + return false; rColor.SetColor( nColor ); - return 1; + return true; } XclImpDffConverter::XclImpDffConvData::XclImpDffConvData( diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 01b2ca665489..2ea0ed44d0dc 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -488,10 +488,10 @@ void XclImpPCField::ConvertDateGroupField( ScDPSaveData& rSaveData, const ScfStr ScDPNumGroupInfo XclImpPCField::GetScNumGroupInfo() const { ScDPNumGroupInfo aNumInfo; - aNumInfo.mbEnable = sal_True; + aNumInfo.mbEnable = true; aNumInfo.mbDateValues = false; - aNumInfo.mbAutoStart = sal_True; - aNumInfo.mbAutoEnd = sal_True; + aNumInfo.mbAutoStart = true; + aNumInfo.mbAutoEnd = true; if( const double* pfMinValue = GetNumGroupLimit( EXC_SXFIELD_INDEX_MIN ) ) { @@ -512,10 +512,10 @@ ScDPNumGroupInfo XclImpPCField::GetScNumGroupInfo() const ScDPNumGroupInfo XclImpPCField::GetScDateGroupInfo() const { ScDPNumGroupInfo aDateInfo; - aDateInfo.mbEnable = sal_True; + aDateInfo.mbEnable = true; aDateInfo.mbDateValues = false; - aDateInfo.mbAutoStart = sal_True; - aDateInfo.mbAutoEnd = sal_True; + aDateInfo.mbAutoStart = true; + aDateInfo.mbAutoEnd = true; if( const DateTime* pMinDate = GetDateGroupLimit( EXC_SXFIELD_INDEX_MIN ) ) { @@ -531,7 +531,7 @@ ScDPNumGroupInfo XclImpPCField::GetScDateGroupInfo() const if( const sal_Int16* pnStepValue = GetDateGroupStep() ) { aDateInfo.mfStep = *pnStepValue; - aDateInfo.mbDateValues = sal_True; + aDateInfo.mbDateValues = true; } return aDateInfo; diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx index 37c19bc4750f..57f028e4bc5e 100644 --- a/sc/source/filter/excel/xiview.cxx +++ b/sc/source/filter/excel/xiview.cxx @@ -218,7 +218,7 @@ void XclImpTabViewSettings::Finalize() // sheet flags if( maData.mbMirrored ) // do not call this function with sal_False, it would mirror away all drawing objects - rDoc.SetLayoutRTL( nScTab, sal_True ); + rDoc.SetLayoutRTL( nScTab, true ); rTabSett.mbSelected = maData.mbSelected || bDisplayed; // first visible cell in top-left pane and in additional pane(s) diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx index 83ca60e6a88b..dfe6b16dbd0d 100644 --- a/sc/source/filter/excel/xlpage.cxx +++ b/sc/source/filter/excel/xlpage.cxx @@ -258,7 +258,7 @@ void XclPageData::SetScPaperSize( const Size& rSize, bool bPortrait, bool bStric } } if( !bStrictSize ) - SetScPaperSize( rSize, bPortrait, sal_True ); + SetScPaperSize( rSize, bPortrait, true ); } // ============================================================================ diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index d19636a53a8b..84619233b924 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -1185,7 +1185,7 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData ) SfxItemSet aSet( rEngine.GetAttribs( aSel ) ); SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, false ); if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET ) - bFields = sal_True; + bFields = true; } if ( bFields ) { diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx index 77c7b57410ed..639e110b0eff 100644 --- a/sc/source/filter/lotus/memory.cxx +++ b/sc/source/filter/lotus/memory.cxx @@ -46,7 +46,7 @@ sal_Bool MemNew( void ) pValueFormCache = new FormCache( pDoc ); // fuer tool.cxx::PutFormString() - pAttrUnprot = new ScProtectionAttr( sal_True ); + pAttrUnprot = new ScProtectionAttr( true ); pAttrRight = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_RIGHT, ATTR_HOR_JUSTIFY ); pAttrLeft = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT, ATTR_HOR_JUSTIFY ); pAttrCenter = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ); diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index ed284fc14ca7..9276c1305bf9 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -242,7 +242,7 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_NUMBER, eLanguage ); aFormString = pFormTable->GenerateFormat(nIndex1, - eLanguage, sal_True, false, nL, 1); + eLanguage, true, false, nL, 1); break; case 0x05: // frei //fStandard;nL; @@ -267,7 +267,7 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_NUMBER, eLanguage ); aFormString = pFormTable->GenerateFormat(nIndex1, - eLanguage, false, sal_True, nSt, 1); + eLanguage, false, true, nSt, 1); break; case 0x01: // generelles Format //fStandard;nSt; @@ -577,7 +577,7 @@ sal_Bool RangeNameBufferWK3::FindAbs( const OUString& rRef, sal_uInt16& rIndex ) pRef->SetColRel( false ); pRef->SetRowRel( false ); - pRef->SetTabRel( sal_True ); + pRef->SetTabRel( true ); if( itr->bSingleRef ) pScTokenArray->AddSingleReference( *pRef ); @@ -586,7 +586,7 @@ sal_Bool RangeNameBufferWK3::FindAbs( const OUString& rRef, sal_uInt16& rIndex ) pRef = &itr->aScComplexRefDataRel.Ref2; pRef->SetColRel( false ); pRef->SetRowRel( false ); - pRef->SetTabRel( sal_True ); + pRef->SetTabRel( true ); pScTokenArray->AddDoubleReference( itr->aScComplexRefDataRel ); } diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx index 77dc5dca39fc..dbb5eb630c22 100644 --- a/sc/source/filter/qpro/qpro.cxx +++ b/sc/source/filter/qpro/qpro.cxx @@ -175,7 +175,7 @@ FltError ScQProReader::import( ScDocument *pDoc ) break; case 0x0001: // End of file - SetEof( sal_True ); + SetEof( true ); break; case 0x00ce:{ // Attribute cell diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 91399bbe5a8e..ccdeec502624 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -179,7 +179,7 @@ do { \ if (nRef < amt)\ return ret; \ nRef-=amt; \ -} while(0) +} while(false) ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, const FORMULA_TYPE /*eFT*/ ) { diff --git a/sc/source/filter/qpro/qprostyle.cxx b/sc/source/filter/qpro/qprostyle.cxx index 31843b9f3eb6..5837c658e102 100644 --- a/sc/source/filter/qpro/qprostyle.cxx +++ b/sc/source/filter/qpro/qprostyle.cxx @@ -125,7 +125,7 @@ void ScQProStyle::SetFormat( ScDocument *pDoc, sal_uInt8 nCol, sal_uInt16 nRow, if( nTmp & 0x80 ) { SfxBoolItem aWrapItem( ATTR_LINEBREAK ); - aWrapItem.SetValue( sal_True ); + aWrapItem.SetValue( true ); rItemSet.Put( aWrapItem ); } diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index ee1204c84763..79c06626b91a 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -314,7 +314,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu const ScStyleSheet* pStyleSheet = mpDoc->GetPattern( nCol, nRow, nTab )->GetStyleSheet(); aAttr.SetStyleSheet( (ScStyleSheet*)pStyleSheet ); - mpDoc->SetPattern( nCol, nRow, nTab, aAttr, sal_True ); + mpDoc->SetPattern( nCol, nRow, nTab, aAttr, true ); // Add data if (bSimple) diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx index eed1a785107a..95f5f7c36b87 100644 --- a/sc/source/filter/rtf/expbase.cxx +++ b/sc/source/filter/rtf/expbase.cxx @@ -46,7 +46,7 @@ sal_Bool ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol, SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const { pDoc->GetDataStart( nTab, nStartCol, nStartRow ); - pDoc->GetPrintArea( nTab, nEndCol, nEndRow, sal_True ); + pDoc->GetPrintArea( nTab, nEndCol, nEndRow, true ); return TrimDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ); } diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 93a1d4d158d9..5feae93e6978 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -876,9 +876,9 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) else aSetItemItemSet.Put( SvxSizeItem( ATTR_PAGE_SIZE, Size( 0, pPage->Bottom - pPage->Foot ) ) ); - aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_ON, sal_True )); + aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_ON, true )); aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_DYNAMIC, false )); - aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_SHARED, sal_True )); + aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_SHARED, true )); pSet->Put( SvxSetItem( nHeadFoot ? ATTR_PAGE_FOOTERSET : ATTR_PAGE_HEADERSET, aSetItemItemSet ) ); @@ -1392,7 +1392,7 @@ void Sc10Import::LoadDataBaseCollection() ( SCROW ) pOldData->DataBaseRec.Block.y1, ( SCCOL ) pOldData->DataBaseRec.Block.x2, ( SCROW ) pOldData->DataBaseRec.Block.y2, - sal_True, + true, ( sal_Bool) pOldData->DataBaseRec.RowHeader ); pDoc->GetDBCollection()->getNamedDBs().insert(pNewData); } diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index d693243406ea..8ab2ede59407 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -63,7 +63,7 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStrea pChangeTrack = new ScChangeTrack( GetDocPtr() ); sOldUsername = pChangeTrack->GetUser(); - pChangeTrack->SetUseFixDateTime( sal_True ); + pChangeTrack->SetUseFixDateTime( true ); ReadRecords(); } diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 88f722e316e4..d35274cf0c87 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1248,7 +1248,7 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, ScGlobal::pLocaleData->getNumDecimalSep()[0], - sal_True ); + true ); } else sText = rDoc.GetString(nCol, nRow, nTab); diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index d8c9ff5b6c79..241151360b0a 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -96,7 +96,7 @@ public: // IMPORT: Formulas static void ParseFormula( OUString& sFormula, - const bool bIsFormula = sal_True); + const bool bIsFormula = true); // EXPORT: Core Date Time static void ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate); static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index f76217b6f4cb..a92262abca3e 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -96,7 +96,7 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, //if we have the flat filter we need to set the dirty flag thus the visible charts get repainted //otherwise the charts keep their first visual representation which was created at a moment where the calc itself was not loaded completely and is incorect therefor if( (rImport.getImportFlags() & IMPORT_ALL) == IMPORT_ALL ) - pCL->SetDirty( sal_True ); + pCL->SetDirty( true ); else { // #i104899# If a formula cell is already dirty, further changes aren't propagated. diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index 9116ff86973b..988d7335566d 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -104,7 +104,7 @@ void ScXMLTableSourceContext::EndElement() { ScXMLImport::MutexGuard aGuard(GetScImport()); if (pDoc->RenameTab( GetScImport().GetTables().GetCurrentSheet(), - GetScImport().GetTables().GetCurrentSheetName(), false, sal_True)) + GetScImport().GetTables().GetCurrentSheetName(), false, true)) { sLink = ScGlobal::GetAbsDocName( sLink, pDoc->GetDocumentShell() ); if (sFilterName.isEmpty()) diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 85b5f868518b..bbe03bc13fa3 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -541,7 +541,7 @@ ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, pChangeTrackingImportHelper(pTempChangeTrackingImportHelper) { rImport.LockSolarMutex(); - pChangeTrackingImportHelper->SetChangeTrack(sal_True); + pChangeTrackingImportHelper->SetChangeTrack(true); sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 05d5735cdd58..0936c635f33c 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2932,7 +2932,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe FillColumnRowGroups(); if (bHasColumnHeader) pSharedData->SetLastColumn(nTable, aColumnHeaderRange.EndColumn); - bRowHeaderOpen = sal_False; + bRowHeaderOpen = false; if (bHasRowHeader) pSharedData->SetLastRow(nTable, aRowHeaderRange.EndRow); pDefaults->FillDefaultStyles(nTable, pSharedData->GetLastRow(nTable), @@ -2950,7 +2950,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe { ExportFormatRanges(0, 0, aCell.aCellAddress.Column - 1, aCell.aCellAddress.Row, nTable); aPrevCell = aCell; - bIsFirst = sal_False; + bIsFirst = false; } else { @@ -3729,7 +3729,7 @@ void ScXMLExport::SetRepeatAttribute(sal_Int32 nEqualCellCount, bool bIncProgres OUString sOUEqualCellCount(OUString::number(nTemp)); AddAttribute(sAttrColumnsRepeated, sOUEqualCellCount); if (bIncProgress) - IncrementProgressBar(sal_False, nEqualCellCount); + IncrementProgressBar(false, nEqualCellCount); } } diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index 4ddf05d323c8..13d6d2d598ed 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -147,7 +147,7 @@ ScXMLNamedRangeContext::ScXMLNamedRangeContext( break; } } - pNamedExpression->bIsExpression = sal_False; + pNamedExpression->bIsExpression = false; mpInserter->insert(pNamedExpression); } diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index f905a5e6aa3b..bd15eb289712 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -691,7 +691,7 @@ SvXMLStyleContext *XMLTableStylesContext::CreateDefaultStyleStyleChildContext( { case XML_STYLE_FAMILY_TABLE_CELL: pStyle = new XMLTableStyleContext( GetScImport(), nPrefix, rLocalName, - xAttrList, *this, nFamily, sal_True); + xAttrList, *this, nFamily, true); break; case XML_STYLE_FAMILY_SD_GRAPHICS_ID: pStyle = new XMLGraphicsDefaultStyle( GetScImport(), nPrefix, rLocalName, diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index e0fc4c816ccc..e30a4da575ff 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -596,9 +596,9 @@ sal_Bool ScAccessibleCell::IsDropdown() SCTAB i; ScMarkData aMarks; for (i=nTab+1; i<nTabCount && mpDoc->IsScenario(i); i++) - mpDoc->MarkScenario( i, nTab, aMarks, sal_False, SC_SCENARIO_SHOWFRAME ); + mpDoc->MarkScenario( i, nTab, aMarks, false, SC_SCENARIO_SHOWFRAME ); ScRangeList aRanges; - aMarks.FillRangeListWithMarks( &aRanges, sal_False ); + aMarks.FillRangeListWithMarks( &aRanges, false ); sal_Bool bHasScenario; SCTAB nRangeCount = aRanges.size(); for (i=0; i<nRangeCount; i++) diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 62e5e1c13017..89a720e5f391 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -486,7 +486,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint { mpMarkedRanges = new ScRangeList(); } - refScMarkData.FillRangeListWithMarks(mpMarkedRanges, sal_True); + refScMarkData.FillRangeListWithMarks(mpMarkedRanges, true); //For Whole Col Row sal_Bool bWholeRow = ::labs(aMarkRange.aStart.Row() - aMarkRange.aEnd.Row()) == MAXROW ; @@ -728,8 +728,8 @@ void ScAccessibleSpreadsheet::RemoveSelection(ScMarkData &refScMarkData) MAP_ADDR_XACC::iterator miRemove = m_mapSelectionSend.begin(); for(; miRemove != m_mapSelectionSend.end() ;) { - if (refScMarkData.IsCellMarked(miRemove->first.Col(),miRemove->first.Row(),sal_True) || - refScMarkData.IsCellMarked(miRemove->first.Col(),miRemove->first.Row(),sal_False) ) + if (refScMarkData.IsCellMarked(miRemove->first.Col(),miRemove->first.Row(),true) || + refScMarkData.IsCellMarked(miRemove->first.Col(),miRemove->first.Row(),false) ) { ++miRemove; continue; @@ -1253,8 +1253,8 @@ void ScAccessibleSpreadsheet::SelectCell(sal_Int32 nRow, sal_Int32 nCol, sal_Boo } mpViewShell->SetTabNo( maRange.aStart.Tab() ); - mpViewShell->DoneBlockMode( sal_True ); // continue selecting - mpViewShell->InitBlockMode( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), maRange.aStart.Tab(), bDeselect, sal_False, sal_False ); + mpViewShell->DoneBlockMode( true ); // continue selecting + mpViewShell->InitBlockMode( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), maRange.aStart.Tab(), bDeselect, false, false ); mpViewShell->SelectionChanged(); } @@ -1477,9 +1477,9 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row ) } mpViewShell->SetTabNo( maRange.aStart.Tab() ); - mpViewShell->DoneBlockMode( sal_True ); // continue selecting - mpViewShell->InitBlockMode( 0, row, maRange.aStart.Tab(), sal_False, sal_False, sal_True ); - mpViewShell->MarkCursor( MAXCOL, row, maRange.aStart.Tab(), sal_False, sal_True ); + mpViewShell->DoneBlockMode( true ); // continue selecting + mpViewShell->InitBlockMode( 0, row, maRange.aStart.Tab(), false, false, true ); + mpViewShell->MarkCursor( MAXCOL, row, maRange.aStart.Tab(), false, true ); mpViewShell->SelectionChanged(); return sal_True; } @@ -1493,9 +1493,9 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column ) } mpViewShell->SetTabNo( maRange.aStart.Tab() ); - mpViewShell->DoneBlockMode( sal_True ); // continue selecting - mpViewShell->InitBlockMode( static_cast<SCCOL>(column), 0, maRange.aStart.Tab(), sal_False, sal_True, sal_False ); - mpViewShell->MarkCursor( static_cast<SCCOL>(column), MAXROW, maRange.aStart.Tab(), sal_True, sal_False ); + mpViewShell->DoneBlockMode( true ); // continue selecting + mpViewShell->InitBlockMode( static_cast<SCCOL>(column), 0, maRange.aStart.Tab(), false, true, false ); + mpViewShell->MarkCursor( static_cast<SCCOL>(column), MAXROW, maRange.aStart.Tab(), true, false ); mpViewShell->SelectionChanged(); return sal_True; } @@ -1509,11 +1509,11 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( sal_Int32 row ) } mpViewShell->SetTabNo( maRange.aStart.Tab() ); - mpViewShell->DoneBlockMode( sal_True ); // continue selecting - mpViewShell->InitBlockMode( 0, row, maRange.aStart.Tab(), sal_False, sal_False, sal_True, sal_True ); - mpViewShell->MarkCursor( MAXCOL, row, maRange.aStart.Tab(), sal_False, sal_True ); + mpViewShell->DoneBlockMode( true ); // continue selecting + mpViewShell->InitBlockMode( 0, row, maRange.aStart.Tab(), false, false, true, true ); + mpViewShell->MarkCursor( MAXCOL, row, maRange.aStart.Tab(), false, true ); mpViewShell->SelectionChanged(); - mpViewShell->DoneBlockMode( sal_True ); + mpViewShell->DoneBlockMode( true ); return sal_True; } @@ -1526,11 +1526,11 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectColumn( sal_Int32 column ) } mpViewShell->SetTabNo( maRange.aStart.Tab() ); - mpViewShell->DoneBlockMode( sal_True ); // continue selecting - mpViewShell->InitBlockMode( static_cast<SCCOL>(column), 0, maRange.aStart.Tab(), sal_False, sal_True, sal_False, sal_True ); - mpViewShell->MarkCursor( static_cast<SCCOL>(column), MAXROW, maRange.aStart.Tab(), sal_True, sal_False ); + mpViewShell->DoneBlockMode( true ); // continue selecting + mpViewShell->InitBlockMode( static_cast<SCCOL>(column), 0, maRange.aStart.Tab(), false, true, false, true ); + mpViewShell->MarkCursor( static_cast<SCCOL>(column), MAXROW, maRange.aStart.Tab(), true, false ); mpViewShell->SelectionChanged(); - mpViewShell->DoneBlockMode( sal_True ); + mpViewShell->DoneBlockMode( true ); return sal_True; } diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index e175839bccba..6b710231e8df 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3321,7 +3321,7 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, bool bStartEdit /* = false // #i114511# don't count cursor keys as modification sal_Bool bSetModified = !bCursorKey; - DataChanged(sal_False, bSetModified); // also calls UpdateParenthesis() + DataChanged(false, bSetModified); // also calls UpdateParenthesis() InvalidateAttribs(); //! in DataChanged ? } } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index a57d453c54de..3bc555c6122d 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1659,7 +1659,7 @@ void ScTextWnd::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) { if ( pEditView ) { - CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, sal_True ); + CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, true ); pEditView->Command( aDragEvent ); // handling of d&d to different view (CancelHandler) can't be done here, @@ -1835,7 +1835,7 @@ IMPL_LINK_NOARG(ScTextWnd, NotifyHdl) // while an InputHandler method is modifying the EditEngine content if ( pHdl && !pHdl->IsInOwnChange() ) - pHdl->InputChanged( pEditView, sal_True ); // #i20282# InputChanged must know if called from modify handler + pHdl->InputChanged( pEditView, true ); // #i20282# InputChanged must know if called from modify handler } return 0; @@ -2466,7 +2466,7 @@ void ScPosWnd::DoEnter() } SfxStringItem aPosItem( SID_CURRENTCELL, aText ); - SfxBoolItem aUnmarkItem( FN_PARAM_1, sal_True ); // remove existing selection + SfxBoolItem aUnmarkItem( FN_PARAM_1, true ); // remove existing selection pViewSh->GetViewData()->GetDispatcher().Execute( SID_CURRENTCELL, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index d5ab38f069e3..13b7a6505497 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1017,19 +1017,19 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) { PutItem( *pItem ); pAppCfg->SetAppMetric( (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue() ); - bSaveAppOptions = sal_True; + bSaveAppOptions = true; } if (rOptSet.HasItem(SCITEM_USERLIST, &pItem)) { ScGlobal::SetUserList( ((const ScUserListItem*)pItem)->GetUserList() ); - bSaveAppOptions = sal_True; + bSaveAppOptions = true; } if (rOptSet.HasItem(SID_SC_OPT_SYNCZOOM, &pItem)) { pAppCfg->SetSynchronizeZoom( static_cast<const SfxBoolItem*>(pItem)->GetValue() ); - bSaveAppOptions = sal_True; + bSaveAppOptions = true; } if (rOptSet.HasItem(SID_SC_OPT_KEY_BINDING_COMPAT, &pItem)) @@ -1104,7 +1104,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pViewData->SetOptions( rNewOpt ); // veraendert rOldOpt pViewData->GetDocument()->SetViewOptions( rNewOpt ); pDocSh->SetDocumentModified(); - bRepaint = sal_True; + bRepaint = true; } if ( bAnchorList ) pViewSh->UpdateAnchorHandles(); @@ -1138,7 +1138,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pViewData->SetOptions( aNewViewOpt ); pViewData->GetDocument()->SetViewOptions( aNewViewOpt ); pDocSh->SetDocumentModified(); - bRepaint = sal_True; + bRepaint = true; } } ScViewOptions aNewViewOpt ( GetViewOptions() ); @@ -1245,38 +1245,38 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) if ( rOptSet.HasItem(SID_SC_INPUT_SELECTIONPOS,&pItem) ) { pInputCfg->SetMoveDir( ((const SfxUInt16Item*)pItem)->GetValue() ); - bSaveInputOptions = sal_True; + bSaveInputOptions = true; } if ( rOptSet.HasItem(SID_SC_INPUT_SELECTION,&pItem) ) { pInputCfg->SetMoveSelection( ((const SfxBoolItem*)pItem)->GetValue() ); - bSaveInputOptions = sal_True; + bSaveInputOptions = true; } if ( rOptSet.HasItem(SID_SC_INPUT_EDITMODE,&pItem) ) { pInputCfg->SetEnterEdit( ((const SfxBoolItem*)pItem)->GetValue() ); - bSaveInputOptions = sal_True; + bSaveInputOptions = true; } if ( rOptSet.HasItem(SID_SC_INPUT_FMT_EXPAND,&pItem) ) { pInputCfg->SetExtendFormat( ((const SfxBoolItem*)pItem)->GetValue() ); - bSaveInputOptions = sal_True; + bSaveInputOptions = true; } if ( rOptSet.HasItem(SID_SC_INPUT_RANGEFINDER,&pItem) ) { pInputCfg->SetRangeFinder( ((const SfxBoolItem*)pItem)->GetValue() ); - bSaveInputOptions = sal_True; + bSaveInputOptions = true; } if ( rOptSet.HasItem(SID_SC_INPUT_REF_EXPAND,&pItem) ) { pInputCfg->SetExpandRefs( ((const SfxBoolItem*)pItem)->GetValue() ); - bSaveInputOptions = sal_True; + bSaveInputOptions = true; } if ( rOptSet.HasItem(SID_SC_INPUT_MARK_HEADER,&pItem) ) { pInputCfg->SetMarkHeader( ((const SfxBoolItem*)pItem)->GetValue() ); - bSaveInputOptions = sal_True; - bUpdateMarks = sal_True; + bSaveInputOptions = true; + bUpdateMarks = true; } if ( rOptSet.HasItem(SID_SC_INPUT_TEXTWYSIWYG,&pItem) ) { @@ -1284,20 +1284,20 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) if ( bNew != pInputCfg->GetTextWysiwyg() ) { pInputCfg->SetTextWysiwyg( bNew ); - bSaveInputOptions = sal_True; - bUpdateRefDev = sal_True; + bSaveInputOptions = true; + bUpdateRefDev = true; } } if( rOptSet.HasItem( SID_SC_INPUT_REPLCELLSWARN, &pItem ) ) { pInputCfg->SetReplaceCellsWarn( ((const SfxBoolItem*)pItem)->GetValue() ); - bSaveInputOptions = sal_True; + bSaveInputOptions = true; } if( rOptSet.HasItem( SID_SC_INPUT_LEGACY_CELL_SELECTION, &pItem ) ) { pInputCfg->SetLegacyCellSelection( ((const SfxBoolItem*)pItem)->GetValue() ); - bSaveInputOptions = sal_True; + bSaveInputOptions = true; } //============================================ diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 76625d0f4802..20e5e2b38955 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -442,7 +442,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) pOldEntry->MoveTo( aStart.Tab(), aStart.Col(), aStart.Row(), aEnd.Col(), aEnd.Row() ); - pOldEntry->SetByRow( sal_True ); + pOldEntry->SetByRow( true ); pOldEntry->SetHeader( m_pBtnHeader->IsChecked() ); pOldEntry->SetDoSize( m_pBtnDoSize->IsChecked() ); pOldEntry->SetKeepFmt( m_pBtnKeepFmt->IsChecked() ); @@ -455,7 +455,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) ScDBData* pNewEntry = new ScDBData( aNewName, aStart.Tab(), aStart.Col(), aStart.Row(), aEnd.Col(), aEnd.Row(), - sal_True, m_pBtnHeader->IsChecked() ); + true, m_pBtnHeader->IsChecked() ); pNewEntry->SetDoSize( m_pBtnDoSize->IsChecked() ); pNewEntry->SetKeepFmt( m_pBtnKeepFmt->IsChecked() ); pNewEntry->SetStripData( m_pBtnStripData->IsChecked() ); diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 6adbb22c684b..adfb9dbccf78 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -197,7 +197,7 @@ ScDPNumGroupDlg::ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ScDPNumGroupInfo ScDPNumGroupDlg::GetGroupInfo() const { ScDPNumGroupInfo aInfo; - aInfo.mbEnable = sal_True; + aInfo.mbEnable = true; aInfo.mbDateValues = false; aInfo.mbAutoStart = maStartHelper.IsAuto(); aInfo.mbAutoEnd = maEndHelper.IsAuto(); @@ -294,7 +294,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent, ScDPNumGroupInfo ScDPDateGroupDlg::GetGroupInfo() const { ScDPNumGroupInfo aInfo; - aInfo.mbEnable = sal_True; + aInfo.mbEnable = true; aInfo.mbDateValues = maRbNumDays.IsChecked(); aInfo.mbAutoStart = maStartHelper.IsAuto(); aInfo.mbAutoEnd = maEndHelper.IsAuto(); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 245f36ba52d1..c2bf54e1bd89 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -247,7 +247,7 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, ScDocument* pDoc = pImpl->m_pDocSh->GetDocument(); sal_Bool bUndo (pDoc->IsUndoEnabled()); - pDoc->SetInLinkUpdate( sal_True ); + pDoc->SetInLinkUpdate( true ); // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen if ( rNewFilter != aFilterName ) diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 13f42cabf304..6f94dc951f35 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -78,7 +78,7 @@ bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange, sal_ bool bCompile = !pDoc->IsImportingXML(); bool bOk; if ( bCompile ) - pDoc->CompileDBFormula( sal_True ); // CreateFormulaString + pDoc->CompileDBFormula( true ); // CreateFormulaString if ( rName == STR_DB_LOCAL_NONAME ) { pDoc->SetAnonymousDBData(rRange.aStart.Tab() , pNew); @@ -283,7 +283,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo 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 ); @@ -320,7 +320,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo 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 ); @@ -329,7 +329,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo 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 ); @@ -350,7 +350,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo { // Sortieren ohne SubTotals - aSubTotalParam.bRemoveOnly = sal_True; // wird unten wieder zurueckgesetzt + aSubTotalParam.bRemoveOnly = true; // wird unten wieder zurueckgesetzt DoSubTotals( nTab, aSubTotalParam, NULL, false, bApi ); } @@ -392,7 +392,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo if (bQuerySize) { ScDBData* pDest = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow, - aQueryParam.nDestTab, sal_True ); + aQueryParam.nDestTab, true ); if (pDest) { pDest->GetArea( aNewQuery ); @@ -414,7 +414,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo rDocShell.PostPaint(ScRange(0, 0, nTab, MAXCOL, MAXROW, nTab), PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE); - bDone = sal_True; + bDone = true; } else if (!bApi) // "Keine Operationen auszufuehren" rDocShell.ErrorMessage(STR_MSSG_REPEATDB_0); @@ -463,7 +463,7 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, nTab = rSortParam.nDestTab; pDestData = pDoc->GetDBAtCursor( rSortParam.nDestCol, rSortParam.nDestRow, - rSortParam.nDestTab, sal_True ); + rSortParam.nDestTab, true ); if (pDestData) pDestData->GetArea(aOldDest); } @@ -516,7 +516,7 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); // Zeilenhoehen immer (wegen automatischer Anpassung) //! auf ScBlockUndo umstellen - pUndoDoc->InitUndo( pDoc, nTab, nTab, false, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, false, true ); /* #i59745# Do not copy note captions to undo document. All existing caption objects will be repositioned while sorting which is tracked @@ -698,7 +698,7 @@ sal_Bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, SCSIZE nEC = aOldQuery.GetEntryCount(); for (SCSIZE i=0; i<nEC; i++) aOldQuery.GetEntry(i).bDoQuery = false; - aOldQuery.bDuplicate = sal_True; + aOldQuery.bDuplicate = true; Query( nTab, aOldQuery, NULL, bRecord, bApi ); } } @@ -736,7 +736,7 @@ sal_Bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, } pDestData = pDoc->GetDBAtCursor( rQueryParam.nDestCol, rQueryParam.nDestRow, - rQueryParam.nDestTab, sal_True ); + rQueryParam.nDestTab, true ); if (pDestData) { pDestData->GetArea( aOldDest ); @@ -792,7 +792,7 @@ sal_Bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); if (bCopy) { - pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab, false, sal_True ); + pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab, false, true ); pDoc->CopyToDocument( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab, aLocalParam.nCol2, aLocalParam.nRow2, nDestTab, IDF_ALL, false, pUndoDoc ); @@ -806,7 +806,7 @@ sal_Bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, } else { - pUndoDoc->InitUndo( pDoc, nTab, nTab, false, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, false, true ); pDoc->CopyToDocument( 0, rQueryParam.nRow1, nTab, MAXCOL, rQueryParam.nRow2, nTab, IDF_NONE, false, pUndoDoc ); } @@ -835,7 +835,7 @@ sal_Bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, aAttribRange.aEnd.SetCol( aAttribRange.aEnd.Col() + nFormulaCols ); pAttribDoc = new ScDocument( SCDOCMODE_UNDO ); - pAttribDoc->InitUndo( pDoc, nDestTab, nDestTab, false, sal_True ); + pAttribDoc->InitUndo( pDoc, nDestTab, nDestTab, false, true ); pDoc->CopyToDocument( aAttribRange, IDF_ATTRIB, false, pAttribDoc ); } @@ -1086,7 +1086,7 @@ sal_Bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, 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 ); } diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 27ebd6f663e7..2e7adec708c9 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -600,8 +600,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, if( !bAddrInsert ) // update database range { pDBData->SetImportParam( rParam ); - pDBData->SetHeader( sal_True ); - pDBData->SetByRow( sal_True ); + pDBData->SetHeader( true ); + pDBData->SetByRow( true ); pDBData->SetArea( nTab, rParam.nCol1,rParam.nRow1, nEndCol,nEndRow ); pDBData->SetImportSelection( bRealSelection ); pDoc->CompileDBFormula(); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index a460294ca484..7f364f165799 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -605,7 +605,7 @@ sal_Bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags, ScRange aExtendedRange(aMarkRange); if (!bSimple) { - if ( pDoc->ExtendMerge( aExtendedRange, sal_True ) ) + if ( pDoc->ExtendMerge( aExtendedRange, true ) ) bMulti = false; } @@ -730,7 +730,7 @@ sal_Bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType, ScRange aCopyRange = aMarkRange; aCopyRange.aStart.SetTab(0); aCopyRange.aEnd.SetTab(nTabCount-1); - pDoc->CopyToDocument( aCopyRange, IDF_CONTENTS, sal_True, pUndoDoc, &aMultiMark ); + pDoc->CopyToDocument( aCopyRange, IDF_CONTENTS, true, pUndoDoc, &aMultiMark ); rDocShell.GetUndoManager()->AddUndoAction( new ScUndoTransliterate( &rDocShell, aMultiMark, pUndoDoc, nType ) ); @@ -1095,7 +1095,7 @@ bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, if ( aPattern.GetItemSet().Count() > 0 ) { ScMarkData aMark; - aMark.SelectTable( rPos.Tab(), sal_True ); + aMark.SelectTable( rPos.Tab(), true ); aMark.SetMarkArea( ScRange( rPos ) ); ApplyAttributes( aMark, aPattern, sal_True, bApi ); } @@ -2549,7 +2549,7 @@ sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos ScMarkData aSourceMark; for (nTab=nStartTab; nTab<=nEndTab; nTab++) - aSourceMark.SelectTable( nTab, sal_True ); // Source selektieren + aSourceMark.SelectTable( nTab, true ); // Source selektieren aSourceMark.SetMarkArea( rSource ); ScDocShellRef aDragShellRef; @@ -2683,7 +2683,7 @@ sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos for (nTab=nStartTab; nTab<=nEndTab; nTab++) { pDoc->DeleteAreaTab( nStartCol,nStartRow, nOldEndCol,nOldEndRow, nTab, IDF_ALL ); - aDelMark.SelectTable( nTab, sal_True ); + aDelMark.SelectTable( nTab, true ); } pDoc->DeleteObjectsInArea( nStartCol,nStartRow, nOldEndCol,nOldEndRow, aDelMark ); @@ -2699,7 +2699,7 @@ sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos { SCCOL nTmpEndCol = nEndCol; SCROW nTmpEndRow = nEndRow; - pDoc->ExtendMerge( nStartCol, nStartRow, nTmpEndCol, nTmpEndRow, nTab, sal_True ); + pDoc->ExtendMerge( nStartCol, nStartRow, nTmpEndCol, nTmpEndRow, nTab, true ); } // Fehlermeldung erst nach dem Wiederherstellen des Inhalts @@ -2720,7 +2720,7 @@ sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos ScMarkData aDestMark; for (nTab=nDestTab; nTab<=nDestEndTab; nTab++) - aDestMark.SelectTable( nTab, sal_True ); // Destination selektieren + aDestMark.SelectTable( nTab, true ); // Destination selektieren aDestMark.SetMarkArea( aPasteDest ); /* Do not drawing objects here. While pasting, the @@ -2728,7 +2728,7 @@ sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos ScDrawLayer::MoveCells() which may move away inserted objects to wrong positions (e.g. if source and destination range overlaps).*/ pDoc->CopyFromClip( aPasteDest, aDestMark, IDF_ALL & ~(IDF_OBJECTS), - pRefUndoDoc, pClipDoc, sal_True, false, bIncludeFiltered ); + pRefUndoDoc, pClipDoc, true, false, bIncludeFiltered ); // skipped rows and merged cells don't mix @@ -2745,7 +2745,7 @@ sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos clipdoc does not contain a drawing layer.*/ if ( pClipDoc->GetDrawLayer() ) pDoc->CopyFromClip( aPasteDest, aDestMark, IDF_OBJECTS, - pRefUndoDoc, pClipDoc, sal_True, false, bIncludeFiltered ); + pRefUndoDoc, pClipDoc, true, false, bIncludeFiltered ); if (bRecord) { @@ -2775,7 +2775,7 @@ sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos { SCCOL nTmpEndCol = nDestEndCol; SCROW nTmpEndRow = nDestEndRow; - pDoc->ExtendMerge( nDestCol, nDestRow, nTmpEndCol, nTmpEndRow, nTab, sal_True ); + pDoc->ExtendMerge( nDestCol, nDestRow, nTmpEndCol, nTmpEndRow, nTab, true ); if (nTmpEndCol > nDestPaintEndCol) nDestPaintEndCol = nTmpEndCol; if (nTmpEndRow > nDestPaintEndRow) nDestPaintEndRow = nTmpEndRow; } @@ -3032,7 +3032,7 @@ sal_Bool ScDocFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool /* bApi pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); SCTAB nCount = pDoc->GetTableCount(); - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True ); // nur nTab mit Flags + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, true ); // nur nTab mit Flags pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,false, pUndoDoc ); @@ -3047,7 +3047,7 @@ sal_Bool ScDocFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool /* bApi if ( pDoc->IsScenario(nTab) ) { - pUndoDoc->SetScenario( nTab, sal_True ); + pUndoDoc->SetScenario( nTab, true ); OUString aComment; Color aColor; sal_uInt16 nScenFlags; @@ -3391,12 +3391,12 @@ sal_Bool ScDocFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOL pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); if (bWidth) { - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, false ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, false ); pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab, static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, false, pUndoDoc ); } else { - pUndoDoc->InitUndo( pDoc, nTab, nTab, false, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, false, true ); pDoc->CopyToDocument( 0, static_cast<SCROW>(nStart), nTab, MAXCOL, static_cast<SCROW>(nEnd), nTab, IDF_NONE, false, pUndoDoc ); } @@ -3441,7 +3441,7 @@ sal_Bool ScDocFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOL aProv.GetPPTX(), aProv.GetPPTY(), aOne, aOne, bAll ); if (bAll) - pDoc->ShowRows( nStartNo, nEndNo, nTab, sal_True ); + pDoc->ShowRows( nStartNo, nEndNo, nTab, true ); // Manual-Flag wird bei bAll=sal_True schon in SetOptimalHeight gesetzt // (an bei Extra-Height, sonst aus). @@ -3451,14 +3451,14 @@ sal_Bool ScDocFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOL if (nSizeTwips) { pDoc->SetRowHeightRange( nStartNo, nEndNo, nTab, nSizeTwips ); - pDoc->SetManualHeight( nStartNo, nEndNo, nTab, sal_True ); // height was set manually + pDoc->SetManualHeight( nStartNo, nEndNo, nTab, true ); // height was set manually } if ( eMode != SC_SIZE_ORIGINAL ) pDoc->ShowRows( nStartNo, nEndNo, nTab, nSizeTwips != 0 ); } else if ( eMode==SC_SIZE_SHOW ) { - pDoc->ShowRows( nStartNo, nEndNo, nTab, sal_True ); + pDoc->ShowRows( nStartNo, nEndNo, nTab, true ); } } else // Spaltenbreiten @@ -3845,7 +3845,7 @@ sal_Bool ScDocFunc::ClearItems( const ScMarkData& rMark, const sal_uInt16* pWhic ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab ); - pDoc->CopyToDocument( aMarkRange, IDF_ATTRIB, sal_True, pUndoDoc, (ScMarkData*)&aMultiMark ); + pDoc->CopyToDocument( aMarkRange, IDF_ATTRIB, true, pUndoDoc, (ScMarkData*)&aMultiMark ); rDocShell.GetUndoManager()->AddUndoAction( new ScUndoClearItems( &rDocShell, aMultiMark, pUndoDoc, pWhich ) ); @@ -3893,7 +3893,7 @@ sal_Bool ScDocFunc::ChangeIndent( const ScMarkData& rMark, sal_Bool bIncrement, ScRange aCopyRange = aMarkRange; aCopyRange.aStart.SetTab(0); aCopyRange.aEnd.SetTab(nTabCount-1); - pDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_True, pUndoDoc, (ScMarkData*)&rMark ); + pDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, true, pUndoDoc, (ScMarkData*)&rMark ); rDocShell.GetUndoManager()->AddUndoAction( new ScUndoIndent( &rDocShell, rMark, pUndoDoc, bIncrement ) ); @@ -3949,7 +3949,7 @@ bool ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark, else { for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++) - aMark.SelectTable( nTab, sal_True ); + aMark.SelectTable( nTab, true ); } ScAutoFormat* pAutoFormat = ScGlobal::GetOrCreateAutoFormat(); @@ -4056,7 +4056,7 @@ sal_Bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMa else { for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++) - aMark.SelectTable( nTab, sal_True ); + aMark.SelectTable( nTab, true ); } ScEditableTester aTester( pDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); @@ -4145,7 +4145,7 @@ sal_Bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, else { for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++) - aMark.SelectTable( nTab, sal_True ); + aMark.SelectTable( nTab, true ); } ScEditableTester aTester( pDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); @@ -4290,7 +4290,7 @@ bool ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark, else { for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++) - aMark.SelectTable( nTab, sal_True ); + aMark.SelectTable( nTab, true ); } ScEditableTester aTester( pDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); @@ -4398,7 +4398,7 @@ sal_Bool ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMar else { for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++) - aMark.SelectTable( nTab, sal_True ); + aMark.SelectTable( nTab, true ); } ScEditableTester aTester( pDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); @@ -4529,7 +4529,7 @@ sal_Bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillD else { for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++) - aMark.SelectTable( nTab, sal_True ); + aMark.SelectTable( nTab, true ); } ScRange aSourceArea = rRange; @@ -4811,7 +4811,7 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, sal_Bool bRecord aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab, SC_MF_HOR | SC_MF_VER ); - pDoc->ExtendMerge( aRefresh, sal_True ); + pDoc->ExtendMerge( aRefresh, true ); if ( !AdjustRowHeight( aExtended ) ) rDocShell.PostPaint( aExtended, PAINT_GRID ); @@ -4824,7 +4824,7 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, sal_Bool bRecord } aModificator.SetDocumentModified(); - return sal_True; + return true; } //------------------------------------------------------------------------ @@ -4865,7 +4865,7 @@ bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc, SCTA sal_Bool bCompile = ( !pDoc->IsImportingXML() && pDoc->GetNamedRangesLockCount() == 0 ); if ( bCompile ) - pDoc->CompileNameFormula( sal_True ); // CreateFormulaString + pDoc->CompileNameFormula( true ); // CreateFormulaString if (nTab >= 0) pDoc->SetRangeName( nTab, pNewRanges ); // takes ownership else @@ -4934,7 +4934,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList, if (aOldStr != aContent) { if (bApi) - bInsert = sal_True; // per API nicht nachfragen + bInsert = true; // per API nicht nachfragen else { OUString aTemplate = ScGlobal::GetRscString( STR_CREATENAME_REPLACE ); @@ -5199,7 +5199,7 @@ sal_Bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNe ScMarkData aMark; aMark.SetMarkArea( rOldRange ); - aMark.SelectTable( nTab, sal_True ); + aMark.SelectTable( nTab, true ); ScRange aNewRange( rOldRange.aStart, rNewEnd ); if ( DeleteContents( aMark, IDF_CONTENTS, sal_True, bApi ) ) @@ -5299,7 +5299,7 @@ sal_Bool ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilt pLink->SetDoInsert(bFitBlock); // beim ersten Update ggf. nichts einfuegen pLink->Update(); // kein SetInCreate -> Update ausfuehren } - pLink->SetDoInsert(sal_True); // Default = sal_True + pLink->SetDoInsert(true); // Default = sal_True SfxBindings* pBindings = rDocShell.GetViewBindings(); if (pBindings) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 277d3bae3354..cd55cd030c10 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -269,11 +269,11 @@ void ScDocShell::BeforeXMLLoading() OSL_ENSURE(pModificator == NULL, "The Modificator should not exist"); pModificator = new ScDocShellModificator( *this ); - aDocument.SetImportingXML( sal_True ); + aDocument.SetImportingXML( true ); aDocument.EnableExecuteLink( false ); // #i101304# to be safe, prevent nested loading from external references aDocument.EnableUndo( false ); // prevent unnecessary broadcasts and "half way listeners" - aDocument.SetInsertingFromOtherDoc( sal_True ); + aDocument.SetInsertingFromOtherDoc( true ); } void ScDocShell::AfterXMLLoading(sal_Bool bRet) @@ -330,7 +330,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) !aINetURLObject.HasError()) // the docname should be a valid URL { aName = ScGlobal::GetDocTabName( aDocument.GetLinkDoc( i ), aDocument.GetLinkTab( i ) ); - aDocument.RenameTab(i, aName, sal_True, sal_True); + aDocument.RenameTab(i, aName, true, true); } // else; nothing has to happen, because it is a user given name } @@ -362,7 +362,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) aDocument.SetImportingXML( false ); aDocument.EnableExecuteLink( true ); - aDocument.EnableUndo( sal_True ); + aDocument.EnableUndo( true ); bIsEmpty = false; if (pModificator) @@ -447,7 +447,7 @@ sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::un // #i62677# BeforeXMLLoading is also called from ScXMLImport::startDocument when invoked // from an external component. The XMLFromWrapper flag is only set here, when called // through ScDocShell. - aDocument.SetXMLFromWrapper( sal_True ); + aDocument.SetXMLFromWrapper( true ); ScXMLImportWrapper aImport( aDocument, pLoadMedium, xStor ); @@ -1073,7 +1073,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) sal_Bool bCalc3 = ( aFltName.equalsAscii(pFilterSc30) ); sal_Bool bCalc4 = ( aFltName.equalsAscii(pFilterSc40) ); if (!bCalc3 && !bCalc4) - aDocument.SetInsertingFromOtherDoc( sal_True ); + aDocument.SetInsertingFromOtherDoc( true ); if (aFltName.equalsAscii(pFilterXML)) bRet = LoadXML( &rMedium, NULL ); @@ -2412,7 +2412,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) ScRange aRange( 0,0,0, nEndCol,nEndRow,0 ); ScImportExport aImExport( &aDocument, aRange ); - aImExport.SetFormulas( sal_True ); + aImExport.SetFormulas( true ); bRet = aImExport.ExportStream( *pStream, rMed.GetBaseURL( true ), SOT_FORMATSTR_ID_SYLK ); } } @@ -2801,7 +2801,7 @@ void ScDocShell::SetDocumentModified( sal_Bool bIsModified /* = sal_True */ ) if ( bIsModified ) { if ( aDocument.IsAutoCalcShellDisabled() ) - SetDocumentModifiedPending( sal_True ); + SetDocumentModifiedPending( true ); else { SetDocumentModifiedPending( false ); @@ -2810,7 +2810,7 @@ void ScDocShell::SetDocumentModified( sal_Bool bIsModified /* = sal_True */ ) aDocument.InvalidateLastTableOpParams(); aDocument.Broadcast(ScHint(SC_HINT_DATACHANGED, BCA_BRDCST_ALWAYS)); if ( aDocument.IsForcedFormulaPending() && aDocument.GetAutoCalc() ) - aDocument.CalcFormulaTree( sal_True ); + aDocument.CalcFormulaTree( true ); PostDataChanged(); // Detective AutoUpdate: diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index b744b624f23a..ccccd746e83e 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -904,7 +904,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck // MergeChangeData in das aktuelle Dokument uebernehmen sal_Bool bHasRejected = false; OUString aOldUser = pThisTrack->GetUser(); - pThisTrack->SetUseFixDateTime( sal_True ); + pThisTrack->SetUseFixDateTime( true ); ScMarkData& rMarkData = pViewSh->GetViewData()->GetMarkData(); ScMarkData aOldMarkData( rMarkData ); pSourceAction = pFirstMergeAction; @@ -1048,10 +1048,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck } break; case SC_CAT_INSERT_ROWS: - GetDocFunc().InsertCells( aSourceRange, NULL, INS_INSROWS, sal_True, false ); + GetDocFunc().InsertCells( aSourceRange, NULL, INS_INSROWS, true, false ); break; case SC_CAT_INSERT_COLS: - GetDocFunc().InsertCells( aSourceRange, NULL, INS_INSCOLS, sal_True, false ); + GetDocFunc().InsertCells( aSourceRange, NULL, INS_INSCOLS, true, false ); break; case SC_CAT_DELETE_TABS : GetDocFunc().DeleteTable( aSourceRange.aStart.Tab(), sal_True, false ); @@ -1062,7 +1062,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck if ( pDel->IsTopDelete() ) { aSourceRange = pDel->GetOverAllRange().MakeRange(); - GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELROWS, sal_True, false ); + GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELROWS, true, false ); // #i101099# [Collaboration] Changes are not correctly shown if ( bShared ) @@ -1082,7 +1082,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck if ( pDel->IsTopDelete() && !pDel->IsTabDeleteCol() ) { // deleted Table enthaelt deleted Cols, die nicht aSourceRange = pDel->GetOverAllRange().MakeRange(); - GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELCOLS, sal_True, false ); + GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELCOLS, true, false ); } } break; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index db9f38c43c12..8c4039fcb77a 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -722,7 +722,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) pImpl->pRequest = new SfxRequest( rReq ); delete pImpl->pDocInserter; pImpl->pDocInserter = new ::sfx2::DocumentInserter( - OUString::createFromAscii( ScDocShell::Factory().GetShortName() ), 0 ); + OUString::createFromAscii( ScDocShell::Factory().GetShortName() ), false ); pImpl->pDocInserter->StartExecuteModal( LINK( this, ScDocShell, DialogClosedHdl ) ); return ; } @@ -2097,7 +2097,7 @@ bool ScDocShell::DdeGetData( const OUString& rItem, return false; // ungueltiger Bereich if( aDdeTextFmt[0] == 'F' ) - aObj.SetFormulas( sal_True ); + aObj.SetFormulas( true ); if( aDdeTextFmt == "SYLK" || aDdeTextFmt == "FSYLK" ) { @@ -2142,7 +2142,7 @@ bool ScDocShell::DdeSetData( const OUString& rItem, } ScImportExport aObj( &aDocument, rItem ); if( aDdeTextFmt[0] == 'F' ) - aObj.SetFormulas( sal_True ); + aObj.SetFormulas( true ); if( aDdeTextFmt == "SYLK" || aDdeTextFmt == "FSYLK" ) { diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index e4e04fbd0ceb..6d6471195f7a 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -244,7 +244,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe pNoNameData->SetSubTotalParam( ScSubTotalParam() ); pNoNameData->SetArea( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); // neu setzen - pNoNameData->SetByRow( sal_True ); + pNoNameData->SetByRow( true ); pNoNameData->SetHeader( bHasHeader ); pNoNameData->SetAutoFilter( false ); } @@ -255,7 +255,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe OUString aNewName; if (eMode==SC_DB_IMPORT) { - aDocument.CompileDBFormula( sal_True ); // CreateFormulaString + aDocument.CompileDBFormula( true ); // CreateFormulaString pUndoColl = new ScDBCollection( *pColl ); // Undo fuer Import1-Bereich OUString aImport = ScGlobal::GetRscString( STR_DBNAME_IMPORT ); @@ -272,7 +272,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe while (pDummy); pNoNameData = new ScDBData( aNewName, nTab, nStartCol,nStartRow, nEndCol,nEndRow, - sal_True, bHasHeader ); + true, bHasHeader ); rDBs.insert(pNoNameData); } else @@ -280,7 +280,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe aNewName = OUString(STR_DB_LOCAL_NONAME); pNoNameData = new ScDBData(aNewName , nTab, nStartCol,nStartRow, nEndCol,nEndRow, - sal_True, bHasHeader ); + true, bHasHeader ); aDocument.SetAnonymousDBData(nTab, pNoNameData); } @@ -404,7 +404,7 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore ) SCTAB nTab; for (nTab=0; nTab<=nUpdateTab; ++nTab) if ( aDocument.IsPendingRowHeights( nTab ) ) - aUpdateSheets.SelectTable( nTab, sal_True ); + aUpdateSheets.SelectTable( nTab, true ); if (aUpdateSheets.GetSelectCount()) UpdateAllRowHeights(&aUpdateSheets); // update with a single progress bar @@ -543,7 +543,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, sal_Bool bReco ScOutlineTable* pUndoTab = pTable ? new ScOutlineTable( *pTable ) : NULL; ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pUndoDoc->InitUndo( &aDocument, 0, nTabCount-1, false, sal_True ); + pUndoDoc->InitUndo( &aDocument, 0, nTabCount-1, false, true ); // Zeilenstatus aDocument.CopyToDocument( 0,0,nDestTab, MAXCOL,MAXROW,nDestTab, @@ -661,11 +661,11 @@ void ScDocShell::UseScenario( SCTAB nTab, const OUString& rName, sal_Bool bRecor pUndoDoc->InitUndo( &aDocument, nTab,nEndTab ); // auch alle Szenarien // angezeigte Tabelle: aDocument.CopyToDocument( nStartCol,nStartRow,nTab, - nEndCol,nEndRow,nTab, IDF_ALL,sal_True, pUndoDoc, &aScenMark ); + nEndCol,nEndRow,nTab, IDF_ALL,true, pUndoDoc, &aScenMark ); // Szenarien for (SCTAB i=nTab+1; i<=nEndTab; i++) { - pUndoDoc->SetScenario( i, sal_True ); + pUndoDoc->SetScenario( i, true ); OUString aComment; Color aColor; sal_uInt16 nScenFlags; @@ -775,7 +775,7 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const OUString& rName, const OUStrin } aDocument.RenameTab( nNewTab, rName, false ); // ohne Formel-Update - aDocument.SetScenario( nNewTab, sal_True ); + aDocument.SetScenario( nNewTab, true ); aDocument.SetScenarioData( nNewTab, rComment, rColor, nFlags ); ScMarkData aDestMark = rMark; @@ -784,19 +784,19 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const OUString& rName, const OUStrin //! auf Filter / Buttons / Merging testen ! ScPatternAttr aProtPattern( aDocument.GetPool() ); - aProtPattern.GetItemSet().Put( ScProtectionAttr( sal_True ) ); + aProtPattern.GetItemSet().Put( ScProtectionAttr( true ) ); aDocument.ApplyPatternAreaTab( 0,0, MAXCOL,MAXROW, nNewTab, aProtPattern ); ScPatternAttr aPattern( aDocument.GetPool() ); aPattern.GetItemSet().Put( ScMergeFlagAttr( SC_MF_SCENARIO ) ); - aPattern.GetItemSet().Put( ScProtectionAttr( sal_True ) ); + aPattern.GetItemSet().Put( ScProtectionAttr( true ) ); aDocument.ApplySelectionPattern( aPattern, aDestMark ); if (!bCopyAll) aDocument.SetVisible( nNewTab, false ); // dies ist dann das aktive Szenario - aDocument.CopyScenario( nNewTab, nTab, sal_True ); // sal_True - nicht aus Szenario kopieren + aDocument.CopyScenario( nNewTab, nTab, true ); // sal_True - nicht aus Szenario kopieren if (nFlags & SC_SCENARIO_SHOWFRAME) PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); // Rahmen painten @@ -996,7 +996,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) // internal operations (sort, query, subtotal) only if no error if (bContinue) { - aFunc.RepeatDB( pDBData->GetName(), sal_True, sal_True ); + aFunc.RepeatDB( pDBData->GetName(), true, true ); RefreshPivotTables(aRange); } } diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index ca6aeb373f51..5bdd99d96863 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -370,7 +370,7 @@ void ScDocShell::UpdateLinks() aNames.insert(pTabLink->GetFileName()); else // nicht mehr benutzt -> loeschen { - pTabLink->SetAddUndo(sal_True); + pTabLink->SetAddUndo(true); pLinkManager->Remove(k); } } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index c0d66c7fade2..f8585b4179f9 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -533,26 +533,26 @@ void lcl_GetColumnTypes( case 'L' : nDbType = sdbc::DataType::BIT; nFieldLen = 1; - bTypeDefined = sal_True; - bPrecDefined = sal_True; + bTypeDefined = true; + bPrecDefined = true; break; case 'D' : nDbType = sdbc::DataType::DATE; nFieldLen = 8; - bTypeDefined = sal_True; - bPrecDefined = sal_True; + bTypeDefined = true; + bPrecDefined = true; break; case 'M' : nDbType = sdbc::DataType::LONGVARCHAR; nFieldLen = 10; - bTypeDefined = sal_True; - bPrecDefined = sal_True; - bHasMemo = sal_True; + bTypeDefined = true; + bPrecDefined = true; + bHasMemo = true; break; case 'C' : nDbType = sdbc::DataType::VARCHAR; - bTypeDefined = sal_True; - bPrecDefined = sal_True; + bTypeDefined = true; + bPrecDefined = true; break; case 'N' : nDbType = sdbc::DataType::DECIMAL; @@ -567,7 +567,7 @@ void lcl_GetColumnTypes( if ( CharClass::isAsciiNumeric(aTmp) ) { nPrecision = aTmp.toInt32(); - bPrecDefined = sal_True; + bPrecDefined = true; } } } @@ -687,9 +687,9 @@ void lcl_GetColumnTypes( //! CAVEAT! There is no way to define a numeric field with a length //! of 1 and no decimals! if ( nFieldLen == 1 && nPrecision == 0 ) - bSdbLenBad = sal_True; + bSdbLenBad = true; nFieldLen = SvDbaseConverter::ConvertPrecisionToOdbc( nFieldLen, nPrecision ); - bSdbLenAdjusted = sal_True; + bSdbLenAdjusted = true; } if ( nFieldLen > 254 ) { @@ -697,7 +697,7 @@ void lcl_GetColumnTypes( { // zu lang fuer normales Textfeld => Memofeld nDbType = sdbc::DataType::LONGVARCHAR; nFieldLen = 10; - bHasMemo = sal_True; + bHasMemo = true; } else nFieldLen = 254; // dumm gelaufen.. diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index 8be9257a1716..456c4579624b 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -90,7 +90,7 @@ sal_Bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, sal_Bool bColumns SCTAB nTab = rRange.aStart.Tab(); ScDocument* pDoc = rDocShell.GetDocument(); - ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab, sal_True ); + ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab, true ); ScOutlineTable* pUndoTab = NULL; if (bRecord && !pDoc->IsUndoEnabled()) @@ -233,7 +233,7 @@ sal_Bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, sal_Bool bRecord, sal_ SCROW nEndRow = nRow2; ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, true ); pDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, false, pUndoDoc ); pDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, false, pUndoDoc ); @@ -299,7 +299,7 @@ sal_Bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, sal_Bool bRecord, SCROW nOutEndRow = nRow2; pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, true ); pDoc->CopyToDocument( nOutStartCol, 0, nTab, nOutEndCol, MAXROW, nTab, IDF_NONE, false, pUndoDoc ); pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, false, pUndoDoc ); } @@ -356,14 +356,14 @@ sal_Bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, sal_Bool bColumns, sal_uInt1 ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); if (bColumns) { - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, false ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, false ); pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab, static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, false, pUndoDoc ); } else { - pUndoDoc->InitUndo( pDoc, nTab, nTab, false, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, false, true ); pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, false, pUndoDoc ); } @@ -383,12 +383,12 @@ sal_Bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, sal_Bool bColumns, sal_uInt1 if (bShow) // einblenden { pEntry->SetHidden( false ); - pEntry->SetVisible( sal_True ); + pEntry->SetVisible( true ); } else if ( nThisLevel == nLevel ) // ausblenden { - pEntry->SetHidden( sal_True ); - pEntry->SetVisible( sal_True ); + pEntry->SetHidden( true ); + pEntry->SetVisible( true ); } else // verdeckt { @@ -458,7 +458,7 @@ sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool b { ScOutlineTable* pUndoTab = new ScOutlineTable( *pTable ); ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, true ); pDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, false, pUndoDoc ); pDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, false, pUndoDoc ); @@ -481,13 +481,13 @@ sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool b if ( nStart>=nStartCol && nEnd<=nEndCol ) { pEntry->SetHidden( false ); - pEntry->SetVisible( sal_True ); + pEntry->SetVisible( true ); if (nStart<nMin) nMin=nStart; if (nEnd>nMax) nMax=nEnd; } } for ( i=nMin; i<=nMax; i++ ) - pDoc->ShowCol( static_cast<SCCOL>(i), nTab, sal_True ); + pDoc->ShowCol( static_cast<SCCOL>(i), nTab, true ); // Zeilen @@ -502,7 +502,7 @@ sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool b if ( nStart>=nStartRow && nEnd<=nEndRow ) { pEntry->SetHidden( false ); - pEntry->SetVisible( sal_True ); + pEntry->SetVisible( true ); if (nStart<nMin) nMin=nStart; if (nEnd>nMax) nMax=nEnd; } @@ -514,7 +514,7 @@ sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool b bool bFiltered = pDoc->RowFiltered( i, nTab, NULL, &nFilterEnd ); nFilterEnd = std::min( nMax, nFilterEnd ); if ( !bFiltered ) - pDoc->ShowRows( i, nFilterEnd, nTab, sal_True ); + pDoc->ShowRows( i, nFilterEnd, nTab, true ); i = nFilterEnd; } @@ -572,7 +572,7 @@ sal_Bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, sal_Bool b { ScOutlineTable* pUndoTab = new ScOutlineTable( *pTable ); ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, true ); pDoc->CopyToDocument( static_cast<SCCOL>(nEffStartCol), 0, nTab, static_cast<SCCOL>(nEffEndCol), MAXROW, nTab, IDF_NONE, false, pUndoDoc ); @@ -644,14 +644,14 @@ sal_Bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt1 ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); if (bColumns) { - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, false ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, false ); pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab, static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, false, pUndoDoc ); } else { - pUndoDoc->InitUndo( pDoc, nTab, nTab, false, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, false, true ); pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, false, pUndoDoc ); } @@ -666,7 +666,7 @@ sal_Bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt1 for ( i = nStart; i <= nEnd; i++ ) { if ( bColumns ) - pDoc->ShowCol( static_cast<SCCOL>(i), nTab, sal_True ); + pDoc->ShowCol( static_cast<SCCOL>(i), nTab, true ); else { // show several rows together, don't show filtered rows @@ -674,7 +674,7 @@ sal_Bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt1 bool bFiltered = pDoc->RowFiltered( i, nTab, NULL, &nFilterEnd ); nFilterEnd = std::min( nEnd, nFilterEnd ); if ( !bFiltered ) - pDoc->ShowRows( i, nFilterEnd, nTab, sal_True ); + pDoc->ShowRows( i, nFilterEnd, nTab, true ); i = nFilterEnd; } } @@ -690,11 +690,11 @@ sal_Bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt1 for ( i = nSubStart; i <= nSubEnd; i++ ) pDoc->ShowCol( static_cast<SCCOL>(i), nTab, false ); else - pDoc->ShowRows( nSubStart, nSubEnd, nTab, sal_False ); + pDoc->ShowRows( nSubStart, nSubEnd, nTab, false ); } } - pArray->SetVisibleBelow( nLevel, nEntry, sal_True, sal_True ); + pArray->SetVisibleBelow( nLevel, nEntry, true, true ); pDoc->SetDrawPageSize(nTab); pDoc->InvalidatePageBreaks(nTab); @@ -728,14 +728,14 @@ sal_Bool ScOutlineDocFunc::HideOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt1 ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); if (bColumns) { - pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, false ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, true, false ); pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab, static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, false, pUndoDoc ); } else { - pUndoDoc->InitUndo( pDoc, nTab, nTab, false, sal_True ); + pUndoDoc->InitUndo( pDoc, nTab, nTab, false, true ); pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, false, pUndoDoc ); } @@ -749,9 +749,9 @@ sal_Bool ScOutlineDocFunc::HideOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt1 SCCOLROW i; if ( bColumns ) for ( i = nStart; i <= nEnd; i++ ) - pDoc->ShowCol( static_cast<SCCOL>(i), nTab, sal_False ); + pDoc->ShowCol( static_cast<SCCOL>(i), nTab, false ); else - pDoc->ShowRows( nStart, nEnd, nTab, sal_False ); + pDoc->ShowRows( nStart, nEnd, nTab, false ); pArray->SetVisibleBelow( nLevel, nEntry, false ); diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index a82c7191a663..48713801a4bc 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -169,7 +169,7 @@ sal_Bool ScServerObject::GetData( { ScImportExport aObj( pDoc, aRange ); if( aDdeTextFmt[0] == 'F' ) - aObj.SetFormulas( sal_True ); + aObj.SetFormulas( true ); if( aDdeTextFmt.equalsAscii( "SYLK" ) || aDdeTextFmt.equalsAscii( "FSYLK" ) ) { diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 94c685275957..166802ab7cb1 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -117,13 +117,13 @@ void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles switch( pView->GetAnchorType() ) { case SCA_PAGE: - rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, true ) ); rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, false ) ); break; case SCA_CELL: rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, false ) ); - rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, true ) ); break; default: @@ -393,7 +393,7 @@ void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet ) if( rMarkList.GetMark(0) != 0 ) { SfxItemSet aNewAttr(pView->GetGeoAttrFromMarked()); - rSet.Put(aNewAttr, sal_False); + rSet.Put(aNewAttr, false); } } diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index e2c1d6c3d7b7..bec4d5c77af5 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -540,7 +540,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) } // ChartListenerCollectionNeedsUpdate is needed for Navigator update - pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( sal_True ); + pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( true ); pDocSh->SetDrawModified(); } @@ -579,7 +579,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) pSelected->SetDescription(aDescription); // ChartListenerCollectionNeedsUpdate is needed for Navigator update - pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( sal_True ); + pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( true ); pDocSh->SetDrawModified(); } diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 2bb945f9c378..6d6206ecb916 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -1033,26 +1033,26 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) { case SVX_ADJUST_LEFT: { - rDestSet.Put( SfxBoolItem( SID_ALIGNLEFT, sal_True ) ); - rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, sal_True ) ); + rDestSet.Put( SfxBoolItem( SID_ALIGNLEFT, true ) ); + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, true ) ); } break; case SVX_ADJUST_CENTER: { - rDestSet.Put( SfxBoolItem( SID_ALIGNCENTERHOR, sal_True ) ); - rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, sal_True ) ); + rDestSet.Put( SfxBoolItem( SID_ALIGNCENTERHOR, true ) ); + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true ) ); } break; case SVX_ADJUST_RIGHT: { - rDestSet.Put( SfxBoolItem( SID_ALIGNRIGHT, sal_True ) ); - rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, sal_True ) ); + rDestSet.Put( SfxBoolItem( SID_ALIGNRIGHT, true ) ); + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true ) ); } break; case SVX_ADJUST_BLOCK: { - rDestSet.Put( SfxBoolItem( SID_ALIGNBLOCK, sal_True ) ); - rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, sal_True ) ); + rDestSet.Put( SfxBoolItem( SID_ALIGNBLOCK, true ) ); + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) ); } break; default: @@ -1100,13 +1100,13 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) switch( nLineSpace ) { case 100: - rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, sal_True ) ); + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, true ) ); break; case 150: - rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, sal_True ) ); + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, true ) ); break; case 200: - rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, sal_True ) ); + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, true ) ); break; } @@ -1115,9 +1115,9 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) SvxEscapement eEsc = (SvxEscapement) ( (const SvxEscapementItem&) aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - rDestSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, sal_True ) ); + rDestSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, sal_True ) ); + rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); // Unterstreichung @@ -1142,7 +1142,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) default: break; } - rDestSet.Put( SfxBoolItem( nId, sal_True ) ); + rDestSet.Put( SfxBoolItem( nId, true ) ); } // horizontal / vertical @@ -1261,7 +1261,7 @@ void ScDrawTextObjectBar::GetStatePropPanelAttr(SfxItemSet &rSet) } else { - rSet.Put(SfxBoolItem(nSlotId, sal_False)); + rSet.Put(SfxBoolItem(nSlotId, false)); } break; } diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 0726defa8fab..dcf219e87845 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -137,7 +137,7 @@ sal_Bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) ((SdrTextObj*)pObj)->ForceOutlinerParaObject(); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if( pOPO && !pOPO->IsVertical() ) - pOPO->SetVertical( sal_True ); + pOPO->SetVertical( true ); } } diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 1a107907e138..4b2f0ef01d03 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -550,7 +550,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)rDragStat).SetNoSnap(sal_True); + ((SdrDragStat&)rDragStat).SetNoSnap(true); if(bWasSnapEnabled) pView->SetSnapEnabled(false); diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 9db9ac9312ba..d6ccb244a91b 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -459,7 +459,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* bool bAutomaticMark = false; if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) { - pViewSh->GetViewData()->GetView()->MarkDataArea( sal_True ); + pViewSh->GetViewData()->GetView()->MarkDataArea( true ); bAutomaticMark = true; } @@ -591,7 +591,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* } pScDocSh->Broadcast( ScTablesHint( SC_TAB_INSERTED, nNewTab ) ); - pViewSh->SetTabNo( nNewTab, sal_True ); + pViewSh->SetTabNo( nNewTab, true ); pScDocSh->PostPaintExtras(); //! erst hinterher ??? } else @@ -601,7 +601,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* } else if ( nToTable != pData->GetTabNo() ) { - pViewSh->SetTabNo( nToTable, sal_True ); + pViewSh->SetTabNo( nToTable, true ); } } diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx index b0d5f1023019..882c307990f3 100644 --- a/sc/source/ui/drawfunc/fumark.cxx +++ b/sc/source/ui/drawfunc/fumark.cxx @@ -217,7 +217,7 @@ void FuMarkRect::Activate() ScMarkData& rMark = pViewData->GetMarkData(); if ( !rMark.IsMultiMarked() && !rMark.IsMarked() ) - pViewShell->MarkDataArea( sal_True ); + pViewShell->MarkDataArea( true ); pViewData->GetMultiArea( aSourceRange ); // Mehrfachselektion erlaubt diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index c65a068a16ce..4286ad90aa15 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -133,7 +133,7 @@ bool FuSelection::IsNoteCaptionClicked( const Point& rPos ) const bool bProtectDoc = rDoc.IsTabProtected( nTab ) || (pDocSh && pDocSh->IsReadOnly()); // search the last object (on top) in the object list - SdrObjListIter aIter( *pPageView->GetObjList(), IM_DEEPNOGROUPS, sal_True ); + SdrObjListIter aIter( *pPageView->GetObjList(), IM_DEEPNOGROUPS, true ); for( SdrObject* pObj = aIter.Next(); pObj; pObj = aIter.Next() ) { if( pObj->GetLogicRect().IsInside( rPos ) ) diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 48d7c7c05269..9912c25b8372 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -114,7 +114,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, m_aHelper.enableInput( false ); m_aHelper.EnableSpreadsheets(); m_aHelper.Init(); - m_aHelper.SetDispatcherLock( sal_True ); + m_aHelper.SetDispatcherLock( true ); notifyChange(); fill(); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 5a1db2244f29..86eb2dae763f 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -984,12 +984,12 @@ void ScRefHandler::stateChanged(const StateChangedType nStateChange, const bool { m_aHelper.enableInput( false ); m_aHelper.EnableSpreadsheets(); - m_aHelper.SetDispatcherLock( sal_True ); + m_aHelper.SetDispatcherLock( true ); aTimer.Start(); } else { - m_aHelper.enableInput( sal_True ); + m_aHelper.enableInput( true ); m_aHelper.SetDispatcherLock( false ); /*//! here and in DoClose ?*/ } } diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index d7da4bddf72d..a1d7c71706f7 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -140,7 +140,7 @@ void ScHighlightChgDlg::Init() OUString aRefStr(pRangeEntry->Format(ABS_DREF3D, pDoc)); aFilterCtr.SetRange(aRefStr); } - aFilterCtr.Enable(sal_True,sal_True); + aFilterCtr.Enable(true,true); HighlightHandle(&aHighlightBox); } @@ -193,13 +193,13 @@ IMPL_LINK( ScHighlightChgDlg, HighlightHandle, CheckBox*, pCb ) { if(aHighlightBox.IsChecked()) { - aFilterCtr.Enable(sal_True,sal_True); + aFilterCtr.Enable(true,true); aCbAccept.Enable(); aCbReject.Enable(); } else { - aFilterCtr.Disable(sal_True); + aFilterCtr.Disable(true); aCbAccept.Disable(); aCbReject.Disable(); } diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 97f225892af4..6784b90034dc 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -157,7 +157,7 @@ void ScMoveTableDlg::CheckNewTabName() if (aNewName.isEmpty()) { // New sheet name is empty. This is not good. - pFtWarn->Show(sal_True); + pFtWarn->Show(true); pFtWarn->SetControlBackground(Color(COL_YELLOW)); pFtWarn->SetText(msStrTabNameEmpty); pBtnOk->Disable(); @@ -167,7 +167,7 @@ void ScMoveTableDlg::CheckNewTabName() if (!ScDocument::ValidTabName(aNewName)) { // New sheet name contains invalid characters. - pFtWarn->Show(sal_True); + pFtWarn->Show(true); pFtWarn->SetControlBackground(Color(COL_YELLOW)); pFtWarn->SetText(msStrTabNameInvalid); pBtnOk->Disable(); @@ -189,7 +189,7 @@ void ScMoveTableDlg::CheckNewTabName() if ( bFound ) { - pFtWarn->Show(sal_True); + pFtWarn->Show(true); pFtWarn->SetControlBackground(Color(COL_YELLOW)); pFtWarn->SetText(msStrTabNameUsed); pBtnOk->Disable(); diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 4a6c50055642..8a0bd4d2dac4 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -562,7 +562,7 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) else { // no solution -> dialog is kept open - SetDispatcherLock( sal_True ); + SetDispatcherLock( true ); } } else if ( pBtn == m_pBtnOpt ) diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 7a2fbbd0cd45..489317c7fd69 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -275,7 +275,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) } SelFmtHdl( 0 ); - bOk = sal_True; + bOk = true; } else delete pNewData; @@ -293,7 +293,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) } } else - bOk = sal_True; + bOk = true; delete pDlg; } diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 69ba3a3493e0..0fec6bb7f913 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -58,7 +58,7 @@ ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pPa // damit die Strings in der Resource bei den FixedTexten bleiben koennen: Init(); - SetDispatcherLock( sal_True ); // Modal-Modus einschalten + SetDispatcherLock( true ); // Modal-Modus einschalten } //---------------------------------------------------------------------------- diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 94e53b38165b..6e9acc0dd917 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -271,7 +271,7 @@ void ScSolverOptionsDialog::FillListBox() else pButton->SetStateUnchecked(); pEntry->AddItem( pButton ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false ) ); pEntry->AddItem( new SvLBoxString( pEntry, 0, aVisName ) ); } else @@ -279,7 +279,7 @@ void ScSolverOptionsDialog::FillListBox() // value entry pEntry = new SvTreeListEntry; pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty ) ); // empty column - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false ) ); ScSolverOptionsString* pItem = new ScSolverOptionsString( pEntry, 0, aVisName ); if ( eClass == uno::TypeClass_DOUBLE ) { diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index b305e560a1ab..9aca7e0eb4b6 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -467,7 +467,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) { if(aCode.GetCode() == KEY_SPACE ) { - bUsed = sal_True; + bUsed = true; sal_uInt16 nType; sal_uLong nChild; SvTreeListEntry* pEntry = GetCurEntry(); @@ -1263,7 +1263,7 @@ static void lcl_DoDragObject( ScDocShell* pSrcShell, const OUString& rName, sal_ static void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, sal_uInt16 nFlags, Window* pWin ) { ScMarkData aMark; - aMark.SelectTable( rRange.aStart.Tab(), sal_True ); + aMark.SelectTable( rRange.aStart.Tab(), true ); aMark.SetMarkArea( rRange ); ScDocument* pSrcDoc = pSrcShell->GetDocument(); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index c23db00d3e2c..61f527975082 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -169,7 +169,7 @@ SvTreeListEntry *ScCalcOptionsDialog::createBoolItem(const OUString &rCaption, b { SvTreeListEntry* pEntry = new SvTreeListEntry; pEntry->AddItem(new SvLBoxString(pEntry, 0, OUString())); - pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), false)); OptionString* pItem = new OptionString(rCaption, toString(bValue)); pEntry->AddItem(pItem); return pEntry; @@ -248,7 +248,7 @@ void ScCalcOptionsDialog::FillOptionsList() // Syntax for INDIRECT function. SvTreeListEntry* pEntry = new SvTreeListEntry; pEntry->AddItem(new SvLBoxString(pEntry, 0, OUString())); - pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), false)); OptionString* pItem = new OptionString( maCaptionStringRefSyntax, toString(maConfig.meStringRefAddressSyntax)); pEntry->AddItem(pItem); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 59c8d050a629..4ea37c98074b 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -277,8 +277,8 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( break; case SID_NUMBER_FORMAT: { - bool bThousand = 0; - bool bNegRed = 0; + bool bThousand = false; + bool bNegRed = false; sal_uInt16 nPrecision = 0; sal_uInt16 nLeadZeroes = 0; if( eState >= SFX_ITEM_AVAILABLE) @@ -328,8 +328,8 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( } else { - bThousand = 0; - bNegRed = 0; + bThousand = false; + bNegRed = false; nPrecision = 0; nLeadZeroes = 1; } diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx index 3c9a8d1f2227..13aaaf95df50 100644 --- a/sc/source/ui/undo/areasave.cxx +++ b/sc/source/ui/undo/areasave.cxx @@ -79,7 +79,7 @@ void ScAreaLinkSaver::InsertNewLink( ScDocument* pDoc ) { ScAreaLink* pLink = new ScAreaLink( pObjSh, aFileName, aFilterName, aOptions, aSourceArea, aDestArea.aStart, nRefresh ); - pLink->SetInCreate( sal_True ); + pLink->SetInCreate( true ); pLink->SetDestArea( aDestArea ); OUString aTmp1(aFilterName), aTmp2(aSourceArea); pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aFileName, &aTmp1, &aTmp2 ); diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 2f4398789235..fdb2cfc5d478 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -82,7 +82,7 @@ bool ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) ScUndoDraw* pCalcUndo = (ScUndoDraw*)pNextAction; pDetectiveUndo = pCalcUndo->GetDrawUndo(); pCalcUndo->ForgetDrawUndo(); - return sal_True; + return true; } return false; @@ -90,7 +90,7 @@ bool ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) void ScSimpleUndo::BeginUndo() { - pDocShell->SetInUndo( sal_True ); + pDocShell->SetInUndo( true ); ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) @@ -118,7 +118,7 @@ void ScSimpleUndo::EndUndo() void ScSimpleUndo::BeginRedo() { - pDocShell->SetInUndo( sal_True ); //! own Flag for Redo? + pDocShell->SetInUndo( true ); //! own Flag for Redo? ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) @@ -537,7 +537,7 @@ void ScDBFuncUndo::BeginRedo() aOriginalRange.aStart.Col(), aOriginalRange.aStart.Row(), aOriginalRange.aEnd.Col(), aOriginalRange.aEnd.Row() ); - pNoNameData->SetByRow( sal_True ); + pNoNameData->SetByRow( true ); pNoNameData->SetAutoFilter( false ); // header is always set with the operation in redo } diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index ffbda7a84f57..54c248632e29 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -210,7 +210,7 @@ void ScUndoInsertCells::DoChange( const sal_Bool bUndo ) { SCCOL nEndCol = aWorkRange.aEnd.Col(); SCROW nEndRow = aWorkRange.aEnd.Row(); - pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], sal_True ); + pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], true ); } } @@ -308,7 +308,7 @@ void ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget) pPasteUndo->Repeat( rTarget ); } else - ((ScTabViewTarget&)rTarget).GetViewShell()->InsertCells( eCmd, sal_True ); + ((ScTabViewTarget&)rTarget).GetViewShell()->InsertCells( eCmd, true ); } } @@ -446,7 +446,7 @@ void ScUndoDeleteCells::DoChange( const sal_Bool bUndo ) SCCOL nEndCol = aWorkRange.aEnd.Col(); SCROW nEndRow = aWorkRange.aEnd.Row(); - pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], sal_True ); + pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], true ); } } @@ -544,7 +544,7 @@ void ScUndoDeleteCells::Redo() void ScUndoDeleteCells::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) - ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( eCmd, sal_True ); + ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( eCmd, true ); } bool ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const @@ -602,7 +602,7 @@ void ScUndoDeleteMulti::DoChange() const SCCOL nEndCol = MAXCOL; SCROW nEndRow = MAXROW; pDoc->RemoveFlagsTab( nStartCol, nStartRow, nEndCol, nEndRow, nTab, SC_MF_HOR | SC_MF_VER ); - pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab, sal_True ); + pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab, true ); } pDocShell->PostPaint( nStartCol, nStartRow, nTab, MAXCOL, MAXROW, nTab, nPaint ); @@ -727,7 +727,7 @@ void ScUndoDeleteMulti::Repeat(SfxRepeatTarget& rTarget) { // if single selection if (rTarget.ISA(ScTabViewTarget)) - ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, sal_True ); + ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, true ); } bool ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const @@ -1095,7 +1095,7 @@ void ScUndoPaste::Repeat(SfxRepeatTarget& rTarget) pViewSh->PasteFromClip( nFlags, pOwnClip->GetDocument(), aPasteOptions.nFunction, aPasteOptions.bSkipEmpty, aPasteOptions.bTranspose, aPasteOptions.bAsLink, aPasteOptions.eMoveMode, IDF_NONE, - sal_True ); // allow warning dialog + true ); // allow warning dialog } } } @@ -1236,7 +1236,7 @@ void ScUndoDragDrop::DoUndo( ScRange aRange ) const pDoc->DeleteAreaTab( aRange, nUndoFlags ); pRefUndoDoc->CopyToDocument( aRange, nUndoFlags, false, pDoc ); if ( pDoc->HasAttrib( aRange, HASATTR_MERGED ) ) - pDoc->ExtendMerge( aRange, sal_True ); + pDoc->ExtendMerge( aRange, true ); aPaintRange.aEnd.SetCol( std::max( aPaintRange.aEnd.Col(), aRange.aEnd.Col() ) ); aPaintRange.aEnd.SetRow( std::max( aPaintRange.aEnd.Row(), aRange.aEnd.Row() ) ); @@ -1283,7 +1283,7 @@ void ScUndoDragDrop::Redo() SCTAB nTab; ScMarkData aSourceMark; for (nTab=aSrcRange.aStart.Tab(); nTab<=aSrcRange.aEnd.Tab(); nTab++) - aSourceMark.SelectTable( nTab, sal_True ); + aSourceMark.SelectTable( nTab, true ); // do not clone objects and note captions into clipdoc (see above) // but at least copy notes @@ -1302,11 +1302,11 @@ void ScUndoDragDrop::Redo() ScMarkData aDestMark; for (nTab=aDestRange.aStart.Tab(); nTab<=aDestRange.aEnd.Tab(); nTab++) - aDestMark.SelectTable( nTab, sal_True ); + aDestMark.SelectTable( nTab, true ); sal_Bool bIncludeFiltered = bCut; // TODO: restore old note captions instead of cloning new captions... - pDoc->CopyFromClip( aDestRange, aDestMark, IDF_ALL & ~IDF_OBJECTS, NULL, pClipDoc, sal_True, false, bIncludeFiltered ); + pDoc->CopyFromClip( aDestRange, aDestMark, IDF_ALL & ~IDF_OBJECTS, NULL, pClipDoc, true, false, bIncludeFiltered ); if (bCut) for (nTab=aSrcRange.aStart.Tab(); nTab<=aSrcRange.aEnd.Tab(); nTab++) @@ -1322,7 +1322,7 @@ void ScUndoDragDrop::Redo() SCCOL nEndCol = aDestRange.aEnd.Col(); SCROW nEndRow = aDestRange.aEnd.Row(); pDoc->ExtendMerge( aDestRange.aStart.Col(), aDestRange.aStart.Row(), - nEndCol, nEndRow, nTab, sal_True ); + nEndCol, nEndRow, nTab, true ); PaintArea( ScRange( aDestRange.aStart.Col(), aDestRange.aStart.Row(), nTab, nEndCol, nEndRow, nTab ), 0 ); } @@ -1448,7 +1448,7 @@ void ScUndoUseScenario::Undo() ScDocument* pDoc = pDocShell->GetDocument(); pDoc->DeleteSelection( IDF_ALL, aMarkData ); - pUndoDoc->CopyToDocument( aRange, IDF_ALL, sal_True, pDoc, &aMarkData ); + pUndoDoc->CopyToDocument( aRange, IDF_ALL, true, pDoc, &aMarkData ); // scenario table sal_Bool bFrame = false; @@ -1559,7 +1559,7 @@ void ScUndoSelectionStyle::DoChange( const sal_Bool bUndo ) ScRange aWorkRange( aRange ); if ( pDoc->HasAttrib( aWorkRange, HASATTR_MERGED ) ) // Merged cells? - pDoc->ExtendMerge( aWorkRange, sal_True ); + pDoc->ExtendMerge( aWorkRange, true ); sal_uInt16 nExtFlags = 0; pDocShell->UpdatePaintExt( nExtFlags, aWorkRange ); @@ -1570,7 +1570,7 @@ void ScUndoSelectionStyle::DoChange( const sal_Bool bUndo ) ScRange aCopyRange = aWorkRange; aCopyRange.aStart.SetTab(0); aCopyRange.aEnd.SetTab(nTabCount-1); - pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData ); + pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, true, pDoc, &aMarkData ); } else // if Redo, then reapply style { @@ -1623,7 +1623,7 @@ void ScUndoSelectionStyle::Repeat(SfxRepeatTarget& rTarget) } ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell(); - rViewShell.SetStyleSheetToMarked( pStyleSheet, sal_True ); + rViewShell.SetStyleSheetToMarked( pStyleSheet, true ); } } @@ -1760,7 +1760,7 @@ void ScUndoIndent::Undo() ScRange aCopyRange = aBlockRange; aCopyRange.aStart.SetTab(0); aCopyRange.aEnd.SetTab(nTabCount-1); - pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData ); + pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, true, pDoc, &aMarkData ); pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE ); EndUndo(); @@ -1816,7 +1816,7 @@ void ScUndoTransliterate::Undo() ScRange aCopyRange = aBlockRange; aCopyRange.aStart.SetTab(0); aCopyRange.aEnd.SetTab(nTabCount-1); - pUndoDoc->CopyToDocument( aCopyRange, IDF_CONTENTS, sal_True, pDoc, &aMarkData ); + pUndoDoc->CopyToDocument( aCopyRange, IDF_CONTENTS, true, pDoc, &aMarkData ); pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE ); EndUndo(); @@ -1877,7 +1877,7 @@ void ScUndoClearItems::Undo() BeginUndo(); ScDocument* pDoc = pDocShell->GetDocument(); - pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData ); + pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, true, pDoc, &aMarkData ); pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE ); EndUndo(); @@ -1936,7 +1936,7 @@ void ScUndoRemoveBreaks::Undo() pUndoDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, false, pDoc ); if (pViewShell) - pViewShell->UpdatePageBreakData( sal_True ); + pViewShell->UpdatePageBreakData( true ); pDocShell->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); EndUndo(); @@ -1952,7 +1952,7 @@ void ScUndoRemoveBreaks::Redo() pDoc->RemoveManualBreaks(nTab); pDoc->UpdatePageBreaks(nTab); if (pViewShell) - pViewShell->UpdatePageBreakData( sal_True ); + pViewShell->UpdatePageBreakData( true ); pDocShell->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); EndRedo(); @@ -2139,7 +2139,7 @@ void ScUndoBorder::Undo() ScDocument* pDoc = pDocShell->GetDocument(); ScMarkData aMarkData; aMarkData.MarkFromRangeList( *pRanges, false ); - pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData ); + pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, true, pDoc, &aMarkData ); pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE ); EndUndo(); @@ -2158,7 +2158,7 @@ void ScUndoBorder::Redo() ScMarkData aMark; aMark.SetMarkArea( aRange ); - aMark.SelectTable( nTab, sal_True ); + aMark.SelectTable( nTab, true ); pDoc->ApplySelectionFrame( aMark, pOuter, pInner ); } diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx index 7729556d3c92..2cdd7a2022db 100644 --- a/sc/source/ui/undo/undoblk2.cxx +++ b/sc/source/ui/undo/undoblk2.cxx @@ -165,7 +165,7 @@ void ScUndoWidthOrHeight::Redo() void ScUndoWidthOrHeight::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) - ((ScTabViewTarget&)rTarget).GetViewShell()->SetMarkedWidthOrHeight( bWidth, eMode, nNewSize, sal_True ); + ((ScTabViewTarget&)rTarget).GetViewShell()->SetMarkedWidthOrHeight( bWidth, eMode, nNewSize, true ); } bool ScUndoWidthOrHeight::CanRepeat(SfxRepeatTarget& rTarget) const diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index fe94d096e727..2be77bf16789 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -199,7 +199,7 @@ void ScUndoDeleteContents::Redo() void ScUndoDeleteContents::Repeat(SfxRepeatTarget& rTarget) { if (rTarget.ISA(ScTabViewTarget)) - ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteContents( nFlags, sal_True ); + ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteContents( nFlags, true ); } bool ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const @@ -469,9 +469,9 @@ void ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget) { ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell(); if (pLineOuter) - rViewShell.ApplyPatternLines( *pApplyPattern, pLineOuter, pLineInner, sal_True ); + rViewShell.ApplyPatternLines( *pApplyPattern, pLineOuter, pLineInner, true ); else - rViewShell.ApplySelectionPattern( *pApplyPattern, sal_True ); + rViewShell.ApplySelectionPattern( *pApplyPattern, true ); } } @@ -538,7 +538,7 @@ void ScUndoAutoFill::Undo() pDoc->DeleteAreaTab( aWorkRange, IDF_AUTOFILL ); pUndoDoc->CopyToDocument( aWorkRange, IDF_AUTOFILL, false, pDoc ); - pDoc->ExtendMerge( aWorkRange, sal_True ); + pDoc->ExtendMerge( aWorkRange, true ); pDocShell->PostPaint( aWorkRange, PAINT_GRID, nExtFlags ); } pDocShell->PostDataChanged(); @@ -616,7 +616,7 @@ void ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget) { ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell(); if (eFillCmd==FILL_SIMPLE) - rViewShell.FillSimple( eFillDir, sal_True ); + rViewShell.FillSimple( eFillDir, true ); else rViewShell.FillSeries( eFillDir, eFillCmd, eFillDateCmd, fStartValue, fStepValue, fMaxValue, sal_True ); @@ -876,7 +876,7 @@ void ScUndoAutoFormat::Redo() &aVirtDev, nPPTX, nPPTY, aZoomX, aZoomY, bFormula, &aDestMark ); pDoc->SetColWidth( nCol, nTab, nThisSize ); - pDoc->ShowCol( nCol, nTab, sal_True ); + pDoc->ShowCol( nCol, nTab, true ); } } @@ -991,7 +991,7 @@ void ScUndoReplace::Undo() pSearchItem->SetReplaceString(aTempStr); pDoc->ReplaceStyle( *pSearchItem, aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), - aMarkData, sal_True); + aMarkData, true); pSearchItem->SetReplaceString(pSearchItem->GetSearchString()); pSearchItem->SetSearchString(aTempStr); if (pViewShell) @@ -1057,7 +1057,7 @@ void ScUndoReplace::Redo() { pDoc->ReplaceStyle( *pSearchItem, aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), - aMarkData, sal_True); + aMarkData, true); pDocShell->PostPaintGridAll(); } else @@ -1385,7 +1385,7 @@ void ScUndoRefreshLink::Undo() if (bMakeRedo) { if (bFirst) - pRedoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True ); + pRedoDoc->InitUndo( pDoc, nTab, nTab, true, true ); else pRedoDoc->AddUndoTab( nTab, nTab, true, true ); bFirst = false; @@ -1518,7 +1518,7 @@ void ScUndoInsertAreaLink::Redo() ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions, aAreaName, aRange.aStart, nRefreshDelay ); - pLink->SetInCreate( sal_True ); + pLink->SetInCreate( true ); pLink->SetDestArea( aRange ); pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aDocName, &aFltName, &aAreaName ); pLink->Update(); @@ -1567,7 +1567,7 @@ void ScUndoRemoveAreaLink::Undo() ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions, aAreaName, aRange.aStart, nRefreshDelay ); - pLink->SetInCreate( sal_True ); + pLink->SetInCreate( true ); pLink->SetDestArea( aRange ); pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aDocName, &aFltName, &aAreaName ); pLink->Update(); @@ -1676,7 +1676,7 @@ void ScUndoUpdateAreaLink::DoChange( const sal_Bool bUndo ) const } ScRange aWorkRange( aNewRange.aStart, ScAddress( nEndX, nEndY, nEndZ ) ); - pDoc->ExtendMerge( aWorkRange, sal_True ); + pDoc->ExtendMerge( aWorkRange, true ); // Paint diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 2a22f5991e37..80365153bef3 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -1042,7 +1042,7 @@ OUString ScUndoRangeNames::GetComment() const void ScUndoRangeNames::DoChange( sal_Bool bUndo ) { ScDocument* pDoc = pDocShell->GetDocument(); - pDoc->CompileNameFormula( sal_True ); // CreateFormulaString + pDoc->CompileNameFormula( true ); // CreateFormulaString if ( bUndo ) { diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 57d08756b79e..40474aef7142 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -702,7 +702,7 @@ void ScUndoSubTotals::Undo() if (pUndoRange) pDoc->SetRangeName( new ScRangeName( *pUndoRange ) ); if (pUndoDB) - pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), sal_True ); + pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), true ); SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); if ( nVisTab != nTab ) @@ -812,7 +812,7 @@ void ScUndoSort::Undo() IDF_NONE, false, pDoc ); if (pUndoDB) - pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), sal_True ); + pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), true ); SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); if ( nVisTab != nSortTab ) @@ -912,7 +912,7 @@ void ScUndoQuery::Undo() nDestEndRow = aQueryParam.nDestRow + ( aQueryParam.nRow2-aQueryParam.nRow1 ); ScDBData* pData = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow, - aQueryParam.nDestTab, sal_True ); + aQueryParam.nDestTab, true ); if (pData) { ScRange aNewDest; @@ -955,7 +955,7 @@ void ScUndoQuery::Undo() IDF_NONE, false, pDoc ); if (pUndoDB) - pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), sal_True ); + pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), true ); if (!bCopy) { @@ -1085,7 +1085,7 @@ void ScUndoAutoFilter::DoChange( bool bUndo ) void ScUndoAutoFilter::Undo() { BeginUndo(); - DoChange( sal_True ); + DoChange( true ); EndUndo(); } @@ -1133,8 +1133,8 @@ void ScUndoDBData::Undo() sal_Bool bOldAutoCalc = pDoc->GetAutoCalc(); pDoc->SetAutoCalc( false ); // Avoid unnecessary calculations - pDoc->CompileDBFormula( sal_True ); // CreateFormulaString - pDoc->SetDBCollection( new ScDBCollection(*pUndoColl), sal_True ); + pDoc->CompileDBFormula( true ); // CreateFormulaString + pDoc->SetDBCollection( new ScDBCollection(*pUndoColl), true ); pDoc->CompileDBFormula( false ); // CompileFormulaString pDoc->SetAutoCalc( bOldAutoCalc ); @@ -1151,8 +1151,8 @@ void ScUndoDBData::Redo() sal_Bool bOldAutoCalc = pDoc->GetAutoCalc(); pDoc->SetAutoCalc( false ); // Avoid unnecessary calculations - pDoc->CompileDBFormula( sal_True ); // CreateFormulaString - pDoc->SetDBCollection( new ScDBCollection(*pRedoColl), sal_True ); + pDoc->CompileDBFormula( true ); // CreateFormulaString + pDoc->SetDBCollection( new ScDBCollection(*pRedoColl), true ); pDoc->CompileDBFormula( false ); // CompileFormulaString pDoc->SetAutoCalc( bOldAutoCalc ); @@ -1503,7 +1503,7 @@ void ScUndoRepeatDB::Undo() if (pUndoRange) pDoc->SetRangeName( new ScRangeName( *pUndoRange ) ); if (pUndoDB) - pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), sal_True ); + pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), true ); SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo(); if ( nVisTab != nTab ) diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index f4fce0f7e0c6..d9babed7e522 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -118,7 +118,7 @@ void ScUndoInsertTab::Undo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); pViewShell->SetTabNo(nTab); - pDocShell->SetInUndo( sal_True ); //! BeginUndo + pDocShell->SetInUndo( true ); //! BeginUndo bDrawIsInUndo = sal_True; pViewShell->DeleteTable( nTab, false ); bDrawIsInUndo = false; @@ -140,7 +140,7 @@ void ScUndoInsertTab::Redo() RedoSdrUndoAction( pDrawUndo ); // Draw Redo first - pDocShell->SetInUndo( sal_True ); //! BeginRedo + pDocShell->SetInUndo( true ); //! BeginRedo bDrawIsInUndo = sal_True; if (bAppend) pViewShell->AppendTable( sNewName, false ); @@ -215,7 +215,7 @@ void ScUndoInsertTables::Undo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); pViewShell->SetTabNo(nTab); - pDocShell->SetInUndo( sal_True ); //! BeginUndo + pDocShell->SetInUndo( true ); //! BeginUndo bDrawIsInUndo = sal_True; pViewShell->DeleteTables( nTab, static_cast<SCTAB>(aNameList.size()) ); @@ -239,7 +239,7 @@ void ScUndoInsertTables::Redo() RedoSdrUndoAction( pDrawUndo ); // Draw Redo first - pDocShell->SetInUndo( sal_True ); //! BeginRedo + pDocShell->SetInUndo( true ); //! BeginRedo bDrawIsInUndo = sal_True; pViewShell->SetTabNo(nTab); pViewShell->InsertTables( aNameList, nTab, static_cast<SCTAB>(aNameList.size()),false ); @@ -343,7 +343,7 @@ void ScUndoDeleteTab::Undo() if ( pRefUndoDoc->IsScenario(nTab) ) { - pDoc->SetScenario( nTab, sal_True ); + pDoc->SetScenario( nTab, true ); OUString aComment; Color aColor; sal_uInt16 nScenFlags; @@ -396,11 +396,11 @@ void ScUndoDeleteTab::Redo() RedoSdrUndoAction( pDrawUndo ); // Draw Redo first - pDocShell->SetInUndo( sal_True ); //! BeginRedo + pDocShell->SetInUndo( true ); //! BeginRedo bDrawIsInUndo = sal_True; pViewShell->DeleteTables( theTabs, false ); bDrawIsInUndo = false; - pDocShell->SetInUndo( sal_True ); //! EndRedo + pDocShell->SetInUndo( true ); //! EndRedo SetChangeTrack(); @@ -684,7 +684,7 @@ void ScUndoCopyTab::Redo() if ( pDoc->IsScenario(nAdjSource) ) { - pDoc->SetScenario(nNewTab, sal_True ); + pDoc->SetScenario(nNewTab, true ); OUString aComment; Color aColor; sal_uInt16 nScenFlags; @@ -708,7 +708,7 @@ void ScUndoCopyTab::Redo() RedoSdrUndoAction( pDrawUndo ); // after the sheets are inserted - pViewShell->SetTabNo( nDestTab, sal_True ); // after draw-undo + pViewShell->SetTabNo( nDestTab, true ); // after draw-undo DoChange(); @@ -825,7 +825,7 @@ void ScUndoMakeScenario::Undo() { ScDocument* pDoc = pDocShell->GetDocument(); - pDocShell->SetInUndo( sal_True ); + pDocShell->SetInUndo( true ); bDrawIsInUndo = sal_True; pDoc->DeleteTab( nDestTab ); bDrawIsInUndo = false; @@ -838,7 +838,7 @@ void ScUndoMakeScenario::Undo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) - pViewShell->SetTabNo( nSrcTab, sal_True ); + pViewShell->SetTabNo( nSrcTab, true ); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); @@ -852,7 +852,7 @@ void ScUndoMakeScenario::Redo() RedoSdrUndoAction( pDrawUndo ); // Draw Redo first - pDocShell->SetInUndo( sal_True ); + pDocShell->SetInUndo( true ); bDrawIsInUndo = sal_True; pDocShell->MakeScenario( nSrcTab, aName, aComment, aColor, nFlags, *mpMarkData, false ); @@ -862,7 +862,7 @@ void ScUndoMakeScenario::Redo() ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) - pViewShell->SetTabNo( nDestTab, sal_True ); + pViewShell->SetTabNo( nDestTab, true ); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); } @@ -911,11 +911,11 @@ void ScUndoImportTab::DoChange() const { if(nTab<nTabCount) { - pViewShell->SetTabNo(nTab,sal_True); + pViewShell->SetTabNo(nTab,true); } else { - pViewShell->SetTabNo(nTab-1,sal_True); + pViewShell->SetTabNo(nTab-1,true); } } @@ -934,7 +934,7 @@ void ScUndoImportTab::Undo() if (bMakeRedo) { pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); - pRedoDoc->InitUndo( pDoc, nTab,nTab+nCount-1, sal_True,sal_True ); + pRedoDoc->InitUndo( pDoc, nTab,nTab+nCount-1, true,true ); OUString aOldName; for (i=0; i<nCount; i++) @@ -948,7 +948,7 @@ void ScUndoImportTab::Undo() if ( pDoc->IsScenario(nTabPos) ) { - pRedoDoc->SetScenario(nTabPos, sal_True ); + pRedoDoc->SetScenario(nTabPos, true ); OUString aComment; Color aColor; sal_uInt16 nScenFlags; @@ -1003,7 +1003,7 @@ void ScUndoImportTab::Redo() if ( pRedoDoc->IsScenario(nTabPos) ) { - pDoc->SetScenario(nTabPos, sal_True ); + pDoc->SetScenario(nTabPos, true ); OUString aComment; Color aColor; sal_uInt16 nScenFlags; @@ -1141,7 +1141,7 @@ void ScUndoShowHideTab::DoChange( sal_Bool bShowP ) const nTab = *itr; pDoc->SetVisible( nTab, bShowP ); if (pViewShell) - pViewShell->SetTabNo(nTab,sal_True); + pViewShell->SetTabNo(nTab,true); } SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); @@ -1549,14 +1549,14 @@ ScUndoLayoutRTL::~ScUndoLayoutRTL() void ScUndoLayoutRTL::DoChange( sal_Bool bNew ) { - pDocShell->SetInUndo( sal_True ); + pDocShell->SetInUndo( true ); ScDocument* pDoc = pDocShell->GetDocument(); pDoc->SetLayoutRTL( nTab, bNew ); ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) - pViewShell->SetTabNo(nTab,sal_True); + pViewShell->SetTabNo(nTab,true); pDocShell->SetDocumentModified(); diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index 4071e8574d93..ce2794f619dc 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -90,7 +90,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB if (!pRet) { pRet = new ScDBData( OUString(STR_DB_LOCAL_NONAME), nTab, - nCol1,nRow1, nCol2,nRow2, sal_True, + nCol1,nRow1, nCol2,nRow2, true, pDoc->HasColHeader( nCol1,nRow1,nCol2,nRow2,nTab ) ); pDoc->SetAnonymousDBData(nTab,pRet); } diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 5fe6a5bb2c92..5d5c998ab76a 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -612,7 +612,7 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue( // else Fehler //! Notify fuer andere Objekte - pFormats->SetSaveLater(sal_True); + pFormats->SetSaveLater(true); } } @@ -727,7 +727,7 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( pData->PutItem( nFieldIndex, SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) ); break; case table::CellOrientation_STACKED: - pData->PutItem( nFieldIndex, SfxBoolItem( ATTR_STACKED, sal_True ) ); + pData->PutItem( nFieldIndex, SfxBoolItem( ATTR_STACKED, true ) ); break; default: { @@ -748,7 +748,7 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( if (bDone) //! Notify fuer andere Objekte? - pFormats->SetSaveLater(sal_True); + pFormats->SetSaveLater(true); } } else @@ -766,7 +766,7 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( pData->PutItem( nFieldIndex, aOuter ); //! Notify for other objects? - pFormats->SetSaveLater(sal_True); + pFormats->SetSaveLater(true); } } break; @@ -781,7 +781,7 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( pData->PutItem( nFieldIndex, aOuter ); //! Notify for other objects? - pFormats->SetSaveLater(sal_True); + pFormats->SetSaveLater(true); } } break; diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 5b05ba024d3b..21298182889f 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1080,7 +1080,7 @@ void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& r ScMarkData aMark; aMark.SetMarkArea( aRange ); - aMark.SelectTable( nTab, sal_True ); + aMark.SelectTable( nTab, true ); pDoc->ApplySelectionFrame( aMark, &rOuter, &rInner ); // RowHeight bei Umrandung alleine nicht noetig @@ -1514,7 +1514,7 @@ const ScPatternAttr* ScCellRangesBase::GetCurrentAttrsDeep() if ( !pCurrentDeep && pDocShell ) { ScDocument* pDoc = pDocShell->GetDocument(); - pCurrentDeep = pDoc->CreateSelectionPattern( *GetMarkData(), sal_True ); + pCurrentDeep = pDoc->CreateSelectionPattern( *GetMarkData(), true ); } return pCurrentDeep; } @@ -1824,7 +1824,7 @@ double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunct ScMarkData aMark(*GetMarkData()); aMark.MarkToSimple(); if (!aMark.IsMarked()) - aMark.SetMarkNegative(sal_True); // um Dummy Position angeben zu koennen + aMark.SetMarkNegative(true); // um Dummy Position angeben zu koennen ScAddress aDummy; // wenn nicht Marked, ignoriert wegen Negative double fVal; @@ -2228,7 +2228,7 @@ static void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const rSecondItemId = ATTR_ROTATE_VALUE; break; case table::CellOrientation_STACKED: - rSet.Put( SfxBoolItem( ATTR_STACKED, sal_True ) ); + rSet.Put( SfxBoolItem( ATTR_STACKED, true ) ); break; default: { @@ -2535,7 +2535,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE ScDocument* pDoc = pDocShell->GetDocument(); ScMarkData aMark; aMark.SetMarkArea( *pFirst ); - aMark.SelectTable( pFirst->aStart.Tab(), sal_True ); + aMark.SelectTable( pFirst->aStart.Tab(), true ); pDoc->GetSelectionFrame( aMark, aOuter, aInner ); if (pEntry->nWID == SC_WID_UNO_TBLBORD2) @@ -3826,7 +3826,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden } } - aMarkData.FillRangeListWithMarks( &aNewRanges, sal_True ); + aMarkData.FillRangeListWithMarks( &aNewRanges, true ); } while ( bRecursive && bFound ); @@ -3873,7 +3873,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen { ScRange aRange( *aNewRanges[ nR ] ); if (aRange.Intersects(aRefRange)) - bMark = sal_True; // von Teil des Ranges abhaengig + bMark = true; // von Teil des Ranges abhaengig } } if (bMark) @@ -3885,7 +3885,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen } } - aMarkData.FillRangeListWithMarks( &aNewRanges, sal_True ); + aMarkData.FillRangeListWithMarks( &aNewRanges, true ); } while ( bRecursive && bFound ); @@ -5121,7 +5121,7 @@ void ScCellRangeObj::SetArrayFormula_Impl( const OUString& rFormula, // empty string -> erase array formula ScMarkData aMark; aMark.SetMarkArea( aRange ); - aMark.SelectTable( aRange.aStart.Tab(), sal_True ); + aMark.SelectTable( aRange.aStart.Tab(), true ); pDocSh->GetDocFunc().DeleteContents( aMark, IDF_CONTENTS, sal_True, sal_True ); } } @@ -5207,7 +5207,7 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula // empty sequence -> erase array formula ScMarkData aMark; aMark.SetMarkArea( aRange ); - aMark.SelectTable( aRange.aStart.Tab(), sal_True ); + aMark.SelectTable( aRange.aStart.Tab(), true ); pDocSh->GetDocFunc().DeleteContents( aMark, IDF_CONTENTS, sal_True, sal_True ); } } @@ -5753,7 +5753,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil ScFilterDescriptor* pNew = new ScFilterDescriptor(pDocSh); //! stattdessen vom Objekt? ScQueryParam aParam = pNew->GetParam(); - aParam.bHasHeader = sal_True; + aParam.bHasHeader = true; table::CellRangeAddress aDataAddress(xAddr->getRangeAddress()); aParam.nCol1 = (SCCOL)aDataAddress.StartColumn; @@ -5888,7 +5888,7 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException) if (pData) pData->GetSubTotalParam(aParam); // auch bei Remove die Feld-Eintraege behalten - aParam.bRemoveOnly = sal_True; + aParam.bRemoveOnly = true; SCTAB nTab = aRange.aStart.Tab(); aParam.nCol1 = aRange.aStart.Col(); @@ -6826,7 +6826,7 @@ void SAL_CALL ScCellObj::removeActionLock() throw(uno::RuntimeException) static_cast<ScCellEditSource*> (mxUnoText->GetEditSource()); if (pEditSource) { - pEditSource->SetDoUpdateData(sal_True); + pEditSource->SetDoUpdateData(true); if (pEditSource->IsDirty()) pEditSource->UpdateData(); } @@ -6862,7 +6862,7 @@ sal_Int16 SAL_CALL ScCellObj::resetActionLocks() throw(uno::RuntimeException) static_cast<ScCellEditSource*> (mxUnoText->GetEditSource()); if (pEditSource) { - pEditSource->SetDoUpdateData(sal_True); + pEditSource->SetDoUpdateData(true); if (pEditSource->IsDirty()) pEditSource->UpdateData(); } @@ -7195,7 +7195,7 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc 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 ) ); @@ -7286,7 +7286,7 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang OSL_ENSURE( rRangeAddress.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" ); ScRange aScRange; ScUnoConversion::FillScRange( aScRange, rRangeAddress ); - pDocSh->GetDocFunc().InsertCells( aScRange, NULL, eCmd, sal_True, sal_True ); + pDocSh->GetDocFunc().InsertCells( aScRange, NULL, eCmd, true, true ); } } } @@ -7317,7 +7317,7 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRang OSL_ENSURE( rRangeAddress.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" ); ScRange aScRange; ScUnoConversion::FillScRange( aScRange, rRangeAddress ); - pDocSh->GetDocFunc().DeleteCells( aScRange, NULL, eCmd, sal_True, sal_True ); + pDocSh->GetDocFunc().DeleteCells( aScRange, NULL, eCmd, true, true ); } } } @@ -8065,7 +8065,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd if (pDoc->IsScenario(nTab)) { ScMarkData aMarkData; - aMarkData.SelectTable( nTab, sal_True ); + aMarkData.SelectTable( nTab, true ); sal_uInt16 nRangeCount = (sal_uInt16)rScenRanges.getLength(); if (nRangeCount) @@ -8084,7 +8084,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd // Szenario-Ranges sind durch Attribut gekennzeichnet ScPatternAttr aPattern( pDoc->GetPool() ); aPattern.GetItemSet().Put( ScMergeFlagAttr( SC_MF_SCENARIO ) ); - aPattern.GetItemSet().Put( ScProtectionAttr( sal_True ) ); + aPattern.GetItemSet().Put( ScProtectionAttr( true ) ); pDocSh->GetDocFunc().ApplyAttributes( aMarkData, aPattern, sal_True, sal_True ); } } @@ -8160,7 +8160,7 @@ void ScTableSheetObj::setExternalName( const OUString& aUrl, const OUString& aSh const SCTAB nTab = GetTab_Impl(); const OUString aAbsDocName( ScGlobal::GetAbsDocName( aUrl, pDocSh ) ); const OUString aDocTabName( ScGlobal::GetDocTabName( aAbsDocName, aSheetName ) ); - if ( !pDoc->RenameTab( nTab, aDocTabName, false /*bUpdateRef*/, sal_True /*bExternalDocument*/ ) ) + if ( !pDoc->RenameTab( nTab, aDocTabName, false /*bUpdateRef*/, true /*bExternalDocument*/ ) ) { throw container::ElementExistException( OUString(), *this ); } @@ -8475,7 +8475,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn if (aValue >>= nValue) { if (nValue == com::sun::star::text::WritingMode2::RL_TB) - rFunc.SetLayoutRTL(nTab, sal_True, sal_True); + rFunc.SetLayoutRTL(nTab, true, sal_True); else rFunc.SetLayoutRTL(nTab, false, sal_True); } diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index 529ad63b1e38..16b42072af13 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -369,7 +369,7 @@ void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException) SCTAB nTab = aCursor.Tab(); ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) - pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab, 1,0, false,sal_True, aMark ); + pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab, 1,0, false,true, aMark ); //! sonst Exception oder so SetNewRange( ScRange( nNewX, nNewY, nTab ) ); @@ -391,7 +391,7 @@ void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException) SCTAB nTab = aCursor.Tab(); ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) - pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab, -1,0, false,sal_True, aMark ); + pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab, -1,0, false,true, aMark ); //! sonst Exception oder so SetNewRange( ScRange( nNewX, nNewY, nTab ) ); diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 3eb8198a8210..4f793bc3b22c 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -1413,8 +1413,8 @@ ScDataPilotDescriptor::ScDataPilotDescriptor(ScDocShell* pDocSh) : { ScDPSaveData aSaveData; // set defaults like in ScPivotParam constructor - aSaveData.SetColumnGrand( sal_True ); - aSaveData.SetRowGrand( sal_True ); + aSaveData.SetColumnGrand( true ); + aSaveData.SetRowGrand( true ); aSaveData.SetIgnoreEmptyRows( false ); aSaveData.SetRepeatIfEmpty( false ); mpDPObject->SetSaveData(aSaveData); @@ -2440,7 +2440,7 @@ void ScDataPilotFieldObj::setGroupInfo( const DataPilotFieldGroupInfo* pInfo ) if( pInfo && lclCheckMinMaxStep( *pInfo ) ) { ScDPNumGroupInfo aInfo; - aInfo.mbEnable = sal_True; + aInfo.mbEnable = true; aInfo.mbDateValues = pInfo->HasDateValues; aInfo.mbAutoStart = pInfo->HasAutoStart; aInfo.mbAutoEnd = pInfo->HasAutoEnd; diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index ea70be41e8cd..8ab87cab3f3b 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -608,7 +608,7 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew( if ( nPos < MAXSUBTOTAL && nColCount <= sal::static_int_cast<sal_uInt32>(SCCOL_MAX) ) { - aParam.bGroupActive[nPos] = sal_True; + aParam.bGroupActive[nPos] = true; aParam.nField[nPos] = static_cast<SCCOL>(nGroupColumn); delete aParam.pSubTotals[nPos]; diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index c5eeff8b8f86..f3b64c5fd73a 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -894,7 +894,7 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount(); for (SCTAB nTab = 0; nTab < nTabCount; nTab++) - rMark.SelectTable( nTab, sal_True ); + rMark.SelectTable( nTab, true ); rStatus.SetMode( SC_PRINTSEL_DOCUMENT ); bDone = true; } @@ -1134,7 +1134,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec { pDrawView = new FmFormView( pModel, pDev ); pDrawView->ShowSdrPage(pDrawView->GetModel()->GetPage(nTab)); - pDrawView->SetPrintPreview( sal_True ); + pDrawView->SetPrintPreview( true ); } ScRange aRange; @@ -1367,7 +1367,7 @@ void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) - pDocShell->DoRecalc(sal_True); + pDocShell->DoRecalc(true); else { OSL_FAIL("keine DocShell"); //! Exception oder so? @@ -1378,7 +1378,7 @@ void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) - pDocShell->DoHardRecalc(sal_True); + pDocShell->DoHardRecalc(true); else { OSL_FAIL("keine DocShell"); //! Exception oder so? @@ -1717,7 +1717,7 @@ void SAL_CALL ScModelObj::setPropertyValue( pDoc->SetDocOptions( aNewOpt ); //! Recalc only for options that need it? if ( bHardRecalc ) - pDocShell->DoHardRecalc( sal_True ); + pDocShell->DoHardRecalc( true ); pDocShell->SetDocumentModified(); } } @@ -2961,7 +2961,7 @@ void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 n { ScRange aRange( (SCCOL)(nStartCol+nPosition), 0, nTab, (SCCOL)(nStartCol+nPosition+nCount-1), MAXROW, nTab ); - bDone = pDocShell->GetDocFunc().InsertCells( aRange, NULL, INS_INSCOLS, sal_True, sal_True ); + bDone = pDocShell->GetDocFunc().InsertCells( aRange, NULL, INS_INSCOLS, true, true ); } if (!bDone) throw uno::RuntimeException(); // no other exceptions specified @@ -2977,7 +2977,7 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou { ScRange aRange( (SCCOL)(nStartCol+nIndex), 0, nTab, (SCCOL)(nStartCol+nIndex+nCount-1), MAXROW, nTab ); - bDone = pDocShell->GetDocFunc().DeleteCells( aRange, NULL, DEL_DELCOLS, sal_True, sal_True ); + bDone = pDocShell->GetDocFunc().DeleteCells( aRange, NULL, DEL_DELCOLS, true, true ); } if (!bDone) throw uno::RuntimeException(); // no other exceptions specified @@ -3220,7 +3220,7 @@ void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCou { ScRange aRange( 0, (SCROW)(nStartRow+nPosition), nTab, MAXCOL, (SCROW)(nStartRow+nPosition+nCount-1), nTab ); - bDone = pDocShell->GetDocFunc().InsertCells( aRange, NULL, INS_INSROWS, sal_True, sal_True ); + bDone = pDocShell->GetDocFunc().InsertCells( aRange, NULL, INS_INSROWS, true, true ); } if (!bDone) throw uno::RuntimeException(); // no other exceptions specified @@ -3236,7 +3236,7 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount { ScRange aRange( 0, (SCROW)(nStartRow+nIndex), nTab, MAXCOL, (SCROW)(nStartRow+nIndex+nCount-1), nTab ); - bDone = pDocShell->GetDocFunc().DeleteCells( aRange, NULL, DEL_DELROWS, sal_True, sal_True ); + bDone = pDocShell->GetDocFunc().DeleteCells( aRange, NULL, DEL_DELROWS, true, true ); } if (!bDone) throw uno::RuntimeException(); // no other exceptions specified @@ -3575,7 +3575,7 @@ void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Run if ( GetAddressByIndex_Impl( nIndex, aPos ) ) { ScMarkData aMarkData; - aMarkData.SelectTable( aPos.Tab(), sal_True ); + aMarkData.SelectTable( aPos.Tab(), true ); aMarkData.SetMultiMarkArea( ScRange(aPos) ); pDocShell->GetDocFunc().DeleteContents( aMarkData, IDF_NOTE, sal_True, sal_True ); @@ -3714,7 +3714,7 @@ void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName, if ( pDocShell ) { ScMarkData aMarkData; - aMarkData.SelectTable( nTab, sal_True ); + aMarkData.SelectTable( nTab, true ); sal_uInt16 nRangeCount = (sal_uInt16)aRanges.getLength(); if (nRangeCount) diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 0bc0b8d672de..d36b45c34ba8 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -745,7 +745,7 @@ sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const OUString& aName ) /** called from the XActionLockable interface methods on initial locking */ void ScNamedRangesObj::lock() { - pDocShell->GetDocument()->CompileNameFormula( sal_True ); // CreateFormulaString + pDocShell->GetDocument()->CompileNameFormula( true ); // CreateFormulaString } /** called from the XActionLockable interface methods on final unlock */ diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index f45b0fa04cb8..561bd73c9d53 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -1646,7 +1646,7 @@ void ScStyleObj::SetOnePropertyValue( const OUString& rPropertyName, const SfxIt rSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) ); break; case table::CellOrientation_STACKED: - rSet.Put( SfxBoolItem( ATTR_STACKED, sal_True ) ); + rSet.Put( SfxBoolItem( ATTR_STACKED, true ) ); break; default: { diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 9b2376332a20..1f0428e9b6c0 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -409,7 +409,7 @@ awt::Rectangle ScViewPaneBase::GetVisArea() const pViewShell->GetViewData()->GetPosY(eWhichV), pViewShell->GetViewData()->GetTabNo()); Rectangle aCellRect( pDoc->GetMMRect( aCell.Col(), aCell.Row(), aCell.Col(), aCell.Row(), aCell.Tab() ) ); - Size aVisSize( pWindow->PixelToLogic( pWindow->GetSizePixel(), pWindow->GetDrawMapMode( sal_True ) ) ); + Size aVisSize( pWindow->PixelToLogic( pWindow->GetSizePixel(), pWindow->GetDrawMapMode( true ) ) ); Point aVisPos( aCellRect.TopLeft() ); if ( pDoc->IsLayoutRTL( aCell.Tab() ) ) { @@ -780,7 +780,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) pViewSh->SetTabNo( pFirst->aStart.Tab() ); pViewSh->DoneBlockMode(); pViewSh->InitOwnBlockMode(); - pViewData->GetMarkData().MarkFromRangeList( rRanges, sal_True ); + pViewData->GetMarkData().MarkFromRangeList( rRanges, true ); pViewSh->MarkDataChanged(); pViewData->GetDocShell()->PostPaintGridAll(); // Markierung (alt&neu) if ( pFirst ) @@ -841,7 +841,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) { if (!bDrawSelModeSet && (pObj->GetLayer() == SC_LAYER_BACK)) { - pViewSh->SetDrawSelMode(sal_True); + pViewSh->SetDrawSelMode(true); pViewSh->UpdateLayerLocks(); bDrawSelModeSet = sal_True; } @@ -979,7 +979,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException) // remember if the selection was from the cursor position without anything selected // (used when rendering the selection) - pObj->SetCursorOnly( sal_True ); + pObj->SetCursorOnly( true ); } } @@ -1490,7 +1490,7 @@ void ScTabViewObj::SetZoom(sal_Int16 nZoom) } } Fraction aFract( nZoom, 100 ); - pViewSh->SetZoom( aFract, aFract, sal_True ); + pViewSh->SetZoom( aFract, aFract, true ); pViewSh->PaintGrid(); pViewSh->PaintTop(); pViewSh->PaintLeft(); @@ -1694,7 +1694,7 @@ void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixel ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { - pViewSh->SplitAtPixel( Point( nPixelX, nPixelY ), sal_True, sal_True ); + pViewSh->SplitAtPixel( Point( nPixelX, nPixelY ), true, true ); pViewSh->FreezeSplitters( false ); pViewSh->InvalidateSplit(); } @@ -1720,8 +1720,8 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow Point aSplit(pViewData->GetScrPos( (SCCOL)nColumns, (SCROW)nRows, SC_SPLIT_BOTTOMLEFT, sal_True )); aSplit += aWinStart; - pViewSh->SplitAtPixel( aSplit, sal_True, sal_True ); - pViewSh->FreezeSplitters( sal_True ); + pViewSh->SplitAtPixel( aSplit, true, true ); + pViewSh->FreezeSplitters( true ); pViewSh->InvalidateSplit(); } } diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index fd4994b8580f..a50834c74e06 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -212,7 +212,7 @@ void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, sal_uInt16 pDoc = pOwnClip->GetDocument(); pTabViewShell->PasteFromClip( nFlags, pDoc, nFunction, bSkipEmpty, bTranspose, bAsLink, - eMoveMode, IDF_NONE, sal_True ); + eMoveMode, IDF_NONE, true ); pTabViewShell->CellContentChanged(); } } diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 5fb27fb072b9..5a431f4b82d9 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -2308,7 +2308,7 @@ void setCursor( const SCCOL& nCol, const SCROW& nRow, const uno::Reference< fra if ( bInSel ) pShell->SetCursor( nCol, nRow ); else - pShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_NONE, false, false, sal_True, false ); + pShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_NONE, false, false, true, false ); } } @@ -3449,7 +3449,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& if ( nOrientation == excel::XlSortOrientation::xlSortRows ) aSortParam.bByRow = false; else - aSortParam.bByRow = sal_True; + aSortParam.bByRow = true; } @@ -3605,7 +3605,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) SfxAllItemSet aArgs( SFX_APP()->GetPool() ); // Hoping this will make sure this slot is called // synchronously - SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False ); + SfxBoolItem sfxAsync( SID_ASYNCHRON, false ); aArgs.Put( sfxAsync, sfxAsync.Which() ); SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher(); @@ -4891,7 +4891,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) { sal_Bool bColumn =thisAddress.StartRow == thisAddress.EndRow ? false:sal_True; ScDocument* pDoc = getDocumentFromRange( mxRange ); - ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(static_cast<SCTAB>(thisAddress.Sheet), sal_True); + ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(static_cast<SCTAB>(thisAddress.Sheet), true); const ScOutlineArray* pOutlineArray = bColumn ? pOutlineTable->GetColArray(): pOutlineTable->GetRowArray(); if( pOutlineArray ) { diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 4830e4401505..48e2037b8cf4 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -388,7 +388,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException) bSelectSingle = false; } else - rMarkData.SelectTable( static_cast< SCTAB >( pSheet->getSheetID() ), sal_True ); + rMarkData.SelectTable( static_cast< SCTAB >( pSheet->getSheetID() ), true ); } 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 ); |