chart2/qa/extras/chart2_trendcalculators.cxx | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
New commits:
commit a353f633ec029fc5c7cdc8062aefb6f979265a9e
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon May 16 15:58:20 2022 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu May 19 01:53:42 2022 +0200
chart2: simplify sheet indices constants for trendline calc. test
Change-Id: I3ec16c33446d20b6d795c5950ceb882ff78fb029
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134382
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx
b/chart2/qa/extras/chart2_trendcalculators.cxx
index 309df9f2bfb4..6562bb835cd8 100644
--- a/chart2/qa/extras/chart2_trendcalculators.cxx
+++ b/chart2/qa/extras/chart2_trendcalculators.cxx
@@ -14,18 +14,12 @@
// Define the index of sheets in the test document
-#define SHEET_POTENTIAL1 0
-#define SHEET_POTENTIAL2 ( SHEET_POTENTIAL1 + 1)
-#define SHEET_POTENTIAL_LAST ( SHEET_POTENTIAL2 )
-
-#define SHEET_LINEAR1 ( SHEET_POTENTIAL_LAST + 1 )
-#define SHEET_LINEAR_LAST ( SHEET_LINEAR1 )
-
-#define SHEET_POLYNOMIAL1 ( SHEET_LINEAR_LAST + 1 )
-#define SHEET_POLYNOMIAL_LAST ( SHEET_POLYNOMIAL1 )
-
-#define SHEET_EXPONENTIAL1 ( SHEET_POLYNOMIAL_LAST + 1 )
-#define SHEET_EXPONENTIAL2 ( SHEET_EXPONENTIAL1 + 1 )
+constexpr sal_Int32 SHEET_POTENTIAL1 = 0;
+constexpr sal_Int32 SHEET_POTENTIAL2 = 1;
+constexpr sal_Int32 SHEET_LINEAR1 = 2;
+constexpr sal_Int32 SHEET_POLYNOMIAL1 = 3;
+constexpr sal_Int32 SHEET_EXPONENTIAL1 = 4;
+constexpr sal_Int32 SHEET_EXPONENTIAL2 = 5;
class Chart2TrendCalculators : public ChartTest
{
