summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorJean-Pierre Ledure <jp@ledure.be>2021-11-27 12:45:34 +0100
committerJean-Pierre Ledure <jp@ledure.be>2021-11-27 14:52:43 +0100
commitec18e2545c752c2d33e16f23de6b2dfd6a04e0e7 (patch)
tree2005771581e36c3966d83a4a291ff85fbcd4470c /wizards
parent770cb7825b772366ab61d4f6f7a98de30b5cd80a (diff)
ScriptForge - (SF_Calc) fix ShiftXXX() methods with negative offset
Example: oCalc.ShiftDown("A10:D15", , -1) gives an "Objectvariable not set" Basic runtime error. Fixed by replacing 4x '= 0' by '<= 0' test in If statements checking the argument value. Change-Id: I272112a1addd303b7b38d3d9eb2ef73034e28727 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125939 Tested-by: Jean-Pierre Ledure <jp@ledure.be> Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure <jp@ledure.be>
Diffstat (limited to 'wizards')
-rw-r--r--wizards/source/sfdocuments/SF_Calc.xba8
1 files changed, 4 insertions, 4 deletions
diff --git a/wizards/source/sfdocuments/SF_Calc.xba b/wizards/source/sfdocuments/SF_Calc.xba
index 0eca75aa25f3..e5b35e4afa12 100644
--- a/wizards/source/sfdocuments/SF_Calc.xba
+++ b/wizards/source/sfdocuments/SF_Calc.xba
@@ -2548,7 +2548,7 @@ Try:
&apos; Manage the height of the area to shift
&apos; The insertCells() method inserts a number of rows equal to the height of the cell range to shift
lHeight = .Height
- If Rows = 0 Then Rows = lHeight
+ If Rows &lt;= 0 Then Rows = lHeight
If _LastCell(.XSpreadsheet)(1) + Rows &gt; MAXROWS Then GoTo Catch
If Rows &lt;&gt; lHeight Then
Set oShiftAddress = _Offset(oSourceAddress, 0, 0, Rows, 0).XCellRange.RangeAddress
@@ -2630,7 +2630,7 @@ Try:
&apos; Manage the width of the area to delete
&apos; The removeRange() method erases a number of columns equal to the width of the cell range to delete
lWidth = .Width
- If Columns = 0 Then Columns = lWidth
+ If Columns &lt;= 0 Then Columns = lWidth
If Columns &lt; lWidth Then
Set oShiftAddress = _Offset(oSourceAddress, 0, 0, 0, Columns).XCellRange.RangeAddress
Else &apos; Columns is capped at the range width
@@ -2710,7 +2710,7 @@ Try:
&apos; Manage the width of the area to Shift
&apos; The insertCells() method inserts a number of columns equal to the width of the cell range to Shift
lWidth = .Width
- If Columns = 0 Then Columns = lWidth
+ If Columns &lt;= 0 Then Columns = lWidth
If _LastCell(.XSpreadsheet)(0) + Columns &gt; MAXCOLS Then GoTo Catch
If Columns &lt;&gt; lWidth Then
Set oShiftAddress = _Offset(oSourceAddress, 0, 0, 0, Columns).XCellRange.RangeAddress
@@ -2792,7 +2792,7 @@ Try:
&apos; Manage the height of the area to delete
&apos; The removeRange() method erases a number of rows equal to the height of the cell range to delete
lHeight = .Height
- If Rows = 0 Then Rows = lHeight
+ If Rows &lt;= 0 Then Rows = lHeight
If Rows &lt; lHeight Then
Set oShiftAddress = _Offset(oSourceAddress, 0, 0, Rows, 0).XCellRange.RangeAddress
Else &apos; Rows is capped at the range height