diff options
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/data/document.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/global.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/chgtrack.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/reffind.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 93e75ed8e4c1..b8c5db350e15 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -2521,7 +2521,7 @@ void ScDocument::MergeNumberFormatter(ScDocument* pSrcDoc) if (pOtherFormatter && pOtherFormatter != pThisFormatter) { SvNumberFormatterIndexTable* pExchangeList = - pThisFormatter->MergeFormatter(*(pOtherFormatter)); + pThisFormatter->MergeFormatter(*pOtherFormatter); if (!pExchangeList->empty()) pFormatExchangeList = pExchangeList; } diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index c8821157da4e..0bbe0c7fd0cf 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -859,13 +859,13 @@ void ScGlobal::OpenURL(const OUString& rURL, const OUString& rTarget) SvtSecurityOptions aSecOpt; bool bCtrlClickHappened = (nScClickMouseModifier & KEY_MOD1); bool bCtrlClickSecOption = aSecOpt.IsOptionSet( SvtSecurityOptions::EOption::CtrlClickHyperlink ); - if( bCtrlClickHappened && !( bCtrlClickSecOption ) ) + if( bCtrlClickHappened && ! bCtrlClickSecOption ) { // return since ctrl+click happened when the // ctrl+click security option was disabled, link should not open return; } - else if( !( bCtrlClickHappened ) && bCtrlClickSecOption ) + else if( ! bCtrlClickHappened && bCtrlClickSecOption ) { // ctrl+click did not happen; only click happened maybe with some // other key combo. and security option is set, so return diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index cb9421ea5996..5d567b5bd464 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -2058,12 +2058,12 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo ) const SCROW ScChangeTrack::nContentRowsPerSlot = InitContentRowsPerSlot(); const SCSIZE ScChangeTrack::nContentSlots = - (MAXROWCOUNT) / InitContentRowsPerSlot() + 2; + MAXROWCOUNT / InitContentRowsPerSlot() + 2; SCROW ScChangeTrack::InitContentRowsPerSlot() { const SCSIZE nMaxSlots = 0xffe0 / sizeof( ScChangeActionContent* ) - 2; - SCROW nRowsPerSlot = (MAXROWCOUNT) / nMaxSlots; + SCROW nRowsPerSlot = MAXROWCOUNT / nMaxSlots; if ( nRowsPerSlot * nMaxSlots < sal::static_int_cast<SCSIZE>(MAXROWCOUNT) ) ++nRowsPerSlot; return nRowsPerSlot; diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 59730d7d7185..35665811c462 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2210,7 +2210,7 @@ void ScInterpreter::ScCell() } else if( aInfoType == "ADDRESS" ) { // address formatted as [['FILENAME'#]$TABLE.]$COL$ROW - ScRefFlags nFlags = (aCellPos.Tab() == aPos.Tab()) ? (ScRefFlags::ADDR_ABS) : (ScRefFlags::ADDR_ABS_3D); + ScRefFlags nFlags = (aCellPos.Tab() == aPos.Tab()) ? ScRefFlags::ADDR_ABS : ScRefFlags::ADDR_ABS_3D; OUString aStr(aCellPos.Format(nFlags, pDok, pDok->GetAddressConvention())); PushString(aStr); } @@ -8795,7 +8795,7 @@ void ScInterpreter::ScSearch() if (!bBool) PushNoValue(); else - PushDouble((double)(nPos) + 1); + PushDouble((double)nPos + 1); } } } diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx index 463100359dfc..48e9c18dc358 100644 --- a/sc/source/core/tool/reffind.cxx +++ b/sc/source/core/tool/reffind.cxx @@ -219,7 +219,7 @@ static ScRefFlags lcl_NextFlags( ScRefFlags nOld ) { const ScRefFlags Mask_ABS = (ScRefFlags::COL_ABS | ScRefFlags::ROW_ABS | ScRefFlags::TAB_ABS); ScRefFlags nNew = nOld & Mask_ABS; - nNew = ScRefFlags( (std::underlying_type<ScRefFlags>::type)(nNew) - 1 ) & Mask_ABS; // weiterzaehlen + nNew = ScRefFlags( (std::underlying_type<ScRefFlags>::type)nNew - 1 ) & Mask_ABS; // weiterzaehlen if (!(nOld & ScRefFlags::TAB_3D)) nNew &= ~ScRefFlags::TAB_ABS; // not 3D -> never absolute! |