diff options
author | Jean-Pierre Ledure <jp@ledure.be> | 2021-11-27 12:45:34 +0100 |
---|---|---|
committer | Jean-Pierre Ledure <jp@ledure.be> | 2021-11-27 15:52:37 +0100 |
commit | 50b7545ecb06028a19d6a46932f13728492decfb (patch) | |
tree | 33dcb7359f3674a5974515c961d1269e034b1204 /wizards | |
parent | db8edd163cf453bbb9b85c2a17c78da49df27cdf (diff) |
ScriptForge - (SF_Calc) fix ShiftXXX() methods with negative offset
Example:
oCalc.ShiftDown("A10:D15", , -1)
gives an "Object variable 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>
(cherry picked from commit ec18e2545c752c2d33e16f23de6b2dfd6a04e0e7)
Change-Id: I708f17fb5d646b1e159fbe47184f4abbd014863e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125899
Tested-by: Jenkins
Tested-by: Jean-Pierre Ledure <jp@ledure.be>
Reviewed-by: Jean-Pierre Ledure <jp@ledure.be>
Diffstat (limited to 'wizards')
-rw-r--r-- | wizards/source/sfdocuments/SF_Calc.xba | 8 |
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: ' Manage the height of the area to shift ' 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 <= 0 Then Rows = lHeight If _LastCell(.XSpreadsheet)(1) + Rows > MAXROWS Then GoTo Catch If Rows <> lHeight Then Set oShiftAddress = _Offset(oSourceAddress, 0, 0, Rows, 0).XCellRange.RangeAddress @@ -2630,7 +2630,7 @@ Try: ' Manage the width of the area to delete ' 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 <= 0 Then Columns = lWidth If Columns < lWidth Then Set oShiftAddress = _Offset(oSourceAddress, 0, 0, 0, Columns).XCellRange.RangeAddress Else ' Columns is capped at the range width @@ -2710,7 +2710,7 @@ Try: ' Manage the width of the area to Shift ' 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 <= 0 Then Columns = lWidth If _LastCell(.XSpreadsheet)(0) + Columns > MAXCOLS Then GoTo Catch If Columns <> lWidth Then Set oShiftAddress = _Offset(oSourceAddress, 0, 0, 0, Columns).XCellRange.RangeAddress @@ -2792,7 +2792,7 @@ Try: ' Manage the height of the area to delete ' 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 <= 0 Then Rows = lHeight If Rows < lHeight Then Set oShiftAddress = _Offset(oSourceAddress, 0, 0, Rows, 0).XCellRange.RangeAddress Else ' Rows is capped at the range height |