[Libreoffice-commits] core.git: chart2/qa include/oox oox/source
Balazs Varga (via logerrit)
logerrit at kemper.freedesktop.org
Tue May 5 07:17:55 UTC 2020
chart2/qa/extras/chart2export.cxx | 18 +++++++++++++-----
include/oox/export/chartexport.hxx | 1 -
oox/source/export/chartexport.cxx | 37 +++++++++++++------------------------
3 files changed, 26 insertions(+), 30 deletions(-)
New commits:
commit 778a81c114187b193140ebe816eec0805f40b6ab
Author: Balazs Varga <balazs.varga991 at gmail.com>
AuthorDate: Fri Apr 17 14:12:00 2020 +0200
Commit: László Németh <nemeth at numbertext.org>
CommitDate: Tue May 5 09:17:22 2020 +0200
tdf#132486 Chart: fix OOXML export of ShiftedCategoryPosition
Regression from commit 75156c6fd73dc202df541306e1636727d51d6fc3
(tdf#132076 Chart OOXML: fix lost date format of X axis)
Change-Id: I4bb62959775b0b6ed11e1f7e5473c3b9805f4e29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92420
Tested-by: László Németh <nemeth at numbertext.org>
Reviewed-by: László Németh <nemeth at numbertext.org>
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 200704e90a8d..91fad970586e 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -2068,11 +2068,19 @@ void Chart2ExportTest::testCombinedChartSecondaryAxisODS()
void Chart2ExportTest::testCrossBetweenXLSX()
{
- // Original file was created with MS Office
- load("/chart2/qa/extras/data/xlsx/", "tdf127777.xlsx");
- xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
- CPPUNIT_ASSERT(pXmlDoc);
- assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
+ // Original files were created with MS Office
+ {
+ load("/chart2/qa/extras/data/xlsx/", "tdf127777.xlsx");
+ xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+ CPPUNIT_ASSERT(pXmlDoc);
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
+ }
+ {
+ load("/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
+ xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+ CPPUNIT_ASSERT(pXmlDoc);
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
+ }
}
void Chart2ExportTest::testCrossBetweenWithDeletedAxis()
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index 39c446fac4aa..194e15628aef 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -106,7 +106,6 @@ private:
// members filled by InitRangeSegmentationProperties (retrieved from DataProvider)
bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false
- bool mbIsCategoryPositionShifted; //if the value axis crosses the category axis between tickmarks this will be true
//css::uno::Reference< css::drawing::XShapes > mxAdditionalShapes;
css::uno::Reference< css::chart2::data::XDataSequence > mxCategoriesValues;
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 556e8a8a5958..211b5b456438 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -219,46 +219,37 @@ static bool lcl_hasCategoryLabels( const Reference< chart2::XChartDocument >& xC
return xCategories.is();
}
-static bool lcl_isCategoryAxisShifted(const Reference< chart2::XChartDocument >& xChartDoc)
+static bool lcl_isCategoryAxisShifted( const Reference< chart2::XDiagram >& xDiagram )
{
- Reference< chart2::XDiagram > xDiagram(xChartDoc->getFirstDiagram());
- bool isCategoryPositionShifted = false;
-
+ bool bCategoryPositionShifted = false;
try
{
Reference< chart2::XCoordinateSystemContainer > xCooSysCnt(
xDiagram, uno::UNO_QUERY_THROW);
const Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq(
xCooSysCnt->getCoordinateSystems());
- for( const auto& xCooSys : aCooSysSeq )
+ for (const auto& xCooSys : aCooSysSeq)
{
OSL_ASSERT(xCooSys.is());
- for( sal_Int32 nN = xCooSys->getDimension(); nN--; )
+ if( 0 < xCooSys->getDimension() && 0 <= xCooSys->getMaximumAxisIndexByDimension(0) )
{
- const sal_Int32 nMaxAxisIndex = xCooSys->getMaximumAxisIndexByDimension(nN);
- for( sal_Int32 nI = 0; nI <= nMaxAxisIndex; ++nI )
+ Reference< chart2::XAxis > xAxis = xCooSys->getAxisByDimension(0, 0);
+ OSL_ASSERT(xAxis.is());
+ if (xAxis.is())
{
- Reference< chart2::XAxis > xAxis = xCooSys->getAxisByDimension(nN, nI);
- OSL_ASSERT(xAxis.is());
- if( xAxis.is())
- {
- chart2::ScaleData aScaleData = xAxis->getScaleData();
- if( aScaleData.AxisType == AXIS_PRIMARY_Y )
- {
- isCategoryPositionShifted = aScaleData.ShiftedCategoryPosition;
- break;
- }
- }
+ chart2::ScaleData aScaleData = xAxis->getScaleData();
+ bCategoryPositionShifted = aScaleData.ShiftedCategoryPosition;
+ break;
}
}
}
}
- catch (const uno::Exception &)
+ catch (const uno::Exception&)
{
DBG_UNHANDLED_EXCEPTION("oox");
}
- return isCategoryPositionShifted;
+ return bCategoryPositionShifted;
}
static sal_Int32 lcl_getCategoryAxisType( const Reference< chart2::XDiagram >& xDiagram, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
@@ -447,7 +438,6 @@ ChartExport::ChartExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, Reference< f
, mxChartModel( xModel )
, mpURLTransformer(std::make_shared<URLTransformer>())
, mbHasCategoryLabels( false )
- , mbIsCategoryPositionShifted( false )
, mbHasZAxis( false )
, mbIs3DChart( false )
, mbStacked(false)
@@ -805,7 +795,6 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha
if( xDataProvider.is())
{
mbHasCategoryLabels = lcl_hasCategoryLabels( xChartDoc );
- mbIsCategoryPositionShifted = lcl_isCategoryAxisShifted( xChartDoc );
}
}
catch( const uno::Exception & )
@@ -3095,7 +3084,7 @@ void ChartExport::_exportAxis(
// crossBetween
if( nAxisType == XML_valAx )
{
- if( mbIsCategoryPositionShifted )
+ if( lcl_isCategoryAxisShifted( mxNewDiagram ))
pFS->singleElement(FSNS(XML_c, XML_crossBetween), XML_val, "between");
else
pFS->singleElement(FSNS(XML_c, XML_crossBetween), XML_val, "midCat");
More information about the Libreoffice-commits
mailing list