[libreoffice/f20] Resolves: tdf#83461 do not override MatColsRows if already set

[Eike Rathke]

commit 8741ba49168c63d0ae52c91d32db06b91bd49e48
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Feb 7 00:14:46 2015 +0100

    Resolves: tdf#83461 do not override MatColsRows if already set

 ...f-83461-do-not-override-MatColsRows-if-al.patch |   49 ++++++++++++++++++++
 libreoffice.spec                                   |    6 ++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-tdf-83461-do-not-override-MatColsRows-if-al.patch b/0001-Resolves-tdf-83461-do-not-override-MatColsRows-if-al.patch
new file mode 100644
index 0000000..20c9108
--- /dev/null
+++ b/0001-Resolves-tdf-83461-do-not-override-MatColsRows-if-al.patch
@@ -0,0 +1,49 @@
+From 496bb4a0d0dd6f12c28cf69934a8aa2ddf96cdc1 Mon Sep 17 00:00:00 2001
+Message-Id: <496bb4a0d0dd6f12c28cf69934a8aa2ddf96cdc1.1423263533.git.erack at redhat.com>
+From: Eike Rathke <erack at redhat.com>
+Date: Fri, 6 Feb 2015 23:32:54 +0100
+Subject: [PATCH] Resolves: tdf#83461 do not override MatColsRows if already
+ set
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
+
+This is a multi-part message in MIME format.
+--------------erAck-patch-parts
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+
+ScMatrixFormulaCellToken::SetMatColsRows() via
+ScFormulaCell::SetMatColsRows() is used during document import and
+preselected cell area input of an array formula. Do not override
+existing values with subsequent result matrix dimensions.
+
+Change-Id: I9e844b5064ea276f3cbcb680eb1127c344328e00
+(cherry picked from commit e32eff2bb4c12fdc33e476b9f12bb4bb71d22ebc)
+---
+ sc/source/core/tool/formularesult.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+
+--------------erAck-patch-parts
+Content-Type: text/x-patch; name="0001-Resolves-tdf-83461-do-not-override-MatColsRows-if-al.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-Resolves-tdf-83461-do-not-override-MatColsRows-if-al.patch"
+
+diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx
+index 0237253..d134962 100644
+--- a/sc/source/core/tool/formularesult.cxx
++++ b/sc/source/core/tool/formularesult.cxx
+@@ -168,7 +168,7 @@ void ScFormulaResult::SetToken( const formula::FormulaToken* p )
+         {
+             const ScMatrixFormulaCellToken* pNewMatFormula =
+                 dynamic_cast<const ScMatrixFormulaCellToken*>(pMatResult);
+-            if (pNewMatFormula)
++            if (pNewMatFormula && (pMatFormula->GetMatCols() <= 0 || pMatFormula->GetMatRows() <= 0))
+             {
+                 SAL_WARN( "sc", "ScFormulaResult::SetToken: pNewMatFormula and pMatFormula, overriding matrix formula dimension; intended?");
+                 pMatFormula->SetMatColsRows( pNewMatFormula->GetMatCols(),
+
+--------------erAck-patch-parts--
+
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 7c6a4bd..0a06239 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:        5%{?libo_prerelease}%{?dist}
+Release:        6%{?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/
@@ -346,6 +346,7 @@ Patch90: 0001-fix-abuse-of-OUStringBuffer-int-ctor.patch
 Patch91: 0001-rhbz-1177022-vcl-fix-PDF-embedding-of-Type-1-fonts.patch
 Patch92: 0001-don-t-strip-font-names-of-apparent-script-suffixes-a.patch
 Patch93: 0001-various-indic-short-cuts.patch
+Patch94: 0001-Resolves-tdf-83461-do-not-override-MatColsRows-if-al.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2283,6 +2284,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Feb 06 2015 Eike Rathke <erack at redhat.com> - 1:4.2.8.2-6-UNBUILT
+- Resolves: tdf#83461 do not override MatColsRows if already set
+
 * Thu Jan 29 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.2.8.2-5
 - Resolves: rhbz#1134841 bn/ml "close without saving" short-cuts
 - Resolves: rhbz#1134824 as/or/ml "save" short-cuts