diff options
Diffstat (limited to 'sc/source/core')
-rw-r--r-- | sc/source/core/data/table1.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/table6.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/address.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/compiler.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/interpr3.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/interpr4.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/interpr8.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/rangelst.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/reffind.cxx | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index ede4096b7f3d..6a3527f36709 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -108,7 +108,7 @@ void GetOptimalHeightsInColumn( const SCROW nMinStart = nPos; sal_uLong nWeightedCount = nProgressStart + rCol.back().GetWeightedCount(nStartRow, nEndRow); - const SCCOL maxCol = (rCol.size() - 1); // last col done already above + const SCCOL maxCol = rCol.size() - 1; // last col done already above const SCCOL progressUpdateStep = rCol.size() / 10; for (SCCOL nCol=0; nCol<maxCol; nCol++) { diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 53e74aba6d20..021a185aaf99 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -812,8 +812,8 @@ bool ScTable::SearchAndReplace( // This is also done in SvxSearchDialog CommandHdl, but not in API object. if ( !rSearchItem.IsUseAsianOptions() ) aSearchOptions.transliterateFlags &= - ( TransliterationFlags::IGNORE_CASE | - TransliterationFlags::IGNORE_WIDTH ); + TransliterationFlags::IGNORE_CASE | + TransliterationFlags::IGNORE_WIDTH; pSearchText.reset( new utl::TextSearch( aSearchOptions ) ); diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index abb057647be3..20dc149c2abc 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -2002,7 +2002,7 @@ template<typename T > static void lcl_Format( T& r, SCTAB nTab, SCROW nRow, SCCO const ScAddress::Details& rDetails) { if( nFlags & ScRefFlags::VALID ) - nFlags |= ( ScRefFlags::ROW_VALID | ScRefFlags::COL_VALID | ScRefFlags::TAB_VALID ); + nFlags |= ScRefFlags::ROW_VALID | ScRefFlags::COL_VALID | ScRefFlags::TAB_VALID; if( pDoc && (nFlags & ScRefFlags::TAB_VALID ) ) { if ( nTab < 0 || nTab >= pDoc->GetTableCount() ) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index eef51bbeecff..b47fe824f004 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -409,7 +409,7 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv ) /* */ t[32] |= ScCharFlags::Word; /* ! */ t[33] |= ScCharFlags::Ident | ScCharFlags::Word; /* " */ t[34] |= ScCharFlags::Word; -/* # */ t[35] &= (~ScCharFlags::WordSep); +/* # */ t[35] &= ~ScCharFlags::WordSep; /* # */ t[35] |= ScCharFlags::Word; /* % */ t[37] |= ScCharFlags::Word; /* ' */ t[39] |= ScCharFlags::Word; diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index f91d0037ddb5..2d7a8bafec5b 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -2696,7 +2696,7 @@ void ScInterpreter::ScTTest() return; } double fSumD = fSum1 - fSum2; - double fDivider = (fCount*fSumSqrD - fSumD*fSumD); + double fDivider = fCount*fSumSqrD - fSumD*fSumD; if ( fDivider == 0.0 ) { PushError(FormulaError::DivisionByZero); diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index cc3672cbdbeb..43009c30d180 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -439,7 +439,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, *p++ = nLen; memcpy( p, aTmp.getStr(), nStrLen + 1); nPos += 10 + nStrLen + 1; - sal_uInt8* q = ( pCellArr + nPos ); + sal_uInt8* q = pCellArr + nPos; if( (nStrLen & 1) == 0 ) { *q++ = 0; @@ -556,7 +556,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, *p++ = nLen; memcpy( p, aTmp.getStr(), nStrLen + 1); nPos += 2 + nStrLen + 1; - sal_uInt8* q = ( pCellArr + nPos ); + sal_uInt8* q = pCellArr + nPos; if( (nStrLen & 1) == 0 ) { *q++ = 0; diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 8fad91109fbc..a3b77cb14004 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -977,7 +977,7 @@ void ScETSForecastCalculation::GetETSPredictionIntervals( const ScMatrixRef& rTM fMaxTarget = convertXtoMonths( fMaxTarget ) - maRange[ mnCount - 1 ].X; else fMaxTarget -= maRange[ mnCount - 1 ].X; - SCSIZE nSize = ( fMaxTarget / mfStepSize ); + SCSIZE nSize = fMaxTarget / mfStepSize; if ( fmod( fMaxTarget, mfStepSize ) != 0.0 ) nSize++; @@ -1106,7 +1106,7 @@ void ScETSForecastCalculation::GetEDSPredictionIntervals( const ScMatrixRef& rTM fMaxTarget = convertXtoMonths( fMaxTarget ) - maRange[ mnCount - 1 ].X; else fMaxTarget -= maRange[ mnCount - 1 ].X; - SCSIZE nSize = ( fMaxTarget / mfStepSize ); + SCSIZE nSize = fMaxTarget / mfStepSize; if ( fmod( fMaxTarget, mfStepSize ) != 0.0 ) nSize++; diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 93fb0b6f7208..575c0eee363d 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -154,8 +154,8 @@ ScRefFlags ScRangeList::Parse( const OUString& rStr, const ScDocument* pDoc, aRange.aStart.SetTab( nTab ); // default tab if not specified ScRefFlags nRes = aRange.ParseAny( aOne, pDoc, eConv ); ScRefFlags nEndRangeBits = ScRefFlags::COL2_VALID | ScRefFlags::ROW2_VALID | ScRefFlags::TAB2_VALID; - ScRefFlags nTmp1 = ( nRes & ScRefFlags::BITS ); - ScRefFlags nTmp2 = ( nRes & nEndRangeBits ); + ScRefFlags nTmp1 = nRes & ScRefFlags::BITS; + ScRefFlags nTmp2 = nRes & nEndRangeBits; // If we have a valid single range with // any of the address bits we are interested in // set - set the equiv end range bits diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx index 230218c5334a..970fa880b993 100644 --- a/sc/source/core/tool/reffind.cxx +++ b/sc/source/core/tool/reffind.cxx @@ -217,7 +217,7 @@ ScRefFinder::~ScRefFinder() static ScRefFlags lcl_NextFlags( ScRefFlags nOld ) { - const ScRefFlags Mask_ABS = (ScRefFlags::COL_ABS | ScRefFlags::ROW_ABS | ScRefFlags::TAB_ABS); + const ScRefFlags Mask_ABS = ScRefFlags::COL_ABS | ScRefFlags::ROW_ABS | ScRefFlags::TAB_ABS; ScRefFlags nNew = nOld & Mask_ABS; nNew = ScRefFlags( static_cast<std::underlying_type<ScRefFlags>::type>(nNew) - 1 ) & Mask_ABS; // weiterzaehlen |