summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/core/tool/scmatrix.cxx4
-rw-r--r--sc/source/filter/excel/xestyle.cxx6
-rw-r--r--sc/source/filter/excel/xetable.cxx10
-rw-r--r--sc/source/ui/dbgui/PivotLayoutDialog.cxx20
-rw-r--r--sc/source/ui/optdlg/calcoptionsdlg.cxx6
-rw-r--r--sc/source/ui/view/preview.cxx8
6 files changed, 27 insertions, 27 deletions
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index c70bf7188347..345020cba372 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1095,9 +1095,9 @@ public:
WalkElementBlocksMultipleValues(bool bTextAsZero, const std::vector<std::unique_ptr<_Op>>& aOp) :
maOp(aOp), mbFirst(true), mbTextAsZero(bTextAsZero)
{
- for (const auto& pOp : maOp)
+ for (const auto& rpOp : maOp)
{
- maRes.emplace_back(pOp->mInitVal, pOp->mInitVal, 0);
+ maRes.emplace_back(rpOp->mInitVal, rpOp->mInitVal, 0);
}
maRes.emplace_back(0.0, 0.0, 0); // count
}
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 3f826554411e..8e67c026e4c1 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -661,12 +661,12 @@ sal_uInt32 XclExpPaletteImpl::GetLeastUsedListColor() const
for( sal_uInt32 nIdx = 0, nCount = mxColorList->size(); nIdx < nCount; ++nIdx )
{
- XclListColor& pEntry = *mxColorList->at( nIdx ).get();
+ XclListColor& rEntry = *mxColorList->at( nIdx ).get();
// ignore the base colors
- if( !pEntry.IsBaseColor() && (pEntry.GetWeighting() < nMinW) )
+ if( !rEntry.IsBaseColor() && (rEntry.GetWeighting() < nMinW) )
{
nFound = nIdx;
- nMinW = pEntry.GetWeighting();
+ nMinW = rEntry.GetWeighting();
}
}
return nFound;
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 647728d92ef4..25e978c58d35 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2147,20 +2147,20 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt
else
{
comphelper::ThreadPool &rPool = comphelper::ThreadPool::getSharedOptimalPool();
- std::vector<RowFinalizeTask*> pTasks(nThreads, nullptr);
+ std::vector<RowFinalizeTask*> aTasks(nThreads, nullptr);
for ( size_t i = 0; i < nThreads; i++ )
- pTasks[ i ] = new RowFinalizeTask( rColXFIndexes, i == 0 );
+ aTasks[ i ] = new RowFinalizeTask( rColXFIndexes, i == 0 );
RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd = maRowMap.end();
size_t nIdx = 0;
for ( itr = itrBeg; itr != itrEnd; ++itr, ++nIdx )
- pTasks[ nIdx % nThreads ]->push_back( itr->second.get() );
+ aTasks[ nIdx % nThreads ]->push_back( itr->second.get() );
for ( size_t i = 1; i < nThreads; i++ )
- rPool.pushTask( pTasks[ i ] );
+ rPool.pushTask( aTasks[ i ] );
// Progress bar updates must be synchronous to avoid deadlock
- pTasks[0]->doWork();
+ aTasks[0]->doWork();
rPool.waitUntilEmpty();
}
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 72eec8a9024a..c65172c8d1b2 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -561,25 +561,25 @@ void ScPivotLayoutDialog::ApplyLabelData(ScDPSaveData& rSaveData)
for (it = rLabelDataVector.begin(); it != rLabelDataVector.end(); ++it)
{
- const ScDPLabelData& pLabelData = *it->get();
+ const ScDPLabelData& rLabelData = *it->get();
- OUString aUnoName = ScDPUtil::createDuplicateDimensionName(pLabelData.maName, pLabelData.mnDupCount);
+ OUString aUnoName = ScDPUtil::createDuplicateDimensionName(rLabelData.maName, rLabelData.mnDupCount);
ScDPSaveDimension* pSaveDimensions = rSaveData.GetExistingDimensionByName(aUnoName);
if (pSaveDimensions == nullptr)
continue;
- pSaveDimensions->SetUsedHierarchy(pLabelData.mnUsedHier);
- pSaveDimensions->SetShowEmpty(pLabelData.mbShowAll);
- pSaveDimensions->SetRepeatItemLabels(pLabelData.mbRepeatItemLabels);
- pSaveDimensions->SetSortInfo(&pLabelData.maSortInfo);
- pSaveDimensions->SetLayoutInfo(&pLabelData.maLayoutInfo);
- pSaveDimensions->SetAutoShowInfo(&pLabelData.maShowInfo);
+ pSaveDimensions->SetUsedHierarchy(rLabelData.mnUsedHier);
+ pSaveDimensions->SetShowEmpty(rLabelData.mbShowAll);
+ pSaveDimensions->SetRepeatItemLabels(rLabelData.mbRepeatItemLabels);
+ pSaveDimensions->SetSortInfo(&rLabelData.maSortInfo);
+ pSaveDimensions->SetLayoutInfo(&rLabelData.maLayoutInfo);
+ pSaveDimensions->SetAutoShowInfo(&rLabelData.maShowInfo);
- bool bManualSort = (pLabelData.maSortInfo.Mode == DataPilotFieldSortMode::MANUAL);
+ bool bManualSort = (rLabelData.maSortInfo.Mode == DataPilotFieldSortMode::MANUAL);
std::vector<ScDPLabelData::Member>::const_iterator itMember;
- for (itMember = pLabelData.maMembers.begin(); itMember != pLabelData.maMembers.end(); ++itMember)
+ for (itMember = rLabelData.maMembers.begin(); itMember != rLabelData.maMembers.end(); ++itMember)
{
const ScDPLabelData::Member& rLabelMember = *itMember;
ScDPSaveMember* pMember = pSaveDimensions->GetMemberByName(rLabelMember.maName);
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 19697c4db490..3978f695a689 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -318,9 +318,9 @@ struct OpenCLTester
mbOldAutoCalc = mpDoc->GetAutoCalc();
mpDoc->SetAutoCalc(false);
mpOldCalcConfig = ScInterpreter::GetGlobalConfig();
- ScCalcConfig pConfig(mpOldCalcConfig);
- pConfig.mnOpenCLMinimumFormulaGroupSize = 20;
- ScInterpreter::SetGlobalConfig(pConfig);
+ ScCalcConfig aConfig(mpOldCalcConfig);
+ aConfig.mnOpenCLMinimumFormulaGroupSize = 20;
+ ScInterpreter::SetGlobalConfig(aConfig);
mpDoc->SetString(ScAddress(0,0,0), "Result:");
}
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index a2cc775db2a7..49d62ba33b53 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -1188,8 +1188,8 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
const SfxPoolItem* pItem = nullptr;
if ( rStyleSet.GetItemState( ATTR_PAGE_HEADERSET, false, &pItem ) == SfxItemState::SET )
{
- const SfxItemSet& pHeaderSet = static_cast<const SvxSetItem*>(pItem)->GetItemSet();
- Size aHeaderSize = static_cast<const SvxSizeItem&>(pHeaderSet.Get(ATTR_PAGE_SIZE)).GetSize();
+ const SfxItemSet& rHeaderSet = static_cast<const SvxSetItem*>(pItem)->GetItemSet();
+ Size aHeaderSize = static_cast<const SvxSizeItem&>(rHeaderSet.Get(ATTR_PAGE_SIZE)).GetSize();
aHeaderSize.Height() = (long)( aButtonUpPt.Y() / HMM_PER_TWIPS + aOffset.Y() / HMM_PER_TWIPS - aULItem.GetUpper());
aHeaderSize.Height() = aHeaderSize.Height() * 100 / mnScale;
SvxSetItem aNewHeader( static_cast<const SvxSetItem&>(rStyleSet.Get(ATTR_PAGE_HEADERSET)) );
@@ -1203,8 +1203,8 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
const SfxPoolItem* pItem = nullptr;
if( rStyleSet.GetItemState( ATTR_PAGE_FOOTERSET, false, &pItem ) == SfxItemState::SET )
{
- const SfxItemSet& pFooterSet = static_cast<const SvxSetItem*>(pItem)->GetItemSet();
- Size aFooterSize = static_cast<const SvxSizeItem&>(pFooterSet.Get(ATTR_PAGE_SIZE)).GetSize();
+ const SfxItemSet& rFooterSet = static_cast<const SvxSetItem*>(pItem)->GetItemSet();
+ Size aFooterSize = static_cast<const SvxSizeItem&>(rFooterSet.Get(ATTR_PAGE_SIZE)).GetSize();
aFooterSize.Height() = (long)( nHeight - aButtonUpPt.Y() / HMM_PER_TWIPS - aOffset.Y() / HMM_PER_TWIPS - aULItem.GetLower() );
aFooterSize.Height() = aFooterSize.Height() * 100 / mnScale;
SvxSetItem aNewFooter( static_cast<const SvxSetItem&>(rStyleSet.Get(ATTR_PAGE_FOOTERSET)) );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 22:53:56 +0000