Kaydet (Commit) 10609749 authored tarafından Tamás Zolnai's avatar Tamás Zolnai

tdf#122765: Legend interferes with pie chart after pptx import

Revert the commit caused this regression:
0fc41c53

The original issue does not come back with
reverting this commit.

Change-Id: I666c4f92e3b70b416ec6da7a704298d207451649
Reviewed-on: https://gerrit.libreoffice.org/72679
Tested-by: Jenkins
Reviewed-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
üst 40d25921
......@@ -126,6 +126,7 @@ public:
void testExternalStrRefsXLSX();
void testSourceNumberFormatComplexCategoriesXLS();
void testTdf123504();
void testTdf122765();
CPPUNIT_TEST_SUITE(Chart2ImportTest);
CPPUNIT_TEST(Fdo60083);
......@@ -206,6 +207,7 @@ public:
CPPUNIT_TEST(testExternalStrRefsXLSX);
CPPUNIT_TEST(testSourceNumberFormatComplexCategoriesXLS);
CPPUNIT_TEST(testTdf123504);
CPPUNIT_TEST(testTdf122765);
CPPUNIT_TEST_SUITE_END();
......@@ -1870,6 +1872,27 @@ void Chart2ImportTest::testTdf123504()
CPPUNIT_ASSERT_GREATER(sal_Int32(8500), aSliceSize.Width);
}
void Chart2ImportTest::testTdf122765()
{
// The horizontal position of the slices was wrong.
load("/chart2/qa/extras/data/pptx/", "tdf122765.pptx");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY);
Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW);
Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW);
Reference<drawing::XShape> xSeriesSlices(getShapeByName(xShapes, "CID/D=0:CS=0:CT=0:Series=0"),
UNO_SET_THROW);
Reference<container::XIndexAccess> xIndexAccess(xSeriesSlices, UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(sal_Int32(9), xIndexAccess->getCount());
Reference<drawing::XShape> xSlice(xIndexAccess->getByIndex(0), UNO_QUERY_THROW);
// Check position of the first slice, all slices move together, so enough to check only one.
// Wrong poisition was around 5856.
awt::Point aSlicePosition = xSlice->getPosition();
CPPUNIT_ASSERT_GREATER(sal_Int32(7000), aSlicePosition.X);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
......
......@@ -238,7 +238,6 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram )
// manual size needs ChartLegendExpansion_CUSTOM and LegendPosition_CUSTOM (tdf#118150)
if( aLayoutConv.convertFromModel( aPropSet ) )
{
eLegendPos = cssc2::LegendPosition_CUSTOM;
eLegendExpand = cssc::ChartLegendExpansion_CUSTOM;
}
bManualLayout = !aLayoutConv.getAutoLayout();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment