diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-26 08:57:09 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-04-05 16:19:00 +0200 |
| commit | a471620af5099c960e22b46fad6e6f92a5055dbd (patch) | |
| tree | 38037334678ca78706142050c7c40e196ff895f9 | |
| parent | forcepoint #28 missing cell on abw import (diff) | |
| download | core-a471620af5099c960e22b46fad6e6f92a5055dbd.tar.gz core-a471620af5099c960e22b46fad6e6f92a5055dbd.zip | |
forcepoint #29 detect illegal self series add
Change-Id: I3bba0f942780c54951a3a810c05cc3b56ca18a5e
Reviewed-on: https://gerrit.libreoffice.org/51862
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
| -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 9eda9e33c883..db71be8dc037 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -1871,6 +1871,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 |