sc/source/ui/inc/output.hxx | 2 +-
sc/source/ui/view/output2.cxx | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 742f3edc530d5c1ee323cf8575b4842e8c4ee597
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Jul 26 13:52:44 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Sun Jul 27 20:23:10 2025 +0200
rename oLastEmptyCellX->oFirstNonEmptyCellX
which is more accurate
Change-Id: I2322a9666fe709ba82aa8106a45185a4b61ed09f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188399
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 9819289fcefa..f120c2d66253 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -315,7 +315,7 @@ private:
/// inner loop of LayoutStrings
void LayoutStringsImpl(bool bPixelToLogic, RowInfo* pThisRowInfo, SCCOL
nX, SCROW nY, SCSIZE nArrY,
- std::optional<SCCOL>& oLastEmptyCellX,
+ std::optional<SCCOL>& oFirstNonEmptyCellX,
SCCOL nLastContentCol,
std::vector<std::unique_ptr<ScPatternAttr> >&
aAltPatterns,
const ScPatternAttr*& pOldPattern,
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 6b85d6f7efaa..470d2f4c3de5 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1558,10 +1558,10 @@ void ScOutputData::LayoutStrings(bool bPixelToLogic)
tools::Long nPosX = nInitPosX;
if ( nLoopStartX < mnX1 )
nPosX -= mpRowInfo[0].basicCellInfo(nLoopStartX).nWidth *
nLayoutSign;
- std::optional<SCCOL> oLastEmptyCellX;
+ std::optional<SCCOL> oFirstNonEmptyCellX;
for (SCCOL nX=nLoopStartX; nX<=mnX2; nX++)
{
- LayoutStringsImpl(bPixelToLogic, pThisRowInfo, nX, nY, nArrY,
oLastEmptyCellX, nLastContentCol,
+ LayoutStringsImpl(bPixelToLogic, pThisRowInfo, nX, nY, nArrY,
oFirstNonEmptyCellX, nLastContentCol,
aAltPatterns, pOldPattern, pOldCondSet,
nOldScript, aVars,
bProgress, nPosX, nPosY, bTaggedPDF,
bReopenRowTag, pPDF, nLayoutSign, aDX);
nPosX += mpRowInfo[0].basicCellInfo(nX).nWidth * nLayoutSign;
@@ -1579,7 +1579,7 @@ void ScOutputData::LayoutStrings(bool bPixelToLogic)
/// inner loop of LayoutStrings
void ScOutputData::LayoutStringsImpl(bool const bPixelToLogic, RowInfo* const
pThisRowInfo,
SCCOL const nX, SCROW const nY, SCSIZE const nArrY,
- std::optional<SCCOL>& oLastEmptyCellX,
+ std::optional<SCCOL>& oFirstNonEmptyCellX,
SCCOL const nLastContentCol,
std::vector<std::unique_ptr<ScPatternAttr> >& aAltPatterns,
const ScPatternAttr*& pOldPattern,
@@ -1628,19 +1628,19 @@ void ScOutputData::LayoutStringsImpl(bool const
bPixelToLogic, RowInfo* const pT
if ( bEmpty && !bMergeEmpty && nX < mnX1 && !bOverlapped )
{
- if (!oLastEmptyCellX)
+ if (!oFirstNonEmptyCellX)
{
SCCOL nTempX=mnX1;
while (nTempX > 0 && IsEmptyCellText( pThisRowInfo, nTempX, nY ))
--nTempX;
- oLastEmptyCellX = nTempX;
+ oFirstNonEmptyCellX = nTempX;
}
- if ( *oLastEmptyCellX < mnX1 &&
- !IsEmptyCellText( pThisRowInfo, *oLastEmptyCellX, nY ) &&
- !mpDoc->HasAttrib( *oLastEmptyCellX,nY,mnTab, mnX1,nY,mnTab,
HasAttrFlags::Merged | HasAttrFlags::Overlapped ) )
+ if ( *oFirstNonEmptyCellX < mnX1 &&
+ !IsEmptyCellText( pThisRowInfo, *oFirstNonEmptyCellX, nY ) &&
+ !mpDoc->HasAttrib( *oFirstNonEmptyCellX,nY,mnTab, mnX1,nY,mnTab,
HasAttrFlags::Merged | HasAttrFlags::Overlapped ) )
{
- nCellX = *oLastEmptyCellX;
+ nCellX = *oFirstNonEmptyCellX;
bDoCell = true;
}
}
