diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-03-26 08:57:09 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-26 14:58:08 +0200 |
commit | 01582612fe1283025685b09d23aba27435696c92 (patch) | |
tree | 52152f754988754b24d116853f0c98c047a317f1 | |
parent | ef59333842a4833c4bcebe33f49e96f11f15275c (diff) |
forcepoint #29 detect illegal self series add
Change-Id: I3bba0f942780c54951a3a810c05cc3b56ca18a5e
Reviewed-on: https://gerrit.libreoffice.org/51854
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rwxr-xr-x | sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls | bin | 0 -> 17920 bytes | |||
-rw-r--r-- | sc/source/filter/excel/xichart.cxx | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls b/sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls Binary files differnew file mode 100755 index 000000000000..e5eafd262520 --- /dev/null +++ b/sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 91774388322c..50329d2350b4 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -1872,6 +1872,11 @@ void XclImpChSeries::SetDataLabel( const XclImpChTextRef& xLabel ) void XclImpChSeries::AddChildSeries( const XclImpChSeries& rSeries ) { OSL_ENSURE( !HasParentSeries(), "XclImpChSeries::AddChildSeries - not allowed for child series" ); + if (&rSeries == this) + { + SAL_WARN("sc.filter", "self add attempt"); + return; + } /* In Excel, trend lines and error bars are stored as own series. In Calc, these are properties of the parent series. This function adds the |