commit 8c1dc30cc9fc96ef3d3ab0c4445959473248ae4d
author Tamas Bunth <tamas.bunth@collabora.co.uk> Wed Jan 01 15:31:40 2020 +0100
committer Xisco Faulí <xiscofauli@libreoffice.org> Tue Jan 07 10:40:44 2020 +0100
tree 3e0a2deebaa2b94163352469fdaf6bb8efa4a5e0
parent e88a993b5b0a1a6245a0ae9e1d1e9f365ec7cba3

tdf#125444 Percentage as custom chart label

Support importing ooxml charts with a field of type "PERCENTAGE" as
custom label.

Change-Id: Ie8931f77e3b6199d98635422d11d776e675f6e5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86067
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86124
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

chart2/source/view/charttypes/VSeriesPlotter.cxx

diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 2a814e2..8189ece 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -528,6 +528,11 @@
                        aTextList[i] = DataSeriesHelper::getDataSeriesLabel( xSeries, aRole );
                        break;
                    }
                    case DataPointCustomLabelFieldType_PERCENTAGE:
                    {
                        aTextList[i] = getLabelTextForValue( rDataSeries, nPointIndex, fValue, true );
                        break;
                    }
                    case DataPointCustomLabelFieldType_CELLREF:
                    {
                        // TODO: for now doesn't show placeholder

offapi/com/sun/star/chart2/DataPointCustomLabelFieldType.idl

diff --git a/offapi/com/sun/star/chart2/DataPointCustomLabelFieldType.idl b/offapi/com/sun/star/chart2/DataPointCustomLabelFieldType.idl
index 0b7f925..05c26a7 100644
--- a/offapi/com/sun/star/chart2/DataPointCustomLabelFieldType.idl
+++ b/offapi/com/sun/star/chart2/DataPointCustomLabelFieldType.idl
@@ -23,11 +23,12 @@
    SERIESNAME,
    CATEGORYNAME,
    CELLREF,
    NEWLINE
    NEWLINE,
    PERCENTAGE
};

}; }; }; };

#endif

/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

oox/source/drawingml/chart/seriesconverter.cxx

diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index a310549..10edab4 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -245,6 +245,8 @@
        return DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CATEGORYNAME;
    else if (rField == "CELLREF")
        return DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CELLREF;
    else if (rField == "PERCENTAGE")
        return DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_PERCENTAGE;
    else
        return DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT;
}