summaryrefslogtreecommitdiff
path: root/sc/qa/unit
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-11-22 19:50:52 +0100
committerEike Rathke <erack@redhat.com>2016-11-22 19:56:33 +0100
commit50244309501d738e7314fa79785db139c826f8d7 (patch)
tree109eba4ff688bfc1762420b261ae3957c857995d /sc/qa/unit
parent8e31d8a27baa76564f3b71e0d31750ae56873c61 (diff)
[API Change] revert incompatible change of enum css::sheet::GeneralFunction
Quick solution before 5-3 branch off without reverting everything related. This will need a new constant value type for API instead of the enum and an internal mapping from/to the enum. Kept the GeneralFunction_MEDIAN at all places in uing code so it can be easily grep'ed for. Change-Id: I95256649f16ded08e467003d2924be0ff5efb87f
Diffstat (limited to 'sc/qa/unit')
-rw-r--r--sc/qa/unit/subsequent_export-test.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 158f26b31404..9b2441ab17fe 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -2968,9 +2968,16 @@ void ScExportTest::testPivotTableMedian()
std::vector<ScDPSaveDimension const *>::size_type(1), aDims.size());
const ScDPSaveDimension* pDim = aDims.back();
+#if 0
+// disabled because of css::sheet::GeneralFunction API incompatibility
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Function for the data field should be MEDIAN.",
sal_uInt16(sheet::GeneralFunction_MEDIAN), pDim->GetFunction());
+#else
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(
+ "Function for the data field should be MEDIAN.",
+ sal_uInt16(sheet::GeneralFunction_NONE), pDim->GetFunction());
+#endif
xDocSh2->DoClose();
}