From 51d0b4037b36a4a74c9181b95edb18017542ab79 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Wed, 9 Mar 2016 15:23:11 +0100 Subject: tdf#84938 Change defines to typed_flags Put defines into an enum class and use typed_flags template from o3tl to give them flag operators. There were some shift operations to apply flags from start references to end references, these went into a helper in address.hxx to hide them. A marco with shift operations in address.cxx was rewritten in two helpers without shifts. One shift remained in ScRange::Format with a comment. The other flag untypical operator was a minus 1 in a helper for ScRefFinder::ToggleRel, which iteratates through all possible combinations for absolute references. This is used to make referecnces absolute via SHIFT+F4. A replacement would be too complex. Change-Id: I4850f1623e01e56c60ac2260b95fc5cad8b6fd71 Signed-off-by: Jochen Nitschke Reviewed-on: https://gerrit.libreoffice.org/22840 Tested-by: Jenkins Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- sc/qa/unit/ucalc_pivottable.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sc/qa/unit/ucalc_pivottable.cxx') diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index ef143ffd7bbd..3ec7bd1d8b24 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -680,7 +680,7 @@ void Test::testPivotTableNamedSource() // Insert the raw data. ScRange aSrcRange = insertDPSourceData(m_pDoc, aFields, nFieldCount, aData, nDataCount); - OUString aRangeStr(aSrcRange.Format(SCR_ABS_3D, m_pDoc)); + OUString aRangeStr(aSrcRange.Format(ScRefFlags::RANGE_ABS_3D, m_pDoc)); // Name this range. OUString aRangeName("MyData"); @@ -2126,7 +2126,7 @@ void Test::testFuncGETPIVOTDATA() aPos = aOutRange.aEnd; aPos.IncRow(2); // Move 2 rows down from the table output. - OUString aPivotPosStr(aOutRange.aStart.Format(SCA_ABS)); + OUString aPivotPosStr(aOutRange.aStart.Format(ScRefFlags::ADDR_ABS)); sc::AutoCalcSwitch aSwitch(*m_pDoc, true); // turn autocalc on. @@ -2188,7 +2188,7 @@ void Test::testFuncGETPIVOTDATA() aPos = aOutRange.aEnd; aPos.IncRow(2); // move 2 rows down from the output. - aPivotPosStr = aOutRange.aStart.Format(SCA_ABS); + aPivotPosStr = aOutRange.aStart.Format(ScRefFlags::ADDR_ABS); // First, get the grand totals. aFormula = ("=GETPIVOTDATA(\"Sum - Value\";") + aPivotPosStr + ")"; -- cgit