[Libreoffice-commits] core.git: chart2/qa oox/source

[Markus Mohrhard]

 chart2/qa/extras/chart2export.cxx |    9 ---------
 dev/null                          |binary
 oox/source/export/chartexport.cxx |    7 -------
 3 files changed, 16 deletions(-)

New commits:
commit 0ff4ec7f0a44af22794c2919a13978b3af1bb0b3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 8 02:46:41 2015 +0200

    Revert "Related: tdf#93676 in msword chart appears with axis positioned between ticks"
    
    This reverts commit 10654c038c0bc20fb348be7164e08f3de98718f4.

diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 7004e97..1e73718 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -99,7 +99,6 @@ public:
     void testBarChartVaryColorsXLSX();
     void testMultipleAxisXLSX();
     void testAxisTitleRotationXLSX();
-    void testAxisCrossBetweenXSLX();
 
     CPPUNIT_TEST_SUITE(Chart2ExportTest);
     CPPUNIT_TEST(testErrorBarXLSX);
@@ -163,7 +162,6 @@ public:
     CPPUNIT_TEST(testBarChartVaryColorsXLSX);
     CPPUNIT_TEST(testMultipleAxisXLSX);
     CPPUNIT_TEST(testAxisTitleRotationXLSX);
-    CPPUNIT_TEST(testAxisCrossBetweenXSLX);
     CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -1475,13 +1473,6 @@ void Chart2ExportTest::testAxisTitleRotationXLSX()
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:bodyPr", "rot", "0");
 }
 
-void Chart2ExportTest::testAxisCrossBetweenXSLX()
-{
-    load("/chart2/qa/extras/data/odt/", "axis-position.odt");
-    xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
-    assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", "midCat");
-}
-
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/odt/axis-position.odt b/chart2/qa/extras/data/odt/axis-position.odt
deleted file mode 100644
index 35ea152..0000000
Binary files a/chart2/qa/extras/data/odt/axis-position.odt and /dev/null differ
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index b60c2b7..5438db3 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2828,13 +2828,6 @@ void ChartExport::_exportAxis(
 
     exportTextProps(xAxisProp);
 
-    if (nAxisType == XML_valAx)
-    {
-        pFS->singleElement( FSNS( XML_c, XML_crossBetween ),
-                XML_val, "midCat",
-                FSEND );
-    }
-
     pFS->singleElement( FSNS( XML_c, XML_crossAx ),
             XML_val, I32S( rAxisIdPair.nCrossAx ),
             FSEND );