summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorPriyankaGaikwad <priyanka.gaikwad@synerzip.com>2014-02-03 17:30:49 +0530
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-02-12 03:06:34 +0100
commitc753c0b937ee4a86ac6a5f2617ffb59f65e7e713 (patch)
tree5561e90d79e0d4e62caba732dfa24e9c9484110c /chart2
parentffb1053b287fddd2c96757e5c6825381afc43fa1 (diff)
fdo#74111 3D Rotation is wrong after Round trip for bar chart
3D Rotation is lost after Round trip for bar chart. XML Difference: Original: <c:rotX val="30"/> <c:rotY val="50"/> Round Trip: <c:rotX val="42"/> <c:rotY val="42"/> Implementation: The RightAngledAxes should set first then the RotationVertical and RotationHorizontal because the RightAngledAxes is needed while setting Rotation. Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: I64f3b6e56f8515bf6c3d935c59dfaf1d440dba31
Diffstat (limited to 'chart2')
-rw-r--r--chart2/qa/extras/chart2export.cxx12
-rw-r--r--chart2/qa/extras/data/docx/barChartRotation.docxbin0 -> 24220 bytes
2 files changed, 12 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 7714084095c3..1cd52be0f1dd 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -45,6 +45,7 @@ public:
void testDisplayUnits();
void testFdo74115WallGradientFill();
void testFdo74115WallBitmapFill();
+ void testBarChartRotation();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(test);
@@ -62,6 +63,7 @@ public:
CPPUNIT_TEST(testDisplayUnits);
CPPUNIT_TEST(testFdo74115WallGradientFill);
CPPUNIT_TEST(testFdo74115WallBitmapFill);
+ CPPUNIT_TEST(testBarChartRotation);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -566,6 +568,16 @@ void Chart2ExportTest::testFdo74115WallBitmapFill()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill");
}
+void Chart2ExportTest::testBarChartRotation()
+{
+ load ("/chart2/qa/extras/data/docx/", "barChartRotation.docx");
+ xmlDocPtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
+ CPPUNIT_ASSERT(pXmlDoc);
+
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", "30");
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY", "val", "50");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/barChartRotation.docx b/chart2/qa/extras/data/docx/barChartRotation.docx
new file mode 100644
index 000000000000..bf4be47b3407
--- /dev/null
+++ b/chart2/qa/extras/data/docx/barChartRotation.docx
Binary files differ