tdf#136267 OOXML Chart Import: create main category axis labels once
commita360a150c8cdcbea4f6e8c40646795eb6a5f1dcc
authorBalazs Varga <balazs.varga991@gmail.com>
Fri, 11 Sep 2020 12:14:13 +0000 (11 14:14 +0200)
committerAndras Timar <andras.timar@collabora.com>
Thu, 19 Nov 2020 19:56:09 +0000 (19 20:56 +0100)
treea007e408bb7b0f3e56c4cc3d7a19a5e138eb0ad7
parent61abda685e2bc1ec4b108614799b8bc1c01183ec
tdf#136267 OOXML Chart Import: create main category axis labels once

because InternalDataProvider can not handle different category names
on the primary and secondary category axis.

Revert e0b0502516a10181bbd1737b93b38b2bba4c98e8 commit, except
the relevant unit test.

Regression from commit: e0b0502516a10181bbd1737b93b38b2bba4c98e8
(tdf#128016 Chart OOXML Import: fix duplicated category labels)

Also fix tdf#129994 (FILEOPEN - hang at import time), which is a
a regression from commit fa0a981af41a2606541eec1cb20a379a739691e0
(tdf#114166 DOCX chart import: fix missing complex categories)

Change-Id: I5d049e760eb1a647ea774be264349a2f16f15f5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102463
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103617
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106084
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
chart2/qa/extras/chart2export.cxx
chart2/qa/extras/data/xlsx/tdf136267.xlsx [new file with mode: 0644]
chart2/source/tools/ExplicitCategoriesProvider.cxx
oox/inc/drawingml/chart/typegroupmodel.hxx
oox/source/drawingml/chart/axisconverter.cxx
oox/source/drawingml/chart/plotareaconverter.cxx
oox/source/drawingml/chart/typegroupconverter.cxx
oox/source/drawingml/chart/typegroupmodel.cxx