[Libreoffice-commits] core.git: chart2/source

[Kohei Yoshida]

 chart2/source/controller/dialogs/DataBrowserModel.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit ecde8155fefcdacb08177a10a4eddc24f6675b0b
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Jun 26 14:51:47 2014 -0400

    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

diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index e2bff5b..16ac3a2 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -343,10 +343,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
     if (!xChartType.is())
         return;
 
-    sal_Int32 nOffset = 0;
-    if( xDiagram.is() && lcl_ShowCategories( xDiagram ))
-        nOffset = getCategoryColumnCount();
-
     // Get shared sequences of current series.  Normally multiple data series
     // only share "values-x" sequences. (TODO: simplify this logic).
     Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY );
@@ -367,7 +363,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
         Sequence<Reference<chart2::data::XLabeledDataSequence> > aLSequences = xSource->getDataSequences();
         sal_Int32 nSeqIdx = 0;
         sal_Int32 nSeqSize = aLSequences.getLength();
-        nStartCol -= (nOffset - 1); // ???
         for (sal_Int32 nIndex = nStartCol; nSeqIdx < nSeqSize; ++nSeqIdx)
         {
             lcl_tSharedSeqVec::const_iterator aSharedIt(