summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-06-26 14:51:47 -0400
committerCaolán McNamara <caolanm@redhat.com>2014-06-30 09:14:37 +0000
commit556412d3fa3916b1e1d0375fa999fdf92136b64e (patch)
tree398eeb3de90af8f736f2b355141810b0617ea1de
parent62afc8fcaa527daa1f762ed7f27bcf71be3640c6 (diff)
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. (cherry picked from commit ecde8155fefcdacb08177a10a4eddc24f6675b0b) Conflicts: chart2/source/controller/dialogs/DataBrowserModel.cxx Change-Id: I29dd99e53837cba7a1e28d2a1ef39a5384378805 Reviewed-on: https://gerrit.libreoffice.org/9927 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.cxx4
1 files changed, 0 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 8a85f8e926f8..ceccad05c261 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -345,9 +345,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
if( xChartType.is())
{
- sal_Int32 nOffset = 0;
- if( xDiagram.is() && lcl_ShowCategories( xDiagram ))
- nOffset=getCategoryColumnCount();
// get shared sequences of current series
Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY );
lcl_tSharedSeqVec aSharedSequences;
@@ -365,7 +362,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
xSource->getDataSequences());
sal_Int32 nSeqIdx = 0;
sal_Int32 nSeqSize = aLSequences.getLength();
- nStartCol -= (nOffset - 1);
for( sal_Int32 nIndex = nStartCol;
(nSeqIdx < nSeqSize);
++nSeqIdx )