sc/source/core/tool/token.cxx | 39 +++++++++++++++++++++++++++++++++------
1 file changed, 33 insertions(+), 6 deletions(-)
New commits:
commit 23b0112ecea2f8796a4e237e9061de1a36997a30
Author: Eike Rathke <er...@redhat.com>
Date: Thu Feb 26 16:14:09 2015 +0100
tdf#81659 check that references are at least 2 cols/rows to expand edge
Needs also 0cd15b4494f8e8abe67a258fb10189135bf5a8ac if edges are to be
expanded and formula grouping is affected.
Change-Id: Ib3cee8dd214d216907248316a2ac5a290399b169
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 77489fd..ce101fc 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2479,9 +2479,18 @@ bool expandRange( const sc::RefUpdateContext& rCxt,
ScRange& rRefRange, const Sc
// Selected range is only partially overlapping in vertical
direction. Bail out.
return false;
- if (!rCxt.mrDoc.IsExpandRefs() && rSelectedRange.aStart.Col() <=
rRefRange.aStart.Col())
- // Selected range is at the left end and the edge expansion is
turned off. No expansion.
- return false;
+ if (rCxt.mrDoc.IsExpandRefs())
+ {
+ if (rRefRange.aEnd.Col() - rRefRange.aStart.Col() < 1)
+ // Reference must be at least two columns wide.
+ return false;
+ }
+ else
+ {
+ if (rSelectedRange.aStart.Col() <= rRefRange.aStart.Col())
+ // Selected range is at the left end and the edge expansion is
turned off. No expansion.
+ return false;
+ }
// Move the last column position to the right.
SCCOL nDelta = rSelectedRange.aEnd.Col() - rSelectedRange.aStart.Col()
+ 1;
@@ -2495,9 +2504,18 @@ bool expandRange( const sc::RefUpdateContext& rCxt,
ScRange& rRefRange, const Sc
// Selected range is only partially overlapping in horizontal
direction. Bail out.
return false;
- if (!rCxt.mrDoc.IsExpandRefs() && rSelectedRange.aStart.Row() <=
rRefRange.aStart.Row())
- // Selected range is at the top end and the edge expansion is
turned off. No expansion.
- return false;
+ if (rCxt.mrDoc.IsExpandRefs())
+ {
+ if (rRefRange.aEnd.Row() - rRefRange.aStart.Row() < 1)
+ // Reference must be at least two rows tall.
+ return false;
+ }
+ else
+ {
+ if (rSelectedRange.aStart.Row() <= rRefRange.aStart.Row())
+ // Selected range is at the top end and the edge expansion is
turned off. No expansion.
+ return false;
+ }
// Move the last row position down.
SCROW nDelta = rSelectedRange.aEnd.Row() - rSelectedRange.aStart.Row()
+ 1;
@@ -2524,6 +2542,11 @@ bool expandRangeByEdge( const sc::RefUpdateContext&
rCxt, ScRange& rRefRange, co
if (rCxt.mnColDelta > 0)
{
// Insert and shift right.
+
+ if (rRefRange.aEnd.Col() - rRefRange.aStart.Col() < 1)
+ // Reference must be at least two columns wide.
+ return false;
+
if (rRefRange.aStart.Row() < rSelectedRange.aStart.Row() ||
rSelectedRange.aEnd.Row() < rRefRange.aEnd.Row())
// Selected range is only partially overlapping in vertical
direction. Bail out.
return false;
@@ -2539,6 +2562,10 @@ bool expandRangeByEdge( const sc::RefUpdateContext&
rCxt, ScRange& rRefRange, co
}
else if (rCxt.mnRowDelta > 0)
{
+ if (rRefRange.aEnd.Row() - rRefRange.aStart.Row() < 1)
+ // Reference must be at least two rows tall.
+ return false;
+
if (rRefRange.aStart.Col() < rSelectedRange.aStart.Col() ||
rSelectedRange.aEnd.Col() < rRefRange.aEnd.Col())
// Selected range is only partially overlapping in horizontal
direction. Bail out.
return false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
