diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-17 13:20:22 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-17 13:20:22 +0100 |
commit | cd42389ad67b403a07a0dda8e2a6e213def49251 (patch) | |
tree | 51e19c743788a549502b7c801c64e11142103310 /sc/source/core/tool/doubleref.cxx | |
parent | 3d6a5a98cda10e18dacd96028f2bf0ec0b478988 (diff) |
removetooltypes01: #i112600# remove tooltypes from sc
Diffstat (limited to 'sc/source/core/tool/doubleref.cxx')
-rw-r--r-- | sc/source/core/tool/doubleref.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 740413ea8533..7af5a17125ee 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -68,8 +68,8 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, if (pQueryRef->getColSize() < 4) return false; - BOOL bValid; - BOOL bFound; + sal_Bool bValid; + sal_Bool bFound; OUString aCellStr; SCSIZE nIndex = 0; SCROW nRow = 0; @@ -81,7 +81,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, { ScQueryEntry& rEntry = pParam->GetEntry(nIndex); - bValid = FALSE; + bValid = sal_False; if (nIndex > 0) { @@ -91,19 +91,19 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_UND)) ) { rEntry.eConnect = SC_AND; - bValid = TRUE; + bValid = sal_True; } else if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_ODER)) ) { rEntry.eConnect = SC_OR; - bValid = TRUE; + bValid = sal_True; } } if ((nIndex < 1) || bValid) { // field name in the 2nd column. - bFound = FALSE; + bFound = sal_False; aCellStr = pQueryRef->getString(1, nRow); SCCOL nField = pDBRef->findFieldColumn(aCellStr); // TODO: must be case insensitive comparison. if (ValidCol(nField)) @@ -118,7 +118,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, if (bValid) { // equality, non-equality operator in the 3rd column. - bFound = FALSE; + bFound = sal_False; aCellStr = pQueryRef->getString(2, nRow); lcl_toUpper(aCellStr); const sal_Unicode* p = aCellStr.getStr(); @@ -147,7 +147,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, { // Finally, the right-hand-side value in the 4th column. *rEntry.pStr = pQueryRef->getString(3, nRow); - rEntry.bDoQuery = TRUE; + rEntry.bDoQuery = sal_True; } nIndex++; nRow++; @@ -177,7 +177,7 @@ bool lcl_createExcelQuery( if (bValid) { -// ULONG nVisible = 0; +// sal_uLong nVisible = 0; // for ( nCol=nCol1; nCol<=nCol2; nCol++ ) // nVisible += aCol[nCol].VisibleCount( nRow1+1, nRow2 ); @@ -214,7 +214,7 @@ bool lcl_createExcelQuery( pParam->GetEntry(nIndex).eConnect = SC_AND; } else - bValid = FALSE; + bValid = sal_False; } nCol++; } @@ -380,7 +380,7 @@ sal_uInt16 ScDBInternalRange::getCellString(OUString& rStr, ScBaseCell* pCell) c if (pFCell->IsValue()) { double fVal = pFCell->GetValue(); - ULONG nIndex = pFormatter->GetStandardFormat( + sal_uLong nIndex = pFormatter->GetStandardFormat( NUMBERFORMAT_NUMBER, ScGlobal::eLnge); pFormatter->GetInputLineString(fVal, nIndex, aStr); @@ -392,7 +392,7 @@ sal_uInt16 ScDBInternalRange::getCellString(OUString& rStr, ScBaseCell* pCell) c case CELLTYPE_VALUE: { double fVal = ((ScValueCell*) pCell)->GetValue(); - ULONG nIndex = pFormatter->GetStandardFormat( + sal_uLong nIndex = pFormatter->GetStandardFormat( NUMBERFORMAT_NUMBER, ScGlobal::eLnge); pFormatter->GetInputLineString(fVal, nIndex, aStr); @@ -419,9 +419,9 @@ SCCOL ScDBInternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr) SCCOL nDBCol2 = e.Col(); SCCOL nField = nDBCol1; - BOOL bFound = TRUE; + sal_Bool bFound = sal_True; - bFound = FALSE; + bFound = sal_False; OUString aCellStr; ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 ); while (!bFound && (aLook.Col() <= nDBCol2)) |