[libreoffice/f20] Resolves: fix fdo#79151 chart label woes

[Caolán McNamara]

commit 6c8e715b54177b97c4e16f9cc1e62098e2038769
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 10 11:02:57 2014 +0100

    Resolves: fix fdo#79151 chart label woes

 ...o-need-to-offset-column-index-by-category.patch |   50 ++++++++++++++++++++
 libreoffice.spec                                   |    6 ++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/0001-fdo-79151-No-need-to-offset-column-index-by-category.patch b/0001-fdo-79151-No-need-to-offset-column-index-by-category.patch
new file mode 100644
index 0000000..02ad232
--- /dev/null
+++ b/0001-fdo-79151-No-need-to-offset-column-index-by-category.patch
@@ -0,0 +1,50 @@
+From eb4a6f38829bfb9e2569c2a9b6e0e0ad6277555c Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida at collabora.com>
+Date: Thu, 26 Jun 2014 14:51:47 -0400
+Subject: [PATCH] fdo#79151: No need to offset column index by category labels.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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/9928
+Reviewed-by: Caolán McNamara <caolanm at redhat.com>
+Tested-by: Caolán McNamara <caolanm at redhat.com>
+---
+ chart2/source/controller/dialogs/DataBrowserModel.cxx | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
+index 8bfa963..e3544e0 100644
+--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
++++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
+@@ -344,9 +344,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;
+@@ -364,7 +361,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 )
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 309454b..5f3bfa4 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -36,7 +36,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        4%{?libo_prerelease}%{?dist}
+Release:        5%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -303,6 +303,7 @@ Patch45: 0003-Use-a-new-fast-parser-instance-for-each-XML-fragment.patch
 Patch46: 0001-allow-build-with-icu-4.2.patch
 Patch47: 0001-Resolves-fdo-80911-toggle-original-page-orientation-.patch
 Patch48: 0001-avoid-problems-detecting-HTML-files-with-.xls-ext.patch
+Patch49: 0001-fdo-79151-No-need-to-offset-column-index-by-category.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2253,6 +2254,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu Jul 10 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.5.2-5
+- Resolves: fix fdo#79151 chart label woes
+
 * Tue Jul 08 2014 David Tardon <dtardon at redhat.com> - 1:4.2.5.2-4
 - avoid problems detecting HTML files with xls extension