sc/inc/conditio.hxx | 10 +++++-----
sc/source/core/data/conditio.cxx | 20 ++++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 2ed282bedf626ac93ce005906aed7fc2bb835a55
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Nov 25 21:15:18 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Nov 26 10:24:03 2024 +0100
sc: prefix members of ScConditionalFormat
Change-Id: Ib8d6b19f4ff1a5a641039f7e06083430b53a6edb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177301
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 3d22a16c7d33..a179d8d8d875 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -617,8 +617,8 @@ public:
// complete conditional formatting
class ScConditionalFormat
{
- ScDocument* pDoc;
- sal_uInt32 nKey; // Index in attributes
+ ScDocument* mpDoc;
+ sal_uInt32 mnKey; // Index in attributes
std::vector<std::unique_ptr<ScFormatEntry>> maEntries;
ScRangeList maRanges; // Ranges for conditional format
@@ -669,13 +669,13 @@ public:
void DoRepaint();
- sal_uInt32 GetKey() const { return nKey; }
- void SetKey(sal_uInt32 nNew) { nKey = nNew; } // only if not
inserted!
+ sal_uInt32 GetKey() const { return mnKey; }
+ void SetKey(sal_uInt32 nNew) { mnKey = nNew; } // only if
not inserted!
bool MarkUsedExternalReferences() const;
// sorted (via std::set) by Index
- bool operator < ( const ScConditionalFormat& r ) const { return nKey <
r.nKey; }
+ bool operator < ( const ScConditionalFormat& r ) const { return mnKey <
r.mnKey; }
void startRendering();
void endRendering();
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 29c1c2654f83..94ced759894a 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1786,8 +1786,8 @@ void ScColorFormatCache::Notify(const SfxHint& rHint)
ScConditionalFormat::ScConditionalFormat(sal_uInt32 nNewKey, ScDocument*
pDocument) :
- pDoc( pDocument ),
- nKey( nNewKey )
+ mpDoc( pDocument ),
+ mnKey( nNewKey )
{
}
@@ -1795,9 +1795,9 @@ std::unique_ptr<ScConditionalFormat>
ScConditionalFormat::Clone(ScDocument* pNew
{
// Real copy of the formula (for Ref Undo/between documents)
if (!pNewDoc)
- pNewDoc = pDoc;
+ pNewDoc = mpDoc;
- std::unique_ptr<ScConditionalFormat> pNew(new ScConditionalFormat(nKey,
pNewDoc));
+ std::unique_ptr<ScConditionalFormat> pNew(new ScConditionalFormat(mnKey,
pNewDoc));
pNew->SetRange( maRanges ); // prerequisite for listeners
for (const auto& rxEntry : maEntries)
@@ -1863,7 +1863,7 @@ size_t ScConditionalFormat::size() const
ScDocument* ScConditionalFormat::GetDocument()
{
- return pDoc;
+ return mpDoc;
}
ScConditionalFormat::~ScConditionalFormat()
@@ -1941,7 +1941,7 @@ ScCondFormatData ScConditionalFormat::GetData(
ScRefCellValue& rCell, const ScAd
void ScConditionalFormat::DoRepaint()
{
// all conditional format cells
- pDoc->RepaintRange( maRanges );
+ mpDoc->RepaintRange( maRanges );
}
void ScConditionalFormat::CompileAll()
@@ -1967,7 +1967,7 @@ void ScConditionalFormat::UpdateReference(
sc::RefUpdateContext& rCxt, bool bCop
// ScConditionEntry::UpdateReference() obtains its aSrcPos from
// maRanges and does not update it on URM_COPY, but it's needed later
// for the moved position, so update maRanges beforehand.
- maRanges.UpdateReference(URM_MOVE, pDoc, rCxt.maRange,
rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta);
+ maRanges.UpdateReference(URM_MOVE, mpDoc, rCxt.maRange,
rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta);
for (auto& rxEntry : maEntries)
rxEntry->UpdateReference(rCxt);
}
@@ -1975,7 +1975,7 @@ void ScConditionalFormat::UpdateReference(
sc::RefUpdateContext& rCxt, bool bCop
{
for (auto& rxEntry : maEntries)
rxEntry->UpdateReference(rCxt);
- maRanges.UpdateReference(rCxt.meMode, pDoc, rCxt.maRange,
rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta);
+ maRanges.UpdateReference(rCxt.meMode, mpDoc, rCxt.maRange,
rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta);
}
ResetCache();
@@ -2162,8 +2162,8 @@ void ScConditionalFormat::CalcAll()
void ScConditionalFormat::ResetCache() const
{
- if (!maRanges.empty() && pDoc)
- mpCache = std::make_unique<ScColorFormatCache>(*pDoc, maRanges);
+ if (!maRanges.empty() && mpDoc)
+ mpCache = std::make_unique<ScColorFormatCache>(*mpDoc, maRanges);
else
mpCache.reset();
}
