diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-03-19 02:15:25 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-03-19 02:36:46 +0100 |
| commit | 7e18e657c1ae33c35c8046676b1da195b0d3f493 (patch) | |
| tree | 3a5cb3798967063f41c9198dc2bbff37ee00e678 | |
| parent | bf033461c5cb0053253f410da7f17dd2e12771c3 (diff) | |
let us keep the gnumeric value handling in xmloff
Change-Id: I51c7ca53ec8b023dc06b43ec9cb1052d135d14d5
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 13 | ||||
| -rw-r--r-- | sc/Module_sc.mk | 2 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/chart/PropertyMap.hxx | 8 |
4 files changed, 5 insertions, 20 deletions
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 6f9d57f05860..846dd0a5e489 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -284,19 +284,6 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue case 6: aInnerValue = chart2::CurveStyle_STEP_CENTER_Y; break; - // map the pre-ODF1.3 Gnumeric values to ODF1.3 - case 7: - aInnerValue = chart2::CurveStyle_STEP_START; - break; - case 8: - aInnerValue = chart2::CurveStyle_STEP_END; - break; - case 9: - aInnerValue = chart2::CurveStyle_STEP_CENTER_X; - break; - case 10: - aInnerValue = chart2::CurveStyle_STEP_CENTER_Y; - break; default: SAL_WARN_IF(chart2::CurveStyle_LINES != 0, "chart2", "Unknown line style"); aInnerValue = chart2::CurveStyle_LINES; diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 4a4fc4192b85..6f36f6900da4 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -44,8 +44,6 @@ endif $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_ucalc \ - CppunitTest_sc_filters_test \ - CppunitTest_sc_rangelst_test \ )) $(eval $(call gb_Module_add_slowcheck_targets,sc, \ diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index ec9465228ee5..6f58ffe4a3a0 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -607,7 +607,6 @@ void testFuncN(ScDocument* pDoc) void testFuncCOUNTIF(ScDocument* pDoc) { // COUNTIF (test case adopted from OOo i#36381) - // Empty A1:A39 first. clearRange(pDoc, ScRange(0, 0, 0, 0, 40, 0)); @@ -1212,6 +1211,7 @@ void Test::testCellFunctions() void Test::testCopyToDocument() { CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet", m_pDoc->InsertTab (0, "src")); + *((int*)42)=42; m_pDoc->SetString(0, 0, 0, "Header"); m_pDoc->SetString(0, 1, 0, "1"); diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 023947194930..6363fa26af2a 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -299,10 +299,10 @@ SvXMLEnumMapEntry aXMLChartInterpolationTypeEnumMap[] = { ::xmloff::token::XML_STEP_CENTER_Y, 6 }, // the GNM values should only be used for reading Gnumeric ods files // they should never be used for writing ods file - { ::xmloff::token::XML_GNM_STEP_START, 7 }, - { ::xmloff::token::XML_GNM_STEP_END, 8 }, - { ::xmloff::token::XML_GNM_STEP_CENTER_X, 9 }, - { ::xmloff::token::XML_GNM_STEP_CENTER_Y, 10 }, + { ::xmloff::token::XML_GNM_STEP_START, 3 }, + { ::xmloff::token::XML_GNM_STEP_END, 4 }, + { ::xmloff::token::XML_GNM_STEP_CENTER_X, 5 }, + { ::xmloff::token::XML_GNM_STEP_CENTER_Y, 6 }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; |