[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 84be5a5ff23a6dc01d60f4233779ceaa61c30ba1
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 84be5a5ff23a6dc01d60f4233779ceaa61c30ba1
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue May 3 23:46:28 2011 +0200
lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly
* and bump version for PPA
diff --git a/changelog b/changelog
index 45d0c81..a88eb63 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.3.2-1ubuntu5~ppa2) natty; urgency=low
+
+ * hotfix for Libreoffice Calc's PRODUCT function doesn't calculate correctly (LP: #775608)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 03 May 2011 23:42:45 +0200
+
libreoffice (1:3.3.2-1ubuntu5~ppa1) natty; urgency=low
* tentative patch for lp#746375 (LP: #746375)
diff --git a/patches/lp775608.diff b/patches/lp775608.diff
new file mode 100644
index 0000000..8c6017f
--- /dev/null
+++ b/patches/lp775608.diff
@@ -0,0 +1,33 @@
+Index: libreoffice-3.3.2/libreoffice-build/patches/hotfixes/001-lp775608.diff
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libreoffice-3.3.2/libreoffice-build/patches/hotfixes/001-lp775608.diff 2011-05-03 23:41:08.765322967 +0200
+@@ -0,0 +1,28 @@
++commit eb5cd73db0ab42da28999cfba6b0f231245f2b3d
++Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++AuthorDate: Tue May 3 23:01:34 2011 +0200
++Commit: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++CommitDate: Tue May 3 23:10:48 2011 +0200
++
++ lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly
++
++diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
++index f561317..3bc30fa 100644
++--- sc/source/core/tool/interpr1.cxx
+++++ sc/source/core/tool/interpr1.cxx
++@@ -3448,13 +3448,13 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
++ if (nGlobalError)
++ break;
++
++- IterateMatrix(pMat, eFunc, bTextAsZero, nCount, nFuncFmtType, fVal, fMem, fRes, bNull);
+++ IterateMatrix(pMat, eFunc, bTextAsZero, nCount, nFuncFmtType, fVal, fRes, fMem, bNull);
++ }
++ break;
++ case svMatrix :
++ {
++ ScMatrixRef pMat = PopMatrix();
++- IterateMatrix(pMat, eFunc, bTextAsZero, nCount, nFuncFmtType, fVal, fMem, fRes, bNull);
+++ IterateMatrix(pMat, eFunc, bTextAsZero, nCount, nFuncFmtType, fVal, fRes, fMem, bNull);
++ }
++ break;
++ case svError:
diff --git a/patches/series b/patches/series
index 71ed117..da4e5c9 100644
--- a/patches/series
+++ b/patches/series
@@ -17,3 +17,4 @@ fix-lo-desktop-pot.diff
fix-jpeg.diff
lp720716.diff
lp746375.diff
+lp775608.diff
--
LibreOffice packaging repository
Reply to: