diff --git a/.gitignore b/.gitignore index b3d56ab..76d1c96 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,6 @@ /libreoffice-5.1.6.1.tar.xz /libreoffice-help-5.1.6.1.tar.xz /libreoffice-translations-5.1.6.1.tar.xz +/libreoffice-5.1.6.2.tar.xz +/libreoffice-help-5.1.6.2.tar.xz +/libreoffice-translations-5.1.6.2.tar.xz diff --git a/0001-create-NoName-error-token-instead-of-setting-error-a.patch b/0001-create-NoName-error-token-instead-of-setting-error-a.patch deleted file mode 100644 index 881f770..0000000 --- a/0001-create-NoName-error-token-instead-of-setting-error-a.patch +++ /dev/null @@ -1,62 +0,0 @@ -From f81b2592cd93dac2cb78fdb22bf661d04bdef25f Mon Sep 17 00:00:00 2001 -From: Eike Rathke -Date: Wed, 12 Oct 2016 19:47:44 +0200 -Subject: [PATCH] create NoName error token instead of setting error at the - token array - -... when handling name token. This can happen when importing BIFF .xls and the -original range is not present in the document. The document is broken, but such -formula can continue to work if the range expression was not actually executed, -for example IF(TRUE(),then_good,else_bad_range) where else_bad_range is #NAME? -error. - -(cherry picked from commit d3645961d98ce9f0cfb1ef7f0aba7bf020b90945) - -Change-Id: I823ac89115418cf5069b2baf5c5de2c814319ae7 -Reviewed-on: https://gerrit.libreoffice.org/29795 -Tested-by: Jenkins -Reviewed-by: Eike Rathke ---- - sc/source/core/tool/compiler.cxx | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx -index e161b12..5d0af7e 100644 ---- a/sc/source/core/tool/compiler.cxx -+++ b/sc/source/core/tool/compiler.cxx -@@ -4442,6 +4442,7 @@ ScRangeData* ScCompiler::GetRangeData( const FormulaToken& rToken ) const - - bool ScCompiler::HandleRange() - { -+ ScTokenArray* pNew; - const ScRangeData* pRangeData = GetRangeData( *mpToken); - if (pRangeData) - { -@@ -4450,7 +4451,6 @@ bool ScCompiler::HandleRange() - SetError( errNoName ); - else if (mbJumpCommandReorder) - { -- ScTokenArray* pNew; - // put named formula into parentheses. - // But only if there aren't any yet, parenthetical - // ocSep doesn't work, e.g. SUM((...;...)) -@@ -4491,7 +4491,15 @@ bool ScCompiler::HandleRange() - } - } - else -- SetError(errNoName); -+ { -+ // No ScRangeData for an already compiled token can happen in BIFF .xls -+ // import if the original range is not present in the document. -+ pNew = new ScTokenArray; -+ pNew->Add( new FormulaErrorToken(errNoName)); -+ PushTokenArray( pNew, true ); -+ pNew->Reset(); -+ return GetToken(); -+ } - return true; - } - --- -2.7.4 - diff --git a/libreoffice.spec b/libreoffice.spec index caa8b18..10bc453 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -57,8 +57,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 3%{?libo_prerelease}%{?dist} +Version: %{libo_version}.2 +Release: 1%{?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 and CC0 URL: http://www.libreoffice.org/ @@ -285,7 +285,6 @@ Patch49: 0001-Related-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch Patch50: 0001-Resolves-rhbz-1378521-csv-dialog-a11y-returns-a-new-.patch Patch51: 0001-only-date-autofilter-menus-need-the-space-for-the-tr.patch Patch52: 0001-rhbz-1382401-Support-surrogate-pairs-in-HTMLOutFuncs.patch -Patch53: 0001-create-NoName-error-token-instead-of-setting-error-a.patch %if ! 0%{?rhel} Patch400: 0001-Update-liborcus-to-0.11.0.patch @@ -2357,6 +2356,9 @@ done %endif %changelog +* Wed Oct 19 2016 David Tardon - 1:5.1.6.2-1 +- update to 5.1.6 rc2 + * Wed Oct 19 2016 Caolán McNamara - 1:5.1.6.1-3 - export notes pages in impress pdf export dialog is invisible - No ScRangeData for an already compiled token can happen in BIFF diff --git a/sources b/sources index 17044cc..55ac1c7 100644 --- a/sources +++ b/sources @@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh 4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -858ce172dd220f5e0a034361f490fa92 libreoffice-5.1.6.1.tar.xz -567cabb2e1cd1e29ef54c421421a615e libreoffice-help-5.1.6.1.tar.xz -6d9dc14c5c6159e5403674727cb51556 libreoffice-translations-5.1.6.1.tar.xz +baa654f768fcf680bc3eeedb6fc092f3 libreoffice-5.1.6.2.tar.xz +fb7d3c1831800b04d06ae3be4929befd libreoffice-help-5.1.6.2.tar.xz +4ad32a7425f2500522b59e9afb736675 libreoffice-translations-5.1.6.2.tar.xz