sc/source/ui/view/viewfun2.cxx | 63 ++++++++++++++++++++++++-----------------
1 file changed, 37 insertions(+), 26 deletions(-)
New commits:
commit 7dd57a914be5f8fc2b53b7725c16625887cf7439
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Thu Jun 20 18:02:38 2019 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Thu Jun 20 21:34:59 2019 +0200
Resolves: tdf#108209 let auto fill handle double click stop at existing data
Also consolidate the code to take both, left and right, data areas
into account, still preferring left if it exists.
Change-Id: I3d46b32f3790fd367fe92712fbcab0c392294599
Reviewed-on: https://gerrit.libreoffice.org/74462
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index f34ce438dae7..b97b40b95068 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1658,40 +1658,51 @@ void ScViewFunc::FillCrossDblClick()
if ( nEndY < MAXROW )
{
- if ( nStartX > 0 )
+ const bool bDataLeft = (nStartX > 0);
+ if (bDataLeft || nEndX < MAXCOL)
{
- SCCOL nMovX = nStartX - 1;
- SCROW nMovY = nStartY;
+ // Check that there is
+ // 1) data immediately left (preferred) or right of start (row) of
selection
+ // 2) data there below
+ // 3) no data immediately below selection
- if ( pDoc->HasData( nMovX, nStartY, nTab ) &&
- pDoc->HasData( nMovX, nStartY + 1, nTab ) )
+ SCCOL nMovX = (bDataLeft ? nStartX - 1 : nEndX + 1);
+ SCROW nMovY = nStartY;
+ bool bDataFound = (pDoc->HasData( nMovX, nStartY, nTab) &&
pDoc->HasData( nMovX, nStartY + 1, nTab));
+ if (!bDataFound && bDataLeft && nEndX < MAXCOL)
{
- pDoc->FindAreaPos( nMovX, nMovY, nTab, SC_MOVE_DOWN );
-
- if ( nMovY > nEndY )
- {
- FillAuto( FILL_TO_BOTTOM, nStartX, nStartY, nEndX, nEndY,
- nMovY - nEndY );
- return;
- }
+ nMovX = nEndX + 1; // check right
+ bDataFound = (pDoc->HasData( nMovX, nStartY, nTab) &&
pDoc->HasData( nMovX, nStartY + 1, nTab));
}
- }
- if ( nEndX < MAXCOL )
- {
- SCCOL nMovX = nEndX + 1;
- SCROW nMovY = nStartY;
-
- if ( pDoc->HasData( nMovX, nStartY, nTab ) &&
- pDoc->HasData( nMovX, nStartY + 1, nTab ) )
+ if (bDataFound && pDoc->IsBlockEmpty( nTab, nStartX, nEndY + 1,
nEndX, nEndY + 1, true))
{
- pDoc->FindAreaPos( nMovX, nMovY, nTab, SC_MOVE_DOWN );
+ // Get end of data left or right.
+ pDoc->FindAreaPos( nMovX, nMovY, nTab, SC_MOVE_DOWN);
+ // Find minimum end row of below empty area and data right.
+ for (SCCOL nX = nStartX; nX <= nEndX; ++nX)
+ {
+ SCROW nY = nEndY + 1;
+ // Get next row with data in this column.
+ pDoc->FindAreaPos( nX, nY, nTab, SC_MOVE_DOWN);
+ if (nMovY == MAXROW && nY == MAXROW)
+ {
+ // FindAreaPos() returns MAXROW also if there is no
+ // data at all from the start, so check if that
+ // contains data if the nearby (left or right) data
+ // ends there and increment if no data here, pretending
+ // the next data would be thereafter so nMovY will not
+ // be decremented.
+ if (!pDoc->HasData( nX, nY, nTab))
+ ++nY;
+ }
+ if (nMovY > nY - 1)
+ nMovY = nY - 1;
+ }
- if ( nMovY > nEndY )
+ if (nMovY > nEndY)
{
- FillAuto( FILL_TO_BOTTOM, nStartX, nStartY, nEndX, nEndY,
- nMovY - nEndY );
- return;
+ FillAuto( FILL_TO_BOTTOM, nStartX, nStartY, nEndX, nEndY,
nMovY - nEndY);
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
