Kaydet (Commit) ecde8155 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

fdo#79151: No need to offset column index by category labels.

In fact, doing so would lead to a corrupt internal data table.  The
internal data stores category labels separately from the column data, so
there is no reason why we need to offset for category labels here.

Change-Id: I29dd99e53837cba7a1e28d2a1ef39a5384378805
üst 822d0e9d
...@@ -343,10 +343,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) ...@@ -343,10 +343,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
if (!xChartType.is()) if (!xChartType.is())
return; return;
sal_Int32 nOffset = 0;
if( xDiagram.is() && lcl_ShowCategories( xDiagram ))
nOffset = getCategoryColumnCount();
// Get shared sequences of current series. Normally multiple data series // Get shared sequences of current series. Normally multiple data series
// only share "values-x" sequences. (TODO: simplify this logic). // only share "values-x" sequences. (TODO: simplify this logic).
Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY ); Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY );
...@@ -367,7 +363,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) ...@@ -367,7 +363,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
Sequence<Reference<chart2::data::XLabeledDataSequence> > aLSequences = xSource->getDataSequences(); Sequence<Reference<chart2::data::XLabeledDataSequence> > aLSequences = xSource->getDataSequences();
sal_Int32 nSeqIdx = 0; sal_Int32 nSeqIdx = 0;
sal_Int32 nSeqSize = aLSequences.getLength(); sal_Int32 nSeqSize = aLSequences.getLength();
nStartCol -= (nOffset - 1); // ???
for (sal_Int32 nIndex = nStartCol; nSeqIdx < nSeqSize; ++nSeqIdx) for (sal_Int32 nIndex = nStartCol; nSeqIdx < nSeqSize; ++nSeqIdx)
{ {
lcl_tSharedSeqVec::const_iterator aSharedIt( lcl_tSharedSeqVec::const_iterator aSharedIt(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment